diff --git a/OurUmbraco.Site/Views/MacroPartials/Forum/Forum.cshtml b/OurUmbraco.Site/Views/MacroPartials/Forum/Forum.cshtml index 7b5d9729..0bc3ce04 100644 --- a/OurUmbraco.Site/Views/MacroPartials/Forum/Forum.cshtml +++ b/OurUmbraco.Site/Views/MacroPartials/Forum/Forum.cshtml @@ -1,4 +1,5 @@ @using uForum +@using uForum.Extensions @using uForum.Library @using uForum.Models @using uForum.Services diff --git a/OurUmbraco.Site/Views/MacroPartials/Forum/LatestActivity.cshtml b/OurUmbraco.Site/Views/MacroPartials/Forum/LatestActivity.cshtml index aac29791..858d44ab 100644 --- a/OurUmbraco.Site/Views/MacroPartials/Forum/LatestActivity.cshtml +++ b/OurUmbraco.Site/Views/MacroPartials/Forum/LatestActivity.cshtml @@ -1,5 +1,6 @@ @inherits Umbraco.Web.Macros.PartialViewMacroPage @using uForum; +@using uForum.Extensions @{ var ts = new uForum.Services.TopicService(ApplicationContext.DatabaseContext); diff --git a/OurUmbraco.Site/Views/MacroPartials/Forum/TopicActions.cshtml b/OurUmbraco.Site/Views/MacroPartials/Forum/TopicActions.cshtml index d6868b07..a4e8d41d 100644 --- a/OurUmbraco.Site/Views/MacroPartials/Forum/TopicActions.cshtml +++ b/OurUmbraco.Site/Views/MacroPartials/Forum/TopicActions.cshtml @@ -1,4 +1,5 @@ @using uForum +@using uForum.Extensions @using uForum.Services @inherits Umbraco.Web.Macros.PartialViewMacroPage @{ diff --git a/OurUmbraco.Site/Views/MacroPartials/Members/HeaderProfile.cshtml b/OurUmbraco.Site/Views/MacroPartials/Members/HeaderProfile.cshtml index f5c4a8be..8c7fa63a 100644 --- a/OurUmbraco.Site/Views/MacroPartials/Members/HeaderProfile.cshtml +++ b/OurUmbraco.Site/Views/MacroPartials/Members/HeaderProfile.cshtml @@ -1,5 +1,6 @@ @inherits Umbraco.Web.Macros.PartialViewMacroPage @using uForum; +@using uForum.Extensions @if(Members.IsLoggedIn()){
diff --git a/OurUmbraco.Site/Views/MacroPartials/Members/JsValues.cshtml b/OurUmbraco.Site/Views/MacroPartials/Members/JsValues.cshtml index fa39d7a1..3cdede5e 100644 --- a/OurUmbraco.Site/Views/MacroPartials/Members/JsValues.cshtml +++ b/OurUmbraco.Site/Views/MacroPartials/Members/JsValues.cshtml @@ -1,5 +1,6 @@ @inherits Umbraco.Web.Macros.PartialViewMacroPage @using uForum; +@using uForum.Extensions @if(Members.IsLoggedIn()){ diff --git a/OurUmbraco.Site/Views/MacroPartials/Members/PublicProfile.cshtml b/OurUmbraco.Site/Views/MacroPartials/Members/PublicProfile.cshtml index 15d02f5d..8405a3eb 100644 --- a/OurUmbraco.Site/Views/MacroPartials/Members/PublicProfile.cshtml +++ b/OurUmbraco.Site/Views/MacroPartials/Members/PublicProfile.cshtml @@ -2,6 +2,7 @@ @using Marketplace.Interfaces @using Marketplace.Providers @using uForum; +@using uForum.Extensions @{ var memberId = Request["id"]; int id = 0; diff --git a/OurUmbraco.Site/Views/MacroPartials/Members/QuickMenu.cshtml b/OurUmbraco.Site/Views/MacroPartials/Members/QuickMenu.cshtml index 98bfd319..0b934e35 100644 --- a/OurUmbraco.Site/Views/MacroPartials/Members/QuickMenu.cshtml +++ b/OurUmbraco.Site/Views/MacroPartials/Members/QuickMenu.cshtml @@ -2,6 +2,7 @@ @using System.Drawing @using our @using uForum +@using uForum.Extensions @using uForum.Services @{ var topicService = new TopicService(ApplicationContext.DatabaseContext); diff --git a/OurUmbraco.Site/Views/MacroPartials/Projects/ProjectDetails.cshtml b/OurUmbraco.Site/Views/MacroPartials/Projects/ProjectDetails.cshtml index bf4c3095..5ccd2c88 100644 --- a/OurUmbraco.Site/Views/MacroPartials/Projects/ProjectDetails.cshtml +++ b/OurUmbraco.Site/Views/MacroPartials/Projects/ProjectDetails.cshtml @@ -1,6 +1,7 @@ @inherits Umbraco.Web.Macros.PartialViewMacroPage @using our.Controllers @using uForum; +@using uForum.Extensions @using uProject.Controllers @{ diff --git a/OurUmbraco.Site/Views/MacroPartials/Rss/Forum.cshtml b/OurUmbraco.Site/Views/MacroPartials/Rss/Forum.cshtml index 70b94668..fa679a73 100644 --- a/OurUmbraco.Site/Views/MacroPartials/Rss/Forum.cshtml +++ b/OurUmbraco.Site/Views/MacroPartials/Rss/Forum.cshtml @@ -1,4 +1,5 @@ @using uForum +@using uForum.Extensions @using uForum.Services @inherits Umbraco.Web.Macros.PartialViewMacroPage @{ diff --git a/OurUmbraco.Site/Views/MacroPartials/Rss/LatestTopics.cshtml b/OurUmbraco.Site/Views/MacroPartials/Rss/LatestTopics.cshtml index d02ad19d..f06ab526 100644 --- a/OurUmbraco.Site/Views/MacroPartials/Rss/LatestTopics.cshtml +++ b/OurUmbraco.Site/Views/MacroPartials/Rss/LatestTopics.cshtml @@ -1,4 +1,5 @@ @using uForum +@using uForum.Extensions @using uForum.Services @inherits Umbraco.Web.Macros.PartialViewMacroPage @{ diff --git a/OurUmbraco.Site/Views/MacroPartials/Rss/Packages.cshtml b/OurUmbraco.Site/Views/MacroPartials/Rss/Packages.cshtml index fb2e8067..f4fdf65e 100644 --- a/OurUmbraco.Site/Views/MacroPartials/Rss/Packages.cshtml +++ b/OurUmbraco.Site/Views/MacroPartials/Rss/Packages.cshtml @@ -1,4 +1,5 @@ @using uForum +@using uForum.Extensions @inherits Umbraco.Web.Macros.PartialViewMacroPage @{ Response.Clear(); diff --git a/OurUmbraco.Site/Views/MacroPartials/Rss/Participated.cshtml b/OurUmbraco.Site/Views/MacroPartials/Rss/Participated.cshtml index 3f295365..cf88a016 100644 --- a/OurUmbraco.Site/Views/MacroPartials/Rss/Participated.cshtml +++ b/OurUmbraco.Site/Views/MacroPartials/Rss/Participated.cshtml @@ -1,4 +1,5 @@ @using uForum +@using uForum.Extensions @using uForum.Services @inherits Umbraco.Web.Macros.PartialViewMacroPage @{ diff --git a/OurUmbraco.Site/Views/MacroPartials/Rss/Topic.cshtml b/OurUmbraco.Site/Views/MacroPartials/Rss/Topic.cshtml index 5b6ce0e0..115ca06c 100644 --- a/OurUmbraco.Site/Views/MacroPartials/Rss/Topic.cshtml +++ b/OurUmbraco.Site/Views/MacroPartials/Rss/Topic.cshtml @@ -1,4 +1,5 @@ @using uForum +@using uForum.Extensions @using uForum.Services @inherits Umbraco.Web.Macros.PartialViewMacroPage @{ diff --git a/OurUmbraco.Site/Views/Partials/Forum/Comment.cshtml b/OurUmbraco.Site/Views/Partials/Forum/Comment.cshtml index 962b2050..0a480314 100644 --- a/OurUmbraco.Site/Views/Partials/Forum/Comment.cshtml +++ b/OurUmbraco.Site/Views/Partials/Forum/Comment.cshtml @@ -1,5 +1,6 @@ @inherits UmbracoViewPage @using uForum; +@using uForum.Extensions @{ var currentMember = Members.GetCurrentMember(); diff --git a/OurUmbraco.Site/Views/Partials/Forum/MemberBadge.cshtml b/OurUmbraco.Site/Views/Partials/Forum/MemberBadge.cshtml index 34d289cc..684f0cdf 100644 --- a/OurUmbraco.Site/Views/Partials/Forum/MemberBadge.cshtml +++ b/OurUmbraco.Site/Views/Partials/Forum/MemberBadge.cshtml @@ -1,5 +1,6 @@ @model IMember @using uForum; +@using uForum.Extensions
diff --git a/OurUmbraco.Site/Views/Partials/Forum/Question.cshtml b/OurUmbraco.Site/Views/Partials/Forum/Question.cshtml index 41f8ed6f..e9abed34 100644 --- a/OurUmbraco.Site/Views/Partials/Forum/Question.cshtml +++ b/OurUmbraco.Site/Views/Partials/Forum/Question.cshtml @@ -1,5 +1,6 @@ @inherits Umbraco.Web.Mvc.UmbracoViewPage @using uForum; +@using uForum.Extensions @{ var topicAuthor = Members.GetById(Model.MemberId); diff --git a/our.umbraco.org/Api/CommunityController.cs b/our.umbraco.org/Api/CommunityController.cs index 7aa7e77b..c900ab50 100644 --- a/our.umbraco.org/Api/CommunityController.cs +++ b/our.umbraco.org/Api/CommunityController.cs @@ -7,7 +7,6 @@ using System.Web; using System.Web.Http; using System.Xml; using our.Businesslogic; -using our.Rest; using umbraco.BusinessLogic; using umbraco.cms.businesslogic.member; using umbraco.cms.businesslogic.web; diff --git a/our.umbraco.org/Api/SearchController.cs b/our.umbraco.org/Api/SearchController.cs index 2df7d9c9..df2c9ceb 100644 --- a/our.umbraco.org/Api/SearchController.cs +++ b/our.umbraco.org/Api/SearchController.cs @@ -9,6 +9,7 @@ using System.Threading.Tasks; using Lucene.Net.Documents; using our.Models; using uForum; +using uForum.Extensions; using Umbraco.Web.WebApi; namespace our.Api diff --git a/our.umbraco.org/CustomHandlers/ForumPostsCounter.cs b/our.umbraco.org/CustomHandlers/ForumPostsCounter.cs index 45e8851e..b31dd130 100644 --- a/our.umbraco.org/CustomHandlers/ForumPostsCounter.cs +++ b/our.umbraco.org/CustomHandlers/ForumPostsCounter.cs @@ -1,4 +1,5 @@ using uForum; +using uForum.Extensions; using uForum.Services; using Umbraco.Core; using Umbraco.Web; diff --git a/our.umbraco.org/Rest.cs b/our.umbraco.org/Rest.cs index b94f2124..2a1f3f09 100644 --- a/our.umbraco.org/Rest.cs +++ b/our.umbraco.org/Rest.cs @@ -1,18 +1,11 @@ -using System; -using System.Linq; -using System.Web; -using System.Xml.XPath; -using umbraco.cms.businesslogic.member; -using System.IO; -using System.Drawing; -using System.Xml; -using umbraco.BusinessLogic; -using umbraco.cms.businesslogic.web; -using our.Businesslogic; +using System.Web; using System.Web.Security; +using System.Xml.XPath; +using umbraco.BusinessLogic; +using umbraco.cms.businesslogic.member; using Umbraco.Web.BaseRest; -namespace our.Rest +namespace our { /// /// Our mighty utill classes for looking stuff up quickly... diff --git a/our.umbraco.org/usercontrols/EventEditor.ascx.cs b/our.umbraco.org/usercontrols/EventEditor.ascx.cs index f271baef..9caed5ab 100644 --- a/our.umbraco.org/usercontrols/EventEditor.ascx.cs +++ b/our.umbraco.org/usercontrols/EventEditor.ascx.cs @@ -5,6 +5,7 @@ using System.Web.UI; using Umbraco.Core; using Umbraco.Core.Models; using System.Net.Mail; +using uEvents.Relations; using umbraco.BusinessLogic; using Umbraco.Web; using Member = umbraco.cms.businesslogic.member.Member; @@ -97,7 +98,7 @@ namespace our.usercontrols if (sync) { - var ev = new uEvents.Event(publishedContent); + var ev = new Event(publishedContent); ev.syncCapacity(); } } diff --git a/our.umbraco.org/usercontrols/Signup.ascx.cs b/our.umbraco.org/usercontrols/Signup.ascx.cs index 4bb96618..f2d095fa 100644 --- a/our.umbraco.org/usercontrols/Signup.ascx.cs +++ b/our.umbraco.org/usercontrols/Signup.ascx.cs @@ -2,7 +2,6 @@ using System.Configuration; using System.Web.UI; using System.Xml; -using our.Rest; using umbraco; using umbraco.BusinessLogic; using umbraco.cms.businesslogic.member; diff --git a/uEvents/Api/EventsController.cs b/uEvents/Api/EventsController.cs index f2ba4c9d..5ef7be9b 100644 --- a/uEvents/Api/EventsController.cs +++ b/uEvents/Api/EventsController.cs @@ -5,6 +5,7 @@ using System.Linq; using System.Web.Http; using System.Xml.XPath; using uEvents.Meetup; +using uEvents.Relations; using umbraco; using umbraco.cms.businesslogic.cache; using umbraco.cms.businesslogic.member; diff --git a/uEvents/App_Startup/ControllerRouting.cs b/uEvents/App_Startup/ControllerRouting.cs index 2a3916b3..7bbfabbf 100644 --- a/uEvents/App_Startup/ControllerRouting.cs +++ b/uEvents/App_Startup/ControllerRouting.cs @@ -1,9 +1,10 @@ using System.Web; using System.Web.Mvc; using System.Web.Routing; +using uEvents.App_Startup; -[assembly: PreApplicationStartMethod(typeof(uEvents.App_Start.ControllerRouting), "Setup")] -namespace uEvents.App_Start +[assembly: PreApplicationStartMethod(typeof(ControllerRouting), "Setup")] +namespace uEvents.App_Startup { public class ControllerRouting { diff --git a/uEvents/Library/Xslt.cs b/uEvents/Library/Xslt.cs index 61c1d1d3..2c30f880 100644 --- a/uEvents/Library/Xslt.cs +++ b/uEvents/Library/Xslt.cs @@ -6,6 +6,7 @@ using System.Xml.XPath; using umbraco.cms.businesslogic.web; using umbraco.DataLayer; using System.Xml; +using uEvents.Relations; namespace uEvents.Library { diff --git a/uEvents/Relations/Event.cs b/uEvents/Relations/Event.cs index 32a5af67..6f8f67dc 100644 --- a/uEvents/Relations/Event.cs +++ b/uEvents/Relations/Event.cs @@ -1,11 +1,10 @@ -using System.Linq; +using umbraco.BusinessLogic; using Umbraco.Core.Models; -using umbraco.BusinessLogic; using Umbraco.Web; using Relation = umbraco.cms.businesslogic.relation.Relation; using RelationType = umbraco.cms.businesslogic.relation.RelationType; -namespace uEvents +namespace uEvents.Relations { public class Event { diff --git a/uForum/AntiSpam/SpamChecker.cs b/uForum/AntiSpam/SpamChecker.cs index c5cc5b9c..a2091369 100644 --- a/uForum/AntiSpam/SpamChecker.cs +++ b/uForum/AntiSpam/SpamChecker.cs @@ -9,6 +9,7 @@ using System.Text; using System.Text.RegularExpressions; using System.Threading.Tasks; using System.Web; +using uForum.Extensions; using uForum.Library; using uForum.Models; using uForum.Services; diff --git a/uForum/Api/ForumController.cs b/uForum/Api/ForumController.cs index e3dc016d..b9b48623 100644 --- a/uForum/Api/ForumController.cs +++ b/uForum/Api/ForumController.cs @@ -10,6 +10,7 @@ using System.Net.Http.Headers; using System.Text; using System.Threading.Tasks; using System.Web.Http; +using uForum.Extensions; using uForum.Models; using uForum.Services; using Umbraco.Core.Services; diff --git a/uForum/Api/PublicForumController.cs b/uForum/Api/PublicForumController.cs index 1718bddc..4954b4f4 100644 --- a/uForum/Api/PublicForumController.cs +++ b/uForum/Api/PublicForumController.cs @@ -5,6 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Web.Http; +using uForum.Extensions; using uForum.Services; using Umbraco.Core.Models; using Umbraco.Web.WebApi; diff --git a/uForum/NewForumHandler.cs b/uForum/EventHandlers/NewForumHandler.cs similarity index 94% rename from uForum/NewForumHandler.cs rename to uForum/EventHandlers/NewForumHandler.cs index 57c73e06..e54d39b2 100644 --- a/uForum/NewForumHandler.cs +++ b/uForum/EventHandlers/NewForumHandler.cs @@ -1,63 +1,61 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Web; -using uForum.Models; -using uForum.Services; -using Umbraco.Core; -using Umbraco.Core.Services; - -namespace uForum -{ - public class NewForumHandler : ApplicationEventHandler - { - - /// - /// This handler creates a forum entry in the forumForums table - /// When a forum node is created in the content tree, all forums are connected to a node - /// - /// - /// - protected override void ApplicationStarted(UmbracoApplicationBase umbracoApplication, ApplicationContext applicationContext) - { - ContentService.Published += ContentService_Published; - ContentService.Deleted += ContentService_Deleted; - } - - void ContentService_Deleted(IContentService sender, Umbraco.Core.Events.DeleteEventArgs e) - { - var fs = new ForumService(ApplicationContext.Current.DatabaseContext); - foreach (var ent in e.DeletedEntities.Where(x => x.ContentType.Alias == "Forum")) - { - - var f = fs.GetById(ent.Id); - if (f != null) - fs.Delete(f); - } - } - - void ContentService_Published(Umbraco.Core.Publishing.IPublishingStrategy sender, Umbraco.Core.Events.PublishEventArgs e) - { - var fs = new ForumService(ApplicationContext.Current.DatabaseContext); - foreach (var ent in e.PublishedEntities.Where(x => x.ContentType.Alias == "Forum")) - { - Forum f = fs.GetById(ent.Id); - - if (f == null) - { - f = new Forum(); - f.Id = ent.Id; - f.ParentId = ent.ParentId; - f.SortOrder = ent.SortOrder; - f.TotalTopics = 0; - f.TotalComments = 0; - f.LatestPostDate = DateTime.Now; - f.LatestAuthor = 0; - f.LatestComment = 0; - f.LatestTopic = 0; - fs.Save(f); - } - } - } - } -} +using System; +using System.Linq; +using uForum.Models; +using uForum.Services; +using Umbraco.Core; +using Umbraco.Core.Services; + +namespace uForum.EventHandlers +{ + public class NewForumHandler : ApplicationEventHandler + { + + /// + /// This handler creates a forum entry in the forumForums table + /// When a forum node is created in the content tree, all forums are connected to a node + /// + /// + /// + protected override void ApplicationStarted(UmbracoApplicationBase umbracoApplication, ApplicationContext applicationContext) + { + ContentService.Published += ContentService_Published; + ContentService.Deleted += ContentService_Deleted; + } + + void ContentService_Deleted(IContentService sender, Umbraco.Core.Events.DeleteEventArgs e) + { + var fs = new ForumService(ApplicationContext.Current.DatabaseContext); + foreach (var ent in e.DeletedEntities.Where(x => x.ContentType.Alias == "Forum")) + { + + var f = fs.GetById(ent.Id); + if (f != null) + fs.Delete(f); + } + } + + void ContentService_Published(Umbraco.Core.Publishing.IPublishingStrategy sender, Umbraco.Core.Events.PublishEventArgs e) + { + var fs = new ForumService(ApplicationContext.Current.DatabaseContext); + foreach (var ent in e.PublishedEntities.Where(x => x.ContentType.Alias == "Forum")) + { + Forum f = fs.GetById(ent.Id); + + if (f == null) + { + f = new Forum(); + f.Id = ent.Id; + f.ParentId = ent.ParentId; + f.SortOrder = ent.SortOrder; + f.TotalTopics = 0; + f.TotalComments = 0; + f.LatestPostDate = DateTime.Now; + f.LatestAuthor = 0; + f.LatestComment = 0; + f.LatestTopic = 0; + fs.Save(f); + } + } + } + } +} diff --git a/uForum/EventExtensions.cs b/uForum/Extensions/EventExtensions.cs similarity index 85% rename from uForum/EventExtensions.cs rename to uForum/Extensions/EventExtensions.cs index f9d305a9..3e718910 100644 --- a/uForum/EventExtensions.cs +++ b/uForum/Extensions/EventExtensions.cs @@ -1,11 +1,7 @@ using System; -using System.Collections.Generic; using System.ComponentModel; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace uForum +namespace uForum.Extensions { public static class EventExtensions { diff --git a/uForum/ForumExtensions.cs b/uForum/Extensions/ForumExtensions.cs similarity index 98% rename from uForum/ForumExtensions.cs rename to uForum/Extensions/ForumExtensions.cs index 2ae1e041..20c9c86a 100644 --- a/uForum/ForumExtensions.cs +++ b/uForum/Extensions/ForumExtensions.cs @@ -1,17 +1,15 @@ using System; using System.Globalization; using System.IO; -using System.Linq; using System.Web; using HtmlAgilityPack; -using ImageProcessor.Imaging.Filters.Artistic; using MarkdownSharp; using uForum.AntiSpam; using uForum.Library; using uForum.Models; using Umbraco.Web; -namespace uForum +namespace uForum.Extensions { public static class ForumExtensions { diff --git a/uForum/MemberForumExtensions.cs b/uForum/Extensions/MemberForumExtensions.cs similarity index 98% rename from uForum/MemberForumExtensions.cs rename to uForum/Extensions/MemberForumExtensions.cs index 16190a0c..aa5eeb5b 100644 --- a/uForum/MemberForumExtensions.cs +++ b/uForum/Extensions/MemberForumExtensions.cs @@ -4,7 +4,7 @@ using Umbraco.Core.Models; using Umbraco.Web; using Umbraco.Web.Security; -namespace uForum +namespace uForum.Extensions { public static class MemberForumExtensions { diff --git a/uForum/Services/CommentService.cs b/uForum/Services/CommentService.cs index 4f57b885..c9d4bf6d 100644 --- a/uForum/Services/CommentService.cs +++ b/uForum/Services/CommentService.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using uForum.Extensions; using uForum.Models; using Umbraco.Core; using Umbraco.Core.Persistence; diff --git a/uForum/Services/ForumService.cs b/uForum/Services/ForumService.cs index 72170cf2..5dfbf61f 100644 --- a/uForum/Services/ForumService.cs +++ b/uForum/Services/ForumService.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using uForum.Extensions; using uForum.Models; using Umbraco.Core; using Umbraco.Core.Persistence; diff --git a/uForum/Services/TopicService.cs b/uForum/Services/TopicService.cs index 063c183b..64e9fb41 100644 --- a/uForum/Services/TopicService.cs +++ b/uForum/Services/TopicService.cs @@ -5,6 +5,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Web; +using uForum.Extensions; using uForum.Models; using Umbraco.Core; using Umbraco.Core.Cache; diff --git a/uForum/uForum.csproj b/uForum/uForum.csproj index cf4636c4..bbd568cc 100644 --- a/uForum/uForum.csproj +++ b/uForum/uForum.csproj @@ -256,14 +256,14 @@ - + - + Code - + @@ -272,7 +272,7 @@ - + diff --git a/uPowers/Buddha/Buddha.cs b/uPowers/Buddha/Buddha.cs index 248283e6..2a662867 100644 --- a/uPowers/Buddha/Buddha.cs +++ b/uPowers/Buddha/Buddha.cs @@ -1,20 +1,9 @@ using System; -using System.Data; -using System.Configuration; -using System.Linq; -using System.Web; -using System.Web.Security; -using System.Web.UI; -using System.Web.UI.HtmlControls; -using System.Web.UI.WebControls; -using System.Web.UI.WebControls.WebParts; -using System.Xml.Linq; -using System.Xml; -using System.Data.SqlClient; using System.IO; +using System.Xml; using umbraco.DataLayer; -namespace uPowers +namespace uPowers.Buddha { public class Buddha : IDisposable { diff --git a/uPowers/Library/xslt.cs b/uPowers/Library/xslt.cs index d88a556b..cd22d157 100644 --- a/uPowers/Library/xslt.cs +++ b/uPowers/Library/xslt.cs @@ -11,7 +11,7 @@ namespace uPowers.Library { //this will be changed to something abit less static before Upowers are released, if it ever is... public static XPathNodeIterator MemberKarma(int InLastNumberOfDays, int maxItems) { - string SQL = Buddha.TotalKarmaSQL(InLastNumberOfDays, maxItems); + string SQL = Buddha.Buddha.TotalKarmaSQL(InLastNumberOfDays, maxItems); return uPowers.BusinessLogic.Data.GetDataSet(SQL, "score"); } diff --git a/uRelease/App_Start/ControllerRouting.cs b/uRelease/App_Start/ControllerRouting.cs index a1128f7f..b4c41a5d 100644 --- a/uRelease/App_Start/ControllerRouting.cs +++ b/uRelease/App_Start/ControllerRouting.cs @@ -1,9 +1,10 @@ using System.Web; using System.Web.Mvc; using System.Web.Routing; +using uRelease; -[assembly: PreApplicationStartMethod(typeof(uRelease.App_Start.ControllerRouting), "Setup")] -namespace uRelease.App_Start +[assembly: PreApplicationStartMethod(typeof(ControllerRouting), "Setup")] +namespace uRelease { public class ControllerRouting {