newtelligence dasBlog Community Edition

Email Archive: dasblogce-cvs (read-only)

2005:	_Jan (129)	_Feb (38)	_Mar (27)	_Apr (7)	_May	_Jun (68)	_Jul (290)	_Aug (72)	_Sep (21)	_Oct (10)	_Nov (11)	_Dec (11)
2006:	_Jan (58)	_Feb (53)	_Mar (16)	_Apr (9)	_May (2)	_Jun (2)	_Jul (17)	_Aug (63)	_Sep (54)	_Oct (14)	_Nov (7)	_Dec (4)
2007:	_Jan (15)	_Feb (29)	_Mar (11)	_Apr (11)	_May (2)	_Jun (40)	_Jul (22)	_Aug (37)	_Sep (19)	_Oct	_Nov (1)	_Dec (20)
2008:	_Jan (22)	_Feb (1)	_Mar (3)	_Apr (6)	_May (8)	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec


S	M	T	W	T	F	S
		1	2	3	4	5

6	7	8	9	10	11	12
				(6)	(4)	(3)
13	14	15	16	17	18	19
(4)	(2)	(2)		(1)
20	21	22	23	24	25	26

27	28	29	30	31

[Dasblogce-cvs] SF.net SVN: dasblogce: [790] branches/refactoring_architecture/source

From: <sfcaus@us...> - 2008-01-10 21:14

Revision: 790
          http://dasblogce.svn.sourceforge.net/dasblogce/?rev=790&view=rev
Author:   sfcaus
Date:     2008-01-10 13:14:17 -0800 (Thu, 10 Jan 2008)

Log Message:
-----------
- XHTML compatibility problems fixed

Modified Paths:
--------------
    branches/refactoring_architecture/source/WebControlCaptcha/CaptchaControl.vb
    branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/BlogDataService.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Resources/PerformCheck.js
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ActivityBox.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ActivityBox.ascx.designer.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AdminNavBar.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AdminNavBar.ascx.designer.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ClickThroughsBox.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/CommentView.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/CommentViewBox.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/CommentViewBox.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/CommentViewBox.ascx.designer.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditBlogRollBox.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditBlogRollBox.ascx.designer.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditBlogRollEditItem.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditBlogRollEditItem.ascx.designer.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditBlogRollItem.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditBlogRollItem.ascx.designer.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditConfigBox.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditConfigBox.ascx.designer.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditContentFiltersBox.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditContentFiltersBox.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditContentFiltersBox.ascx.designer.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditCrosspostSitesBox.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditCrosspostSitesBox.ascx.designer.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditEntryBox.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditEntryBox.ascx.designer.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditNavigatorLinksBox.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditNavigatorLinksBox.ascx.designer.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditUserBox.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditUserBox.ascx.designer.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EmailBox.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EmailBox.ascx.designer.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/LogDateBar.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/LogDateBar.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/LogDateBar.ascx.designer.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/LoginBox.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Logout.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Logout.ascx.designer.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/MonthViewBox.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/MonthViewBox.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/MonthViewBox.ascx.designer.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Referrers.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ReferrersBox.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Search.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/SingleCommentView.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/SiteConfig/accessdenied.format.html
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/SiteConfig/navigatorLinks.xml
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/SiteConfig/pageerror.format.html
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/SiteConfig/robots.config
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/SiteConfig/setuperror.html
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/UserClickThroughsBox.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ftb/ftb.colorpicker.aspx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ftb/ftb.insertcode.aspx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ftb/ftb.inserttable.aspx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/Mono/homeTemplate.blogtemplate
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/Portal/homeTemplate.blogtemplate
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/Tricoleur/admin/homeTemplate.blogtemplate
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/Tricoleur/homeTemplate.blogtemplate
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/Tricoleur/itemTemplate.blogtemplate
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/Voidclass2/admin/homeTemplate.blogtemplate
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/Voidclass2/homeTemplate.blogtemplate
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/blogxp/homeTemplate.blogtemplate
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/candidBlue/homeTemplate.blogtemplate
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/dasBlog/homeTemplate.blogtemplate
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/discreetBlogBlue/homeTemplate.blogtemplate
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/discreetBlogBlue/itemTemplate.blogtemplate
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/essence/homeTemplate.blogtemplate
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/justhtml/homeTemplate.blogtemplate
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/movableRadioBlue/dayTemplate.blogtemplate
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/movableRadioBlue/homeTemplate.blogtemplate
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/movableRadioBlue/itemTemplate.blogtemplate
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/movableRadioHeat/homeTemplate.blogtemplate
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/movableRadioHeat/itemTemplate.blogtemplate
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/orangeCream/homeTemplate.blogtemplate
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/orangeCream/itemTemplate.blogtemplate
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/project84/admin/homeTemplate.blogtemplate
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/project84/homeTemplate.blogtemplate
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/project84/itemTemplate.blogtemplate
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/project84Grass/admin/homeTemplate.blogtemplate
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/project84Grass/homeTemplate.blogtemplate
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/project84Grass/itemTemplate.blogtemplate
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/slate/homeTemplate.blogtemplate
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/soundWaves/dayTemplate.blogtemplate
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/soundWaves/homeTemplate.blogtemplate
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/soundWaves/itemTemplate.blogtemplate
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/useit/homeTemplate.blogtemplate
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/AkismetSpamBlockingService.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/ArchiveMonthsList.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/BaseHtmlForm.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/BlogStatistics.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/BookControl.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/CategoryList.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/CategoryListCSS.txt
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/EditControlAdapter.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/HttpCache.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/IPBlackList.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/SharedBasePage.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/SideBarOpmlList.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/SideBarOpmlListCSS.txt
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/TitleMapperModule.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/WebControls/ShadowBox.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/MailToWeblog.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/ReportMailer.cs

Modified: branches/refactoring_architecture/source/WebControlCaptcha/CaptchaControl.vb
===================================================================
--- branches/refactoring_architecture/source/WebControlCaptcha/CaptchaControl.vb	2008-01-10 21:09:13 UTC (rev 789)
+++ branches/refactoring_architecture/source/WebControlCaptcha/CaptchaControl.vb	2008-01-10 21:14:17 UTC (rev 790)
@@ -374,7 +374,7 @@
             End If
             If _strText.Length > 0 Then
                 .Write(_strText)
-                .Write("<br>")
+                .Write("<br/>")
             End If
             .Write("<input name=" & UniqueID & " type=text size=")
             .Write(_captcha.TextLength.ToString)

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/BlogDataService.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/BlogDataService.cs	2008-01-10 21:09:13 UTC (rev 789)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/BlogDataService.cs	2008-01-10 21:14:17 UTC (rev 790)
@@ -426,7 +426,7 @@
                     {
                         loggingService.AddEvent(
                             new EventDataItem(EventCodes.Error,
-                            e.ToString().Replace("\n", "<br>"),
+                            e.ToString().Replace("\n", "<br/>"),
                             "PingWeblogsWorker, pinging " + pingService.Name));
                     }
                 }
@@ -482,7 +482,7 @@
                 {
                     loggingService.AddEvent(
                         new EventDataItem(EventCodes.PingbackServerError,
-                        e.ToString().Replace("\n", "<br>"),
+                        e.ToString().Replace("\n", "<br/>"),
                         sourceUri + "," + pingbackTarget));
                 }
             }
@@ -569,7 +569,7 @@
                             {
                                 loggingService.AddEvent(
                                     new EventDataItem(EventCodes.Error,
-                                    e.ToString().Replace("\n", "<br>"),
+                                    e.ToString().Replace("\n", "<br/>"),
                                     "PingbackWorker, auto-discovery of: " + url));
                             }
                         }
@@ -667,7 +667,7 @@
                     loggingService.AddEvent(
                         new EventDataItem(
                         EventCodes.TrackbackServerError,
-                        e.ToString().Replace("\n", "<br>"),
+                        e.ToString().Replace("\n", "<br/>"),
                         job.info.SourceUrl,
                         job.info.TargetUrl,
                         job.entry.Title));
@@ -758,7 +758,7 @@
                         {
                             loggingService.AddEvent(
                                 new EventDataItem(EventCodes.Error,
-                                e.ToString().Replace("\n", "<br>"),
+                                e.ToString().Replace("\n", "<br/>"),
                                 String.Format("Updating cross-post entry {0} on {1}", ci.TargetEntryId, ci.Site.ProfileName)));
                         }
                     }
@@ -820,7 +820,7 @@
                         {
                             loggingService.AddEvent(
                                 new EventDataItem(EventCodes.Error,
-                                e.ToString().Replace("\n", "<br>"),
+                                e.ToString().Replace("\n", "<br/>"),
                                 String.Format("Adding cross-post entry to {0}", ci.Site.ProfileName)));
                         }
                     }
@@ -833,7 +833,7 @@
                 {
                     loggingService.AddEvent(
                         new EventDataItem(EventCodes.Error,
-                        e.ToString().Replace("\n", "<br>"),
+                        e.ToString().Replace("\n", "<br/>"),
                         String.Format("HandleCrosspost to {0}", ci.Site.ProfileName)));
                 }
             }
@@ -867,7 +867,7 @@
                 {
                     loggingService.AddEvent(
                         new EventDataItem(EventCodes.Error,
-                        e.ToString().Replace("\n", "<br>"),
+                        e.ToString().Replace("\n", "<br/>"),
                         "CrosspostWorker"));
                 }
             }
@@ -1195,7 +1195,7 @@
                                     {
                                         loggingService.AddEvent(
                                             new EventDataItem(EventCodes.Error,
-                                            e.ToString().Replace("\n", "<br>"),
+                                            e.ToString().Replace("\n", "<br/>"),
                                             String.Format("Deleting cross-post entry {0} from {1}", cp.TargetEntryId, cp.ProfileName)));
                                     }
                                 }
@@ -1503,7 +1503,7 @@
                         {
                             loggingService.AddEvent(
                                 new EventDataItem(EventCodes.Error,
-                                ex.ToString().Replace("\n", "<br>"),
+                                ex.ToString().Replace("\n", "<br/>"),
                                 "Dequeue from TrackingHandler"));
                         }
                     }
@@ -1513,7 +1513,7 @@
                         {
                             loggingService.AddEvent(
                                 new EventDataItem(EventCodes.Error,
-                                ex.ToString().Replace("\n", "<br>"),
+                                ex.ToString().Replace("\n", "<br/>"),
                                 "Unhandled Exception from TrackingHandler"));
                         }
                     }
@@ -1542,7 +1542,7 @@
                         inner = inner.InnerException;
                     }
 
-                    loggingService.AddEvent(new EventDataItem(EventCodes.SmtpError, exMessage.Replace("\n", "<br>"), "InternalSendMail"));
+                    loggingService.AddEvent(new EventDataItem(EventCodes.SmtpError, exMessage.Replace("\n", "<br/>"), "InternalSendMail"));
                 }
             }
         }
@@ -1580,7 +1580,7 @@
                         {
                             loggingService.AddEvent(
                                 new EventDataItem(EventCodes.Error,
-                                e.ToString().Replace("\n", "<br>"),
+                                e.ToString().Replace("\n", "<br/>"),
                                 "InternalSendMail from SendMailHandler"));
                         }
                     }

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Resources/PerformCheck.js
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Resources/PerformCheck.js	2008-01-10 21:09:13 UTC (rev 789)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Resources/PerformCheck.js	2008-01-10 21:14:17 UTC (rev 790)
@@ -1,4 +1,4 @@
-<script type="text/javascript" language="JavaScript">
+<script type="text/javascript">
 function performCheck(checkbox, controlIDs)
 {
 	var controls = controlIDs.split(",");

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ActivityBox.ascx
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ActivityBox.ascx	2008-01-10 21:09:13 UTC (rev 789)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ActivityBox.ascx	2008-01-10 21:14:17 UTC (rev 790)
@@ -1,20 +1,20 @@
 <%@ Control language="c#" Codebehind="ActivityBox.ascx.cs" AutoEventWireup="True" Inherits="newtelligence.DasBlog.Web.ActivityBox" targetSchema="http://schemas.microsoft.com/intellisense/ie5"%>
-<DIV class="adminNavbarStyle" id="DIV1" runat="server">
-	<UL>
-		<LI class="first" id="eventlog" runat="server">
+<div class="adminNavbarStyle" id="DIV1" runat="server">
+	<ul>
+		<li class="first" id="eventlog" runat="server">
 			<asp:HyperLink id=hyperLinkEventlog Text='<%# resmgr.GetString("text_admin_events")%>' runat="server" NavigateUrl="Eventlog.aspx">
-			</asp:HyperLink></LI><LI id="referrers" runat="server">
+			</asp:HyperLink></li><li id="referrers" runat="server">
 			<asp:HyperLink id=hyperLinkReferrers Text='<%# resmgr.GetString("text_admin_referrers")%>' runat="server" NavigateUrl="Referrers.aspx">
-			</asp:HyperLink></LI><%if (siteConfig.EnableAggregatorBugging){%><LI id="aggbugs" runat="server">
+			</asp:HyperLink></li><%if (siteConfig.EnableAggregatorBugging){%><li id="aggbugs" runat="server">
 			<asp:HyperLink id=hyperlinkAggBugs Text='<%# resmgr.GetString("text_admin_aggbugs")%>' runat="server" NavigateUrl="AggBugs.aspx">
-			</asp:HyperLink></LI><%}%><%if (siteConfig.EnableClickThrough) {%><LI id="clickthrough" runat="server">
+			</asp:HyperLink></li><%}%><%if (siteConfig.EnableClickThrough) {%><li id="clickthrough" runat="server">
 			<asp:HyperLink id=hyperlinkClickThroughs Text='<%# resmgr.GetString("text_admin_clickthrough")%>' runat="server" NavigateUrl="ClickThroughs.aspx">
-			</asp:HyperLink></LI><LI id="userclickthrough" runat="server">
+			</asp:HyperLink></li><li id="userclickthrough" runat="server">
 			<asp:HyperLink id="hyperlinkUserClickThroughs" Text='<%# resmgr.GetString("text_admin_userclickthrough")%>' runat="server" NavigateUrl="UserClickThroughs.aspx">
-			</asp:HyperLink></LI><%}%><%if (siteConfig.EnableCrossposts) {%><LI id="crosspost" runat="server">
+			</asp:HyperLink></li><%}%><%if (siteConfig.EnableCrossposts) {%><li id="crosspost" runat="server">
 			<asp:HyperLink id=hyperlinkCrosspostReferrers Text='<%# resmgr.GetString("text_admin_crosspost")%>' runat="server" NavigateUrl="CrosspostReferrers.aspx">
-			</asp:HyperLink></LI>
+			</asp:HyperLink></li>
 			<%}%>
 		
-	</UL>
-</DIV>
+	</ul>
+</div>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ActivityBox.ascx.designer.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ActivityBox.ascx.designer.cs	2008-01-10 21:09:13 UTC (rev 789)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ActivityBox.ascx.designer.cs	2008-01-10 21:14:17 UTC (rev 790)
@@ -1,10 +1,10 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:2.0.50727.1318
+//     Dieser Code wurde von einem Tool generiert.
+//     Laufzeitversion:2.0.50727.312
 //
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     \xC4nderungen an dieser Datei k\xF6nnen falsches Verhalten verursachen und gehen verloren, wenn
+//     der Code erneut generiert wird.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
@@ -12,127 +12,127 @@
     
     
     /// <summary>
-    /// ActivityBox class.
+    /// ActivityBox-Klasse.
     /// </summary>
     /// <remarks>
-    /// Auto-generated class.
+    /// Automatisch generierte Klasse.
     /// </remarks>
     public partial class ActivityBox {
         
         /// <summary>
-        /// DIV1 control.
+        /// DIV1-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl DIV1;
         
         /// <summary>
-        /// eventlog control.
+        /// eventlog-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl eventlog;
         
         /// <summary>
-        /// hyperLinkEventlog control.
+        /// hyperLinkEventlog-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.HyperLink hyperLinkEventlog;
         
         /// <summary>
-        /// referrers control.
+        /// referrers-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl referrers;
         
         /// <summary>
-        /// hyperLinkReferrers control.
+        /// hyperLinkReferrers-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.HyperLink hyperLinkReferrers;
         
         /// <summary>
-        /// aggbugs control.
+        /// aggbugs-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl aggbugs;
         
         /// <summary>
-        /// hyperlinkAggBugs control.
+        /// hyperlinkAggBugs-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.HyperLink hyperlinkAggBugs;
         
         /// <summary>
-        /// clickthrough control.
+        /// clickthrough-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl clickthrough;
         
         /// <summary>
-        /// hyperlinkClickThroughs control.
+        /// hyperlinkClickThroughs-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.HyperLink hyperlinkClickThroughs;
         
         /// <summary>
-        /// userclickthrough control.
+        /// userclickthrough-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl userclickthrough;
         
         /// <summary>
-        /// hyperlinkUserClickThroughs control.
+        /// hyperlinkUserClickThroughs-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.HyperLink hyperlinkUserClickThroughs;
         
         /// <summary>
-        /// crosspost control.
+        /// crosspost-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl crosspost;
         
         /// <summary>
-        /// hyperlinkCrosspostReferrers control.
+        /// hyperlinkCrosspostReferrers-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.HyperLink hyperlinkCrosspostReferrers;
     }

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AdminNavBar.ascx
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AdminNavBar.ascx	2008-01-10 21:09:13 UTC (rev 789)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AdminNavBar.ascx	2008-01-10 21:14:17 UTC (rev 790)
@@ -1,39 +1,39 @@
 <%@ Control Language="c#" AutoEventWireup="True" Codebehind="AdminNavBar.ascx.cs" Inherits="newtelligence.DasBlog.Web.AdminNavBar" TargetSchema="http://schemas.microsoft.com/intellisense/ie5" %>
 <div class="adminNavbarStyle" id="DIV1" runat="server">
-	<UL>		
-		<LI id="editEntry" class="first" runat="server">
+	<ul>		
+		<li id="editEntry" class="first" runat="server">
 			<asp:HyperLink runat="server" NavigateUrl="EditEntry.aspx" id="hyperLinkEditEntry" Text='<%# resmgr.GetString("text_admin_add_entry")%>'>
 			</asp:HyperLink>
-		</LI>
-		<LI id="editUser"  runat="server">
+		</li>
+		<li id="editUser"  runat="server">
 			<asp:HyperLink runat="server" NavigateUrl="EditUser.aspx" id="hyperLinkEditUser" Text='<%# resmgr.GetString("text_admin_edit_user")%>'>
 			</asp:HyperLink>
-		</LI>
-		<LI id="activity" runat="server">
+		</li>
+		<li id="activity" runat="server">
 			<asp:HyperLink runat="server" NavigateUrl="Referrers.aspx" id="hyperLinkActivity" Text='<%# resmgr.GetString("text_admin_activity")%>'>
 			</asp:HyperLink>
-		</LI>
-		<LI id="editConfig" runat="server">
+		</li>
+		<li id="editConfig" runat="server">
 			<asp:HyperLink runat="server" NavigateUrl="EditConfig.aspx" id="hyperLinkEditConfig" Text='<%# resmgr.GetString("text_admin_config")%>'>
 			</asp:HyperLink>
-		</LI>
-		<LI id="editContentFilters" runat="server">
+		</li>
+		<li id="editContentFilters" runat="server">
 			<asp:HyperLink runat="server" NavigateUrl="EditContentFilters.aspx" id="hyperLinkEditContentFilters" Text='<%# resmgr.GetString("text_admin_content_filters")%>' >
 			</asp:HyperLink>
-		</LI>
-		<LI id="editBlogRoll" runat="server">
+		</li>
+		<li id="editBlogRoll" runat="server">
 			<asp:HyperLink runat="server" NavigateUrl="EditBlogRoll.aspx" id="hyperLinkEditBlogRoll" Text='<%# resmgr.GetString("text_admin_blogroll")%>'>
 			</asp:HyperLink>
-		</LI>
-		<LI id="editNavigatorLinks" runat="server">
+		</li>
+		<li id="editNavigatorLinks" runat="server">
 			<asp:HyperLink runat="server" NavigateUrl="EditNavigatorLinks.aspx" id="hyperLinkEditNavigatorLinks" Text='<%# resmgr.GetString("text_admin_navlinks")%>'>
 			</asp:HyperLink>
-		</LI>
+		</li>
 		<%if (siteConfig.EnableCrossposts) {%>
-		<LI id="editCrossPostSites" runat="server">
+		<li id="editCrossPostSites" runat="server">
 			<asp:HyperLink runat="server" NavigateUrl="EditCrosspostSites.aspx" id="hyperLinkEditCrossPostSites" Text='<%# resmgr.GetString("text_admin_crosspostsites")%>'>
 			</asp:HyperLink>			
-		</LI>
+		</li>
 		<%}%>
-	</UL>
+	</ul>
 </div>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AdminNavBar.ascx.designer.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AdminNavBar.ascx.designer.cs	2008-01-10 21:09:13 UTC (rev 789)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AdminNavBar.ascx.designer.cs	2008-01-10 21:14:17 UTC (rev 790)
@@ -1,10 +1,10 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:2.0.50727.1318
+//     Dieser Code wurde von einem Tool generiert.
+//     Laufzeitversion:2.0.50727.312
 //
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     \xC4nderungen an dieser Datei k\xF6nnen falsches Verhalten verursachen und gehen verloren, wenn
+//     der Code erneut generiert wird.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
@@ -12,163 +12,163 @@
     
     
     /// <summary>
-    /// AdminNavBar class.
+    /// AdminNavBar-Klasse.
     /// </summary>
     /// <remarks>
-    /// Auto-generated class.
+    /// Automatisch generierte Klasse.
     /// </remarks>
     public partial class AdminNavBar {
         
         /// <summary>
-        /// DIV1 control.
+        /// DIV1-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl DIV1;
         
         /// <summary>
-        /// editEntry control.
+        /// editEntry-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl editEntry;
         
         /// <summary>
-        /// hyperLinkEditEntry control.
+        /// hyperLinkEditEntry-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.HyperLink hyperLinkEditEntry;
         
         /// <summary>
-        /// editUser control.
+        /// editUser-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl editUser;
         
         /// <summary>
-        /// hyperLinkEditUser control.
+        /// hyperLinkEditUser-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.HyperLink hyperLinkEditUser;
         
         /// <summary>
-        /// activity control.
+        /// activity-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl activity;
         
         /// <summary>
-        /// hyperLinkActivity control.
+        /// hyperLinkActivity-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.HyperLink hyperLinkActivity;
         
         /// <summary>
-        /// editConfig control.
+        /// editConfig-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl editConfig;
         
         /// <summary>
-        /// hyperLinkEditConfig control.
+        /// hyperLinkEditConfig-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.HyperLink hyperLinkEditConfig;
         
         /// <summary>
-        /// editContentFilters control.
+        /// editContentFilters-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl editContentFilters;
         
         /// <summary>
-        /// hyperLinkEditContentFilters control.
+        /// hyperLinkEditContentFilters-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.HyperLink hyperLinkEditContentFilters;
         
         /// <summary>
-        /// editBlogRoll control.
+        /// editBlogRoll-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl editBlogRoll;
         
         /// <summary>
-        /// hyperLinkEditBlogRoll control.
+        /// hyperLinkEditBlogRoll-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.HyperLink hyperLinkEditBlogRoll;
         
         /// <summary>
-        /// editNavigatorLinks control.
+        /// editNavigatorLinks-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl editNavigatorLinks;
         
         /// <summary>
-        /// hyperLinkEditNavigatorLinks control.
+        /// hyperLinkEditNavigatorLinks-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.HyperLink hyperLinkEditNavigatorLinks;
         
         /// <summary>
-        /// editCrossPostSites control.
+        /// editCrossPostSites-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl editCrossPostSites;
         
         /// <summary>
-        /// hyperLinkEditCrossPostSites control.
+        /// hyperLinkEditCrossPostSites-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.HyperLink hyperLinkEditCrossPostSites;
     }

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ClickThroughsBox.ascx.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ClickThroughsBox.ascx.cs	2008-01-10 21:09:13 UTC (rev 789)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ClickThroughsBox.ascx.cs	2008-01-10 21:14:17 UTC (rev 790)
@@ -122,7 +122,7 @@
 			hlLocal.Text = text;
 
 			row.Cells[0].Controls.Add(link);
-			row.Cells[0].Controls.Add(new LiteralControl("<br>from:"));
+			row.Cells[0].Controls.Add(new LiteralControl("<br/>from:"));
 			row.Cells[0].Controls.Add(hlLocal);
 			row.Cells[1].Text = item.count.ToString();
 		}

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/CommentView.aspx.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/CommentView.aspx.cs	2008-01-10 21:09:13 UTC (rev 789)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/CommentView.aspx.cs	2008-01-10 21:14:17 UTC (rev 790)
@@ -1,4 +1,5 @@
 #region Copyright (c) 2003, newtelligence AG. All rights reserved.
+
 /*
 // Copyright (c) 2003, newtelligence AG. (http://www.newtelligence.com)
 // Original BlogX Source Code: Copyright (c) 2003, Chris Anderson (http://simplegeek.com)
@@ -35,51 +36,32 @@
 // or following this notice. 
 //
 */
+
 #endregion
 
 using System;
 using System.Web.UI;
 using System.Web.UI.WebControls;
 using newtelligence.DasBlog.Runtime;
+using newtelligence.DasBlog.Web.Core;
 using newtelligence.DasBlog.Web.Services;
-using newtelligence.DasBlog.Web.Core;
 
 namespace newtelligence.DasBlog.Web
 {
-    /// <summary>
-    /// Summary description for CommentView.
-    /// </summary>
-    public partial class CommentView : SharedBasePage, IPageFormatInfo 
+    public partial class CommentView : SharedBasePage, IPageFormatInfo
     {
-
         public CommentView()
         {
             showTrackingDetail = true;
             isAggregatedView = false;
         }
 
-        override protected void OnInit(EventArgs e)
-        {
-            InitializeComponent();
-            base.OnInit(e);
-        }
-		
-        private void InitializeComponent()
-        {    
-        }
-       
         protected override PlaceHolder ContentPlaceHolder
         {
-            get
-            {
-                return contentPlaceHolder;
-            }
+            get { return contentPlaceHolder; }
         }
 
-        protected override EntryCollection LoadEntries()
-        {
-            return new EntryCollection();
-        }
+        #region IPageFormatInfo Members
 
         Control IPageFormatInfo.Bodytext
         {
@@ -91,32 +73,50 @@
             }
         }
 
+        #endregion
+
+        protected override void OnInit(EventArgs e)
+        {
+            InitializeComponent();
+            base.OnInit(e);
+        }
+
+        private void InitializeComponent()
+        {
+        }
+
+        protected override EntryCollection LoadEntries()
+        {
+            return new EntryCollection();
+        }
+
         protected override void OnLoad(EventArgs e)
         {
-			if ( SiteConfig.EnableComments ) 
-			{
-	            // implement the Comment API
-	            if ( SiteConfig.EnableCommentApi && 
-	                Request.ContentType =="text/xml" &&
-	                Request.RequestType =="POST" &&
-	                Request.QueryString["guid"] != null )
-	            {
-	                CommentAPI commentAPI = new CommentAPI();
-	                commentAPI.ProcessRequest( Context );
-	            }
+            if (SiteConfig.EnableComments)
+            {
+                // implement the Comment API
+                if (SiteConfig.EnableCommentApi &&
+                    Request.ContentType == "text/xml" &&
+                    Request.RequestType == "POST" &&
+                    Request.QueryString["guid"] != null)
+                {
+                    CommentAPI commentAPI = new CommentAPI();
+                    commentAPI.ProcessRequest(Context);
+                }
 
-				//Setup the Live Comment Preview with an allowed tags array "'a', 'b', 'p', 'strong', 'blockquote', 'i', 'em', 'u', 'strike', 'sup', 'sub', 'code'"
-				Page.ClientScript.RegisterClientScriptBlock(this.GetType(),"allowedHtmlTags",String.Format(@"
+                //Setup the Live Comment Preview with an allowed tags array "'a', 'b', 'p', 'strong', 'blockquote', 'i', 'em', 'u', 'strike', 'sup', 'sub', 'code'"
+                Page.ClientScript.RegisterClientScriptBlock(GetType(), "allowedHtmlTags", String.Format(@"
 				<script type=""text/javascript"">
 					var allowedHtmlTags = [{0}];
 				</script>
-				<script type=""text/javascript"" src=""scripts/LiveCommentPreview.js"" defer=""true""></script>",SiteConfig.AllowedTags.ToJavaScriptArray()));
-	            base.OnLoad (e);
-			}
-			else 
-			{
-				this.Redirect(SiteUtilities.GetPermaLinkUrl(Request.QueryString["guid"]));
-			}
+				<script type=""text/javascript"" src=""scripts/LiveCommentPreview.js"" defer=""defer""></script>",
+                SiteConfig.AllowedTags.ToJavaScriptArray()));
+                base.OnLoad(e);
+            }
+            else
+            {
+                Redirect(SiteUtilities.GetPermaLinkUrl(Request.QueryString["guid"]));
+            }
         }
     }
-}
+}
\ No newline at end of file

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/CommentViewBox.ascx
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/CommentViewBox.ascx	2008-01-10 21:09:13 UTC (rev 789)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/CommentViewBox.ascx	2008-01-10 21:14:17 UTC (rev 790)
@@ -10,77 +10,77 @@
 		</span><span id="commentsModerated" style="COLOR: red;TEXT-ALIGN: center" runat="server">
 			<asp:label id="labelCommentsModerated" runat="server" CssClass="commentViewLabelStyle" Text='<%# resmgr.GetString("text_comments_require_approval") %>' />
 		</span>
-		<TABLE class="commentViewTableStyle" id="commentViewTable" cellSpacing="1" cellPadding="1"
+		<table class="commentViewTableStyle" id="commentViewTable" cellspacing="1" cellpadding="1"
 			border="0" runat="server" width="100%">
-			<TR>
-				<TD nowrap><asp:Label id="Label1" runat="server" CssClass="commentViewLabelStyle" Text='<%# resmgr.GetString("text_person_name") %>'></asp:Label>
+			<tr>
+				<td nowrap><asp:Label id="Label1" runat="server" CssClass="commentViewLabelStyle" Text='<%# resmgr.GetString("text_person_name") %>'></asp:Label>
 					<asp:RequiredFieldValidator id="validatorRFName" runat="server" ErrorMessage='<%# resmgr.GetString("text_error_person_name_rf")%>'
-						Display="Dynamic" ControlToValidate="name">*</asp:RequiredFieldValidator></TD>
-				<TD width="100%">
+						Display="Dynamic" ControlToValidate="name">*</asp:RequiredFieldValidator></td>
+				<td width="100%">
 					<asp:TextBox id="name" MaxLength="32" runat="server" Columns="40" CssClass="commentViewControlStyle"
-						Width="99%"></asp:TextBox></TD>
-			</TR>
-			<TR>
-				<TD nowrap><asp:Label id="Label2" runat="server" CssClass="commentViewLabelStyle" Text='<%# resmgr.GetString("text_person_email") %>'></asp:Label>
+						Width="99%"></asp:TextBox></td>
+			</tr>
+			<tr>
+				<td nowrap><asp:Label id="Label2" runat="server" CssClass="commentViewLabelStyle" Text='<%# resmgr.GetString("text_person_email") %>'></asp:Label>
 					<asp:RegularExpressionValidator id="validatorREEmail" runat="server" ErrorMessage='<%# resmgr.GetString("text_error_person_email_re")%>'
-						Display="Dynamic" ControlToValidate="email" ValidationExpression="\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*">*</asp:RegularExpressionValidator></TD>
-				<TD nowrap>
+						Display="Dynamic" ControlToValidate="email" ValidationExpression="\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*">*</asp:RegularExpressionValidator></td>
+				<td nowrap>
 					<asp:TextBox MaxLength="40" id="email" runat="server" Columns="60" CssClass="commentViewControlStyle"
 						Width="99%"></asp:TextBox>
 					<span id="commentsGravatarEnabled" class="gravatarLabel" runat="server">
-						<br>
+						<br/>
 						<asp:Label ID="labelGravatarEnabled" Runat="server" CssClass="commentViewLabelStyle" Text='<%# resmgr.GetString("text_comment_gravatarable") %>' >
 						</asp:Label>
 					</span>
-				</TD>
-			</TR>
-			<TR>
-				<TD nowrap><asp:Label id="Label3" runat="server" CssClass="commentViewLabelStyle" Text='<%# resmgr.GetString("text_person_homepage") %>'></asp:Label></TD>
-				<TD>
+				</td>
+			</tr>
+			<tr>
+				<td nowrap><asp:Label id="Label3" runat="server" CssClass="commentViewLabelStyle" Text='<%# resmgr.GetString("text_person_homepage") %>'></asp:Label></td>
+				<td>
 					<asp:TextBox MaxLength="64" id="homepage" runat="server" Columns="60" CssClass="commentViewControlStyle"
-						Width="99%"></asp:TextBox></TD>
-			</TR>
-			<TR>
-				<TD noWrap colspan="2">
-				</TD>
-			</TR>
-			<TR>
-				<TD></TD>
-				<TD>
-					<P><asp:CheckBox id="rememberMe" runat="server" Text='<%# resmgr.GetString("text_person_remember") %>' Checked="True" CssClass="commentViewControlStyle"></asp:CheckBox></P>
-				</TD>
-			</TR>
-			<TR>
-				<TD colSpan="2" height="24"><asp:Label id="labelComment" runat="server" Text='<%# resmgr.GetString("text_comment_content") %>' CssClass="commentViewLabelStyle"></asp:Label>
+						Width="99%"></asp:TextBox></td>
+			</tr>
+			<tr>
+				<td nowrap colspan="2">
+				</td>
+			</tr>
+			<tr>
+				<td></td>
+				<td>
+					<p><asp:CheckBox id="rememberMe" runat="server" Text='<%# resmgr.GetString("text_person_remember") %>' Checked="True" CssClass="commentViewControlStyle"></asp:CheckBox></p>
+				</td>
+			</tr>
+			<tr>
+				<td colSpan="2" height="24"><asp:Label id="labelComment" runat="server" Text='<%# resmgr.GetString("text_comment_content") %>' CssClass="commentViewLabelStyle"></asp:Label>
 					<asp:Label id="labelCommentHtml" runat="server" CssClass="commentViewLabelStyle"></asp:Label>
 					<asp:RequiredFieldValidator id="validatorRFComment" runat="server" ErrorMessage='<%# resmgr.GetString("text_comment_content_rf")%>'
-						ControlToValidate="comment">*</asp:RequiredFieldValidator></TD>
-			</TR>
-			<TR>
-				<TD colSpan="2" noWrap>
+						ControlToValidate="comment">*</asp:RequiredFieldValidator></td>
+			</tr>
+			<tr>
+				<td colSpan="2" nowrap>
 					<asp:TextBox Rows="12" Columns="60" id="comment" runat="server" TextMode="MultiLine" CssClass="commentViewControlStyle livepreview"
 						Width="99%"></asp:TextBox>
-					<P></P>
+					<p></p>
 					<cc1:CaptchaControl CaptchaFontWarping="Extreme" id=CaptchaControl1 runat="server" Text='<%# resmgr.GetString("text_captcha")%>' ShowSubmitButton="False" CaptchaTimeout="300" CaptchaFont="Verdana">
 					</cc1:CaptchaControl>
 					<asp:CustomValidator id="cvCaptcha" runat="server" Display="None" ErrorMessage='<%# resmgr.GetString("text_captcha_error")%>'></asp:CustomValidator>
-				</TD>
-			</TR>
-			<TR>
-				<TD colSpan="2" height="24"><asp:Label id="lblCommentPreview" runat="server" Text='<%# resmgr.GetString("text_comment_livepreview") %>' CssClass="commentViewLabelStyle"></asp:Label>
-				</TD>
-			</TR>
-			<TR>
-				<TD colSpan="2"><div class="commentBodyStyle livepreview"></div>
-				</TD>
-			</TR>
-			<TR>
-				<TD colSpan="2" noWrap>
+				</td>
+			</tr>
+			<tr>
+				<td colSpan="2" height="24"><asp:Label id="lblCommentPreview" runat="server" Text='<%# resmgr.GetString("text_comment_livepreview") %>' CssClass="commentViewLabelStyle"></asp:Label>
+				</td>
+			</tr>
+			<tr>
+				<td colSpan="2"><div class="commentBodyStyle livepreview"></div>
+				</td>
+			</tr>
+			<tr>
+				<td colSpan="2" nowrap>
 					<div style="WIDTH:50%;TEXT-ALIGN:left"><asp:ValidationSummary id="ValidationSummary1" runat="server"></asp:ValidationSummary></div>
 					<asp:Button id="add" OnClick="add_Click" runat="server" Text='<%# resmgr.GetString("text_save_comment") %>' CssClass="commentViewControlStyle" >
 					</asp:Button>
-				</TD>
-			</TR>
-		</TABLE>
+				</td>
+			</tr>
+		</table>
 	</div>
 </div>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/CommentViewBox.ascx.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/CommentViewBox.ascx.cs	2008-01-10 21:09:13 UTC (rev 789)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/CommentViewBox.ascx.cs	2008-01-10 21:14:17 UTC (rev 790)
@@ -205,10 +205,8 @@
                 if (Page.ClientScript.IsClientScriptBlockRegistered(this.GetType(),"coCommentScript") == false && requestPage.SiteConfig.EnableCoComment == true)
 				{
 					string coCommentScript = String.Format(@"
-
 					<script type=""text/javascript"">
-
-					var blogTool               = ""DasBlog"";
+    				var blogTool               = ""DasBlog"";
 					var blogURL                = ""{0}"";
 					var blogTitle              = ""{1}"";
 					var postURL                = ""{2}"";
@@ -218,12 +216,9 @@
 					var commentFormID          = ""mainForm"";
 					var commentTextFieldName   = ""{5}"";
 					var commentButtonName      = ""{6}"";
-
 					</script>
-
 					<script id=""cocomment-fetchlet""
-							src=""http://www.cocomment.com/js/enabler.js"" type=""text/javascript""> // this activates coComment </script>
-					",
+							src=""http://www.cocomment.com/js/enabler.js"" type=""text/javascript""> // this activates coComment </script>\n",
 							requestPage.SiteConfig.Root,
 							Server.HtmlEncode(requestPage.SiteConfig.Title),
 							Request.Url.ToString(),
@@ -232,10 +227,9 @@
 							this.comment.UniqueID,
 							this.add.ClientID
 						);
-					Page.ClientScript.RegisterClientScriptBlock(this.GetType(),"coComment",coCommentScript);	
-				}
-				
 
+					Page.ClientScript.RegisterClientScriptBlock(this.GetType(),"coComment",coCommentScript);	
+				}	
 			}
         }
 

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/CommentViewBox.ascx.designer.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/CommentViewBox.ascx.designer.cs	2008-01-10 21:09:13 UTC (rev 789)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/CommentViewBox.ascx.designer.cs	2008-01-10 21:14:17 UTC (rev 790)
@@ -1,10 +1,10 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:2.0.50727.1318
+//     Dieser Code wurde von einem Tool generiert.
+//     Laufzeitversion:2.0.50727.312
 //
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     \xC4nderungen an dieser Datei k\xF6nnen falsches Verhalten verursachen und gehen verloren, wenn
+//     der Code erneut generiert wird.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
@@ -12,253 +12,253 @@
     
     
     /// <summary>
-    /// CommentViewBox class.
+    /// CommentViewBox-Klasse.
     /// </summary>
     /// <remarks>
-    /// Auto-generated class.
+    /// Automatisch generierte Klasse.
     /// </remarks>
     public partial class CommentViewBox {
         
         /// <summary>
-        /// content control.
+        /// content-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl content;
         
         /// <summary>
-        /// commentViewContent control.
+        /// commentViewContent-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl commentViewContent;
         
         /// <summary>
-        /// commentsClosed control.
+        /// commentsClosed-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl commentsClosed;
         
         /// <summary>
-        /// labelCommentsClosed control.
+        /// labelCommentsClosed-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label labelCommentsClosed;
         
         /// <summary>
-        /// commentsModerated control.
+        /// commentsModerated-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl commentsModerated;
         
         /// <summary>
-        /// labelCommentsModerated control.
+        /// labelCommentsModerated-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label labelCommentsModerated;
         
         /// <summary>
-        /// commentViewTable control.
+        /// commentViewTable-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlTable commentViewTable;
         
         /// <summary>
-        /// Label1 control.
+        /// Label1-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label Label1;
         
         /// <summary>
-        /// validatorRFName control.
+        /// validatorRFName-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.RequiredFieldValidator validatorRFName;
         
         /// <summary>
-        /// name control.
+        /// name-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox name;
         
         /// <summary>
-        /// Label2 control.
+        /// Label2-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label Label2;
         
         /// <summary>
-        /// validatorREEmail control.
+        /// validatorREEmail-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.RegularExpressionValidator validatorREEmail;
         
         /// <summary>
-        /// email control.
+        /// email-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox email;
         
         /// <summary>
-        /// commentsGravatarEnabled control.
+        /// commentsGravatarEnabled-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlGenericControl commentsGravatarEnabled;
         
         /// <summary>
-        /// labelGravatarEnabled control.
+        /// labelGravatarEnabled-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label labelGravatarEnabled;
         
         /// <summary>
-        /// Label3 control.
+        /// Label3-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label Label3;
         
         /// <summary>
-        /// homepage control.
+        /// homepage-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox homepage;
         
         /// <summary>
-        /// rememberMe control.
+        /// rememberMe-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.CheckBox rememberMe;
         
         /// <summary>
-        /// labelComment control.
+        /// labelComment-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label labelComment;
         
         /// <summary>
-        /// labelCommentHtml control.
+        /// labelCommentHtml-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label labelCommentHtml;
         
         /// <summary>
-        /// validatorRFComment control.
+        /// validatorRFComment-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.RequiredFieldValidator validatorRFComment;
         
         /// <summary>
-        /// comment control.
+        /// comment-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox comment;
         
         /// <summary>
-        /// CaptchaControl1 control.
+        /// CaptchaControl1-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::WebControlCaptcha.CaptchaControl CaptchaControl1;
         
         /// <summary>
-        /// cvCaptcha control.
+        /// cvCaptcha-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.CustomValidator cvCaptcha;
         
         /// <summary>
-        /// lblCommentPreview control.
+        /// lblCommentPreview-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lblCommentPreview;
         
         /// <summary>
-        /// ValidationSummary1 control.
+        /// ValidationSummary1-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.ValidationSummary ValidationSummary1;
         
         /// <summary>
-        /// add control.
+        /// add-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Button add;
     }

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditBlogRollBox.ascx
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditBlogRollBox.ascx	2008-01-10 21:09:13 UTC (rev 789)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditBlogRollBox.ascx	2008-01-10 21:14:17 UTC (rev 790)
@@ -2,24 +2,24 @@
 <%@ Register TagPrefix="uc1" TagName="EditBlogRollEditItem" Src="EditBlogRollEditItem.ascx" %>
 <%@ Register TagPrefix="cc1" Namespace="newtelligence.DasBlog.Web.Core.WebControls" Assembly="newtelligence.DasBlog.Web.Core" %>
 <%@ Control Language="c#" AutoEventWireup="True" Codebehind="EditBlogRollBox.ascx.cs" Inherits="newtelligence.DasBlog.Web.EditBlogRollBox" TargetSchema="http://schemas.microsoft.com/intellisense/ie5"%>
-<DIV class="bodyContentStyle">
+<div class="bodyContentStyle">
 	<div class="pageTopic">
 		<asp:Label id="Label1" runat="server" Text='<%# resmgr.GetString("text_blogrolls_title")%>'>
 		</asp:Label>
 	</div>
 	<div class="configSectionStyle">
-	<TABLE id="Table2" cellSpacing="0" cellPadding="2" width="100%" border="0">
-		<TR>
-			<TD noWrap><asp:label id="labelOpmlList" runat="server" Text='<%# resmgr.GetString("text_opml_files") %>'></asp:label></TD>
-			<TD width="98%"><asp:dropdownlist id="listFiles" runat="server" Width="100%"></asp:dropdownlist></TD>
-			<TD><asp:button id="buttonSelect" runat="server" Width="60px" Font-Size="8pt" Text='<%# resmgr.GetString("text_select") %>' onclick="buttonSelect_Click"></asp:button></TD>
-		</TR>
-		<TR>
-			<TD noWrap></TD>
-			<TD width="98%"><asp:textbox id="textNewFileName" runat="server" Width="99%"></asp:textbox></TD>
-			<TD><asp:button id="buttonCreate" runat="server" Width="60px" Font-Size="8pt" Text='<%# resmgr.GetString("text_create") %>' onclick="buttonCreate_Click"></asp:button></TD>
-		</TR>
-	</TABLE>
+	<table id="Table2" cellspacing="0" cellpadding="2" width="100%" border="0">
+		<tr>
+			<td nowrap><asp:label id="labelOpmlList" runat="server" Text='<%# resmgr.GetString("text_opml_files") %>'></asp:label></td>
+			<td width="98%"><asp:dropdownlist id="listFiles" runat="server" Width="100%"></asp:dropdownlist></td>
+			<td><asp:button id="buttonSelect" runat="server" Width="60px" Font-Size="8pt" Text='<%# resmgr.GetString("text_select") %>' onclick="buttonSelect_Click"></asp:button></td>
+		</tr>
+		<tr>
+			<td nowrap></td>
+			<td width="98%"><asp:textbox id="textNewFileName" runat="server" Width="99%"></asp:textbox></td>
+			<td><asp:button id="buttonCreate" runat="server" Width="60px" Font-Size="8pt" Text='<%# resmgr.GetString("text_create") %>' onclick="buttonCreate_Click"></asp:button></td>
+		</tr>
+	</table>
 	<cc1:ShadowBox id="shadowBox" style="MARGIN-TOP:10px" Width="100%" runat="server" ShadowDepth="6">
 <asp:datagrid id=blogRollGrid runat="server" Width="100%" AutoGenerateColumns="False" AllowPaging="True" BorderColor="#999999" BorderStyle="Solid" BorderWidth="1" CellPadding="4">
 		<SelectedItemStyle Font-Bold="True" ForeColor="White" BackColor="#000099"></SelectedItemStyle>
@@ -44,23 +44,23 @@
 				<HeaderStyle Width="55px"></HeaderStyle>
 				<ItemStyle VerticalAlign="Top"></ItemStyle>
 				<HeaderTemplate>
-					<DIV align="right">
+					<div align="right">
 						<asp:ImageButton id=buttonAddItem runat="server" ImageUrl='<%# ((newtelligence.DasBlog.Web.Core.SharedBasePage)Page).GetThemedImageUrl("addbutton-list") %>' CommandName="AddItem" ToolTip='<%# resmgr.GetString("tooltip_item_add") %>'>
-						</asp:ImageButton></DIV>
+						</asp:ImageButton></div>
 				</HeaderTemplate>
 				<ItemTemplate>
-					<DIV align="right">
+					<div align="right">
 						<asp:ImageButton id=ImageButton1 runat="server" ImageUrl='<%# ((newtelligence.DasBlog.Web.Core.SharedBasePage)Page).GetThemedImageUrl("editbutton-list") %>' CommandName="Edit" ToolTip='<%# resmgr.GetString("tooltip_item_edit") %>' AlternateText="Edit" CausesValidation="False">
 						</asp:ImageButton>&nbsp;
 						<asp:ImageButton id=ImageButton2 runat="server" ImageUrl='<%# ((newtelligence.DasBlog.Web.Core.SharedBasePage)Page).GetThemedImageUrl("deletebutton-list") %>' CommandName="Delete" ToolTip='<%# resmgr.GetString("tooltip_item_delete") %>' AlternateText="Delete" CausesValidation="False">
-						</asp:ImageButton></DIV>
+						</asp:ImageButton></div>
 				</ItemTemplate>
 				<EditItemTemplate>
-					<DIV align="right">
+					<div align="right">
 						<asp:ImageButton id=ImageButton3 runat="server" ImageUrl='<%# ((newtelligence.DasBlog.Web.Core.SharedBasePage)Page).GetThemedImageUrl("okbutton-list") %>' CommandName="Update" ToolTip='<%# resmgr.GetString("tooltip_item_ok") %>' AlternateText="Ok" CausesValidation="False">
 						</asp:ImageButton>&nbsp;
 						<asp:ImageButton id=ImageButton4 runat="server" ImageUrl='<%# ((newtelligence.DasBlog.Web.Core.SharedBasePage)Page).GetThemedImageUrl("undobutton-list") %>' CommandName="Cancel" ToolTip='<%# resmgr.GetString("tooltip_item_cancel") %>' AlternateText="Cancel" CausesValidation="False">
-						</asp:ImageButton></DIV>
+						</asp:ImageButton></div>
 				</EditItemTemplate>
 			</asp:TemplateColumn>
 		</Columns>
@@ -68,4 +68,4 @@
 	</asp:datagrid>
 	</cc1:ShadowBox>
 	</div>
-</DIV>
+</div>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditBlogRollBox.ascx.designer.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditBlogRollBox.ascx.designer.cs	2008-01-10 21:09:13 UTC (rev 789)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditBlogRollBox.ascx.designer.cs	2008-01-10 21:14:17 UTC (rev 790)
@@ -1,10 +1,10 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:2.0.50727.1318
+//     Dieser Code wurde von einem Tool generiert.
+//     Laufzeitversion:2.0.50727.312
 //
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     \xC4nderungen an dieser Datei k\xF6nnen falsches Verhalten verursachen und gehen verloren, wenn
+//     der Code erneut generiert wird.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
@@ -12,82 +12,82 @@
     
     
     /// <summary>
-    /// EditBlogRollBox class.
+    /// EditBlogRollBox-Klasse.
     /// </summary>
     /// <remarks>
-    /// Auto-generated class.
+    /// Automatisch generierte Klasse.
     /// </remarks>
     public partial class EditBlogRollBox {
         
         /// <summary>
-        /// Label1 control.
+        /// Label1-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label Label1;
         
         /// <summary>
-        /// labelOpmlList control.
+        /// labelOpmlList-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label labelOpmlList;
         
         /// <summary>
-        /// listFiles control.
+        /// listFiles-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.DropDownList listFiles;
         
         /// <summary>
-        /// buttonSelect control.
+        /// buttonSelect-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Button buttonSelect;
         
         /// <summary>
-        /// textNewFileName control.
+        /// textNewFileName-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox textNewFileName;
         
         /// <summary>
-        /// buttonCreate control.
+        /// buttonCreate-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Button buttonCreate;
         
         /// <summary>
-        /// shadowBox control.
+        /// shadowBox-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::newtelligence.DasBlog.Web.Core.WebControls.ShadowBox shadowBox;
         
         /// <summary>
-        /// blogRollGrid control.
+        /// blogRollGrid-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.DataGrid blogRollGrid;
     }

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditBlogRollEditItem.ascx
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditBlogRollEditItem.ascx	2008-01-10 21:09:13 UTC (rev 789)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditBlogRollEditItem.ascx	2008-01-10 21:14:17 UTC (rev 790)
@@ -1,38 +1,38 @@
 <%@ Control Language="c#" AutoEventWireup="True" Codebehind="EditBlogRollEditItem.ascx.cs" Inherits="newtelligence.DasBlog.Web.EditBlogRollEditItem" TargetSchema="http://schemas.microsoft.com/intellisense/ie5"%>
 <%@ Register TagPrefix="blogcore" Namespace="newtelligence.DasBlog.Web.Core" Assembly="newtelligence.DasBlog.Web.Core" %>
 <%@ Register TagPrefix="uc1" TagName="EditBlogRollItem" Src="EditBlogRollItem.ascx" %>
-<TABLE id="itemEditTable" cellSpacing="0" cellPadding="2" width="100%" border="0" style="MARGIN-BOTTOM: 20px">
-	<TR>
-		<TD style="FONT-SIZE: smaller" noWrap width="1%">
+<table id="itemEditTable" cellspacing="0" cellpadding="2" width="100%" border="0" style="MARGIN-BOTTOM: 20px">
+	<tr>
+		<td style="FONT-SIZE: smaller" nowrap width="1%">
 			<asp:Label id=labelTitle Text='<%# resmgr.GetString("text_title") %>' runat="server">
-			</asp:Label></TD>
-		<TD>
-			<asp:TextBox id="textTitle" runat="server" Font-Size="Smaller" Text="" Width="100%"></asp:TextBox></TD>
+			</asp:Label></td>
+		<td>
+			<asp:TextBox id="textTitle" runat="server" Font-Size="Smaller" Text="" Width="100%"></asp:TextBox></td>
 		<td width="55" rowspan="4" valign="bottom" align="right"><asp:ImageButton id="buttonAddItem" runat="server" ImageUrl='<%# ((newtelligence.DasBlog.Web.Core.SharedBasePage)Page).GetThemedImageUrl("addbutton-list") %>' CommandName="AddSubitem"
 				AlternateText="Add Entry" ToolTip='<%# resmgr.GetString("tooltip_item_add") %>'></asp:ImageButton></td>
-	</TR>
-	<TR>
-		<TD style="FONT-SIZE: smaller">
+	</tr>
+	<tr>
+		<td style="FONT-SIZE: smaller">
 			<asp:Label id=labelDescription Text='<%# resmgr.GetString("text_description") %>' runat="server">
-			</asp:Label></TD>
-		<TD>
-			<asp:TextBox id="textDescription" runat="server" Font-Size="Smaller" Text="" Width="100%"></asp:TextBox></TD>
-	</TR>
-	<TR>
-		<TD style="FONT-SIZE: smaller" noWrap width="1%">
+			</asp:Label></td>
+		<td>
+			<asp:TextBox id="textDescription" runat="server" Font-Size="Smaller" Text="" Width="100%"></asp:TextBox></td>
+	</tr>
+	<tr>
+		<td style="FONT-SIZE: smaller" nowrap width="1%">
 			<asp:Label id=labelHtmlUrl Text='<%# resmgr.GetString("text_html_url") %>' runat="server">
-			</asp:Label></TD>
-		<TD style="HEIGHT: 27px">
-			<asp:TextBox id="textHtmlUrl" runat="server" Font-Size="Smaller" Text="" Width="100%"></asp:TextBox></TD>
-	</TR>
-	<TR>
-		<TD style="FONT-SIZE: smaller">
+			</asp:Label></td>
+		<td style="HEIGHT: 27px">
+			<asp:TextBox id="textHtmlUrl" runat="server" Font-Size="Smaller" Text="" Width="100%"></asp:TextBox></td>
+	</tr>
+	<tr>
+		<td style="FONT-SIZE: smaller">
 			<asp:Label id=labelXmlUrl Text='<%# resmgr.GetString("text_xml_url") %>' runat="server">
-			</asp:Label></TD>
-		<TD>
-			<asp:TextBox id="textXmlUrl" runat="server" Font-Size="Smaller" Text="" Width="100%"></asp:TextBox></TD>
-	</TR>
-</TABLE>
+			</asp:Label></td>
+		<td>
+			<asp:TextBox id="textXmlUrl" runat="server" Font-Size="Smaller" Text="" Width="100%"></asp:TextBox></td>
+	</tr>
+</table>
 <asp:panel id="multiItemPanel" runat="server" Width="100%">
 	<asp:datagrid id="blogRollGrid" runat="server" Width="100%" AutoGenerateColumns="False" AllowPaging="True"
 		BorderColor="#999999" BorderStyle="Solid" BorderWidth="0px" CellPadding="4" GridLines="None"
@@ -57,18 +57,18 @@
 				<HeaderStyle Width="55px"></HeaderStyle>
 				<ItemStyle VerticalAlign="Top"></ItemStyle>
 				<ItemTemplate>
-					<DIV align="right">
+					<div align="right">
 						<asp:ImageButton id=ImageButton1 runat="server" ToolTip='<%# resmgr.GetString("tooltip_item_edit") %>' AlternateText="Edit" CommandName="Edit" ImageUrl='<%# ((newtelligence.DasBlog.Web.Core.SharedBasePage)Page).GetThemedImageUrl("editbutton-list") %>' CausesValidation="False">
 						</asp:ImageButton>&nbsp;
 						<asp:ImageButton id=ImageButton2 runat="server" ToolTip='<%# resmgr.GetString("tooltip_item_delete") %>' AlternateText="Delete" CommandName="Delete" ImageUrl='<%# ((newtelligence.DasBlog.Web.Core.SharedBasePage)Page).GetThemedImageUrl("deletebutton-list") %>' CausesValidation="False">
-						</asp:ImageButton></DIV>
+						</asp:ImageButton></div>
 				</ItemTemplate>
 				<EditItemTemplate>
-					<DIV align="right">
+					<div align="right">
 						<asp:ImageButton id=ImageButton3 runat="server" ToolTip='<%# resmgr.GetString("tooltip_item_ok") %>' AlternateText="Ok" CommandName="Update" ImageUrl='<%# ((newtelligence.DasBlog.Web.Core.SharedBasePage)Page).GetThemedImageUrl("okbutton-list") %>' CausesValidation="False">
 						</asp:ImageButton>&nbsp;
 						<asp:ImageButton id=ImageButton4 runat="server" ToolTip='<%# resmgr.GetString("tooltip_item_cancel") %>' AlternateText="Cancel" CommandName="Cancel" ImageUrl='<%# ((newtelligence.DasBlog.Web.Core.SharedBasePage)Page).GetThemedImageUrl("undobutton-list") %>' CausesValidation="False">
-						</asp:ImageButton></DIV>
+						</asp:ImageButton></div>
 				</EditItemTemplate>
 			</asp:TemplateColumn>
 		</Columns>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditBlogRollEditItem.ascx.designer.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditBlogRollEditItem.ascx.designer.cs	2008-01-10 21:09:13 UTC (rev 789)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditBlogRollEditItem.ascx.designer.cs	2008-01-10 21:14:17 UTC (rev 790)
@@ -1,10 +1,10 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:2.0.50727.1318
+//     Dieser Code wurde von einem Tool generiert.
+//     Laufzeitversion:2.0.50727.312
 //
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     \xC4nderungen an dieser Datei k\xF6nnen falsches Verhalten verursachen und gehen verloren, wenn
+//     der Code erneut generiert wird.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
@@ -12,109 +12,109 @@
     
     
     /// <summary>
-    /// EditBlogRollEditItem class.
+    /// EditBlogRollEditItem-Klasse.
     /// </summary>
     /// <remarks>
-    /// Auto-generated class.
+    /// Automatisch generierte Klasse.
     /// </remarks>
     public partial class EditBlogRollEditItem {
         
         /// <summary>
-        /// labelTitle control.
+        /// labelTitle-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label labelTitle;
         
         /// <summary>
-        /// textTitle control.
+        /// textTitle-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox textTitle;
         
         /// <summary>
-        /// buttonAddItem control.
+        /// buttonAddItem-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.ImageButton buttonAddItem;
         
         /// <summary>
-        /// labelDescription control.
+        /// labelDescription-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label labelDescription;
         
         /// <summary>
-        /// textDescription control.
+        /// textDescription-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox textDescription;
         
         /// <summary>
-        /// labelHtmlUrl control.
+        /// labelHtmlUrl-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label labelHtmlUrl;
         
         /// <summary>
-        /// textHtmlUrl control.
+        /// textHtmlUrl-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox textHtmlUrl;
         
         /// <summary>
-        /// labelXmlUrl control.
+        /// labelXmlUrl-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label labelXmlUrl;
         
         /// <summary>
-        /// textXmlUrl control.
+        /// textXmlUrl-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox textXmlUrl;
         
         /// <summary>
-        /// multiItemPanel control.
+        /// multiItemPanel-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Panel multiItemPanel;
         
         /// <summary>
-        /// blogRollGrid control.
+        /// blogRollGrid-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.DataGrid blogRollGrid;
     }

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditBlogRollItem.ascx
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditBlogRollItem.ascx	2008-01-10 21:09:13 UTC (rev 789)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditBlogRollItem.ascx	2008-01-10 21:14:17 UTC (rev 790)
@@ -1,9 +1,9 @@
 <%@ Control Language="c#" AutoEventWireup="True" Codebehind="EditBlogRollItem.ascx.cs" Inherits="newtelligence.DasBlog.Web.EditBlogRollItem" TargetSchema="http://schemas.microsoft.com/intellisense/ie5"%>
-<P>
+<p>
 	<asp:HyperLink id=rssLink runat="server" ImageUrl='<%# (outlineCollection != null &amp;&amp; outlineCollection.Count > 0 ) ? ((newtelligence.DasBlog.Web.Core.SharedBasePage)Page).GetThemedImageUrl("outlinearrow") : ((newtelligence.DasBlog.Web.Core.SharedBasePage)Page).GetThemedImageUrl("xmlButton")%>' NavigateUrl='<%# XmlUrl %>'>
 	</asp:HyperLink>
 	<asp:HyperLink id=htmlLink runat="server" Text='<%# Title %>' NavigateUrl='<%# HtmlUrl %>'>
 	</asp:HyperLink>&nbsp;
 	<asp:Label id=description runat="server" Text='<%# Description %>'>
 	</asp:Label>
-</P>
+</p>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditBlogRollItem.ascx.designer.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditBlogRollItem.ascx.designer.cs	2008-01-10 21:09:13 UTC (rev 789)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditBlogRollItem.ascx.designer.cs	2008-01-10 21:14:17 UTC (rev 790)
@@ -1,10 +1,10 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:2.0.50727.1318
+//     Dieser Code wurde von einem Tool generiert.
+//     Laufzeitversion:2.0.50727.312
 //
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     \xC4nderungen an dieser Datei k\xF6nnen falsches Verhalten verursachen und gehen verloren, wenn
+//     der Code erneut generiert wird.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
@@ -12,37 +12,37 @@
     
     
     /// <summary>
-    /// EditBlogRollItem class.
+    /// EditBlogRollItem-Klasse.
     /// </summary>
     /// <remarks>
-    /// Auto-generated class.
+    /// Automatisch generierte Klasse.
     /// </remarks>
     public partial class EditBlogRollItem {
         
         /// <summary>
-        /// rssLink control.
+        /// rssLink-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.HyperLink rssLink;
         
         /// <summary>
-        /// htmlLink control.
+        /// htmlLink-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.HyperLink htmlLink;
         
         /// <summary>
-        /// description control.
+        /// description-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label description;
     }

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditConfigBox.ascx
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditConfigBox.ascx	2008-01-10 21:09:13 UTC (rev 789)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditConfigBox.ascx	2008-01-10 21:14:17 UTC (rev 790)
@@ -539,11 +539,11 @@
 
 			<tr>
 				<td colspan="2" style="HEIGHT: 64px">
-					<P>
+					<p>
 						<asp:CheckBox ID="checkComments" runat="server" Text='<%# resmgr.GetString("text_config_notify_comments")%>' CssClass="configControlStyle">
-						</asp:CheckBox><asp:CheckBox ID="checkPosts" runat="server" Text='<%# resmgr.GetString("text_config_notify_posts")%>' CssClass="configControlStyle"></asp:CheckBox><asp:CheckBox ID="checkTrackbacks" runat="server" Text='<%# resmgr.GetString("text_config_notify_trackbacks")%>' CssClass="configControlStyle"></asp:CheckBox><asp:CheckBox ID="checkPingbacks" runat="server" Text='<%# resmgr.GetString("text_config_notify_pingbacks")%>' CssClass="configControlStyle"></asp:CheckBox><asp:CheckBox ID="checkReferrals" runat="server" Text='<%# resmgr.GetString("text_config_notify_referrals")%>' CssClass="configControlStyle"></asp:CheckBox></P>
-					<P>
-						<asp:CheckBox id="checkDailyReport" runat="server" CssClass="configControlStyle"></asp:CheckBox></P>
+						</asp:CheckBox><asp:CheckBox ID="checkPosts" runat="server" Text='<%# resmgr.GetString("text_config_notify_posts")%>' CssClass="configControlStyle"></asp:CheckBox><asp:CheckBox ID="checkTrackbacks" runat="server" Text='<%# resmgr.GetString("text_config_notify_trackbacks")%>' CssClass="configControlStyle"></asp:CheckBox><asp:CheckBox ID="checkPingbacks" runat="server" Text='<%# resmgr.GetString("text_config_notify_pingbacks")%>' CssClass="configControlStyle"></asp:CheckBox><asp:CheckBox ID="checkReferrals" runat="server" Text='<%# resmgr.GetString("text_config_notify_referrals")%>' CssClass="configControlStyle"></asp:CheckBox></p>
+					<p>
+						<asp:CheckBox id="checkDailyReport" runat="server" CssClass="configControlStyle"></asp:CheckBox></p>
 				</td>
 			</tr>
 			<tr>
@@ -614,7 +614,7 @@
 			<tr>
 				<td class="configLabelColumnStyle" nowrap colspan="2">
 					<asp:CheckBox ID="checkEnableRSSItemFooter" runat="server" Text='<%# resmgr.GetString("text_config_enable_rss_footer") %>' CssClass="configControlStyle">
-					</asp:CheckBox><br>
+					</asp:CheckBox><br/>
 					<asp:TextBox ID="textRSSItemFooter" runat="server" CssClass="configControlStyle" Columns="60"
 						TextMode="MultiLine" Rows="5" ReadOnly="false"></asp:TextBox></td>
 			</tr>
@@ -831,7 +831,7 @@
 					<asp:RadioButtonList ID="optionSpamHandling" Runat="server"></asp:RadioButtonList></td>
 				<td>
 					<asp:Label ID="Label7" runat="server" Text='<%# resmgr.GetString("text_config_spamblockingapikey") %>' CssClass="configLabelStyle">
-					</asp:Label><br>
+					</asp:Label><br/>
 					<asp:TextBox ID="textSpamBlockingApiKey" runat="server" CssClass="configControlStyle" MaxLength="2048"
 						Columns="40"></asp:TextBox></td>
 			</tr>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditConfigBox.ascx.designer.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditConfigBox.ascx.designer.cs	2008-01-10 21:09:13 UTC (rev 789)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditConfigBox.ascx.designer.cs	2008-01-10 21:14:17 UTC (rev 790)
@@ -1,10 +1,10 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:2.0.50727.832
+//     Dieser Code wurde von einem Tool generiert.
+//     Laufzeitversion:2.0.50727.312
 //
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     \xC4nderungen an dieser Datei k\xF6nnen falsches Verhalten verursachen und gehen verloren, wenn
+//     der Code erneut generiert wird.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
@@ -12,1954 +12,1954 @@
     
     
     /// <summary>
-    /// EditConfigBox class.
+    /// EditConfigBox-Klasse.
     /// </summary>
     /// <remarks>
-    /// Auto-generated class.
+    /// Automatisch generierte Klasse.
     /// </remarks>
     public partial class EditConfigBox {
         
         /// <summary>
-        /// Label12 control.
+        /// Label12-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label Label12;
         
         /// <summary>
-        /// validationSummary control.
+        /// validationSummary-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.ValidationSummary validationSummary;
         
         /// <summary>
-        /// lBasicSettings control.
+        /// lBasicSettings-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lBasicSettings;
         
         /// <summary>
-        /// labelTitle control.
+        /// labelTitle-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label labelTitle;
         
         /// <summary>
-        /// validatorRFTitle control.
+        /// validatorRFTitle-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.RequiredFieldValidator validatorRFTitle;
         
         /// <summary>
-        /// textTitle control.
+        /// textTitle-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox textTitle;
         
         /// <summary>
-        /// labelSubtitle control.
+        /// labelSubtitle-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label labelSubtitle;
         
         /// <summary>
-        /// textSubtitle control.
+        /// textSubtitle-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox textSubtitle;
         
         /// <summary>
-        /// labelContact control.
+        /// labelContact-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label labelContact;
         
         /// <summary>
-        /// validatorRFContact control.
+        /// validatorRFContact-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.RequiredFieldValidator validatorRFContact;
         
         /// <summary>
-        /// validatorREContact control.
+        /// validatorREContact-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.RegularExpressionValidator validatorREContact;
         
         /// <summary>
-        /// textContact control.
+        /// textContact-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.TextBox textContact;
         
         /// <summary>
-        /// labelRoot control.
+        /// labelRoot-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label labelRoot;
         
         /// <summary>
-        /// validatorRFRoot control.
+        /// validatorRFRoot-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Dasblogce-cvs] SF.net SVN: dasblogce: [793] branches/refactoring_architecture/source

From: <sfcaus@us...> - 2008-01-11 15:53

Revision: 793
          http://dasblogce.svn.sourceforge.net/dasblogce/?rev=793&view=rev
Author:   sfcaus
Date:     2008-01-11 07:53:27 -0800 (Fri, 11 Jan 2008)

Log Message:
-----------
- cleanup the Namespaces
- reformating code
- some fixes
- useless comments deleted

Modified Paths:
--------------
    branches/refactoring_architecture/source/AssemblyInfo.cs
    branches/refactoring_architecture/source/DasBlogUpgrader/AssemblyInfo.cs
    branches/refactoring_architecture/source/DasBlogUpgrader/DayExtraOld.cs
    branches/refactoring_architecture/source/DasBlogUpgrader/MovableTypeBlacklist.cs
    branches/refactoring_architecture/source/DasBlogUpgrader/Program.cs
    branches/refactoring_architecture/source/DasBlogUpgrader/ReferralBlackList.cs
    branches/refactoring_architecture/source/Lesnikowski.Pawel.Mail.Pop3/AssemblyInfo.cs
    branches/refactoring_architecture/source/Lesnikowski.Pawel.Mail.Pop3/Example.cs
    branches/refactoring_architecture/source/Lesnikowski.Pawel.Mail.Pop3/Pop3Message.cs
    branches/refactoring_architecture/source/Lesnikowski.Pawel.Mail.Pop3/QuotedCoding.cs
    branches/refactoring_architecture/source/Subtext.Akismet/HttpClient.cs
    branches/refactoring_architecture/source/WebControlCaptcha/AssemblyInfo.vb
    branches/refactoring_architecture/source/WebControlCaptcha/CaptchaControl.vb
    branches/refactoring_architecture/source/WebControlCaptcha/CaptchaImage.vb
    branches/refactoring_architecture/source/WebControlCaptcha/CaptchaImageHandler.vb
    branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/BlogDataService.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CategoryCache.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CategoryCacheEntry.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CategoryCacheEntryCollection.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CategoryCacheEntryDetail.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CategoryCacheEntryDetailCollection.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CollectionFilter.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Comment.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CommentCollection.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CommentFile.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CrossPostServerInfo.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Crosspost.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CrosspostInfoCollection.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CrosspostSite.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/DataManager.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/DayEntry.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/DayEntryCollection.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/DayEntryCollectionFilter.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/EntryCollection.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/EntryCollectionFilter.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/EntryIdCache.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/EntryIdCacheEntry.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/EntryIdCacheEntryCollection.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/ErrorTrace.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/EventDataItemCollection.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/EventMessageTemplates.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/IDayEntry.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/IFeedback.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/ISpamBlockingService.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/LogDataItem.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/LogDataItemCollection.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/LogEncoder.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/LoggingDataService.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/LoggingDataServiceFactory.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/PingService.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/PingbackInfoCollection.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/SendMailInfo.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/SpamState.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Test/AppTest.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Test/BlogDataServiceTests.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Test/BloggerApiTest.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Test/EntryCollectionTests.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Test/EntryTests.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Test/TestBaseLocal.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Test/TestBaseServer.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Test/TrackbackTests.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Test/assemblyinfo.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/TrackbackInfo.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/TrackbackInfoCollection.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Tracking.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/TrackingCollection.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/WeblogUpdatePingInfo.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime.Proxies/BloggerAPIClientProxy.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime.Proxies/ImpersonationSharing.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime.Proxies/XmlStorageSystemClientProxy.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Util/CommandLineSwitchAttribute.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Html/HtmlTokenizer.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Util/HttpHelper.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Parser.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Util/RFC2822Date.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Util/ReflectionHelper.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Resources/WebUtil.Designer.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Test/BlogSource.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Test/CommandLine.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Test/ParserTest.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Test/ReflectionHelperTest.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Util/TimeZones.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Util/XmlNamespaceUpgradeReader.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Zip/Crc32.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Zip/Shared.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Zip/ZipDirEntry.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Zip/ZipEntry.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Zip/ZipFile.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Activity.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ActivityBox.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AdminNavBar.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AggBugs.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AggBugsBox.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ArchivesControl.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/BlogRollControl.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/CategoryView.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ClickThroughs.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ClickThroughsBox.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/CommentViewBox.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/CrosspostReferrers.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/CrosspostReferrersBox.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditBlogRoll.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditBlogRollBox.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditBlogRollEditItem.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditBlogRollItem.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditConfig.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditConfigBox.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditContentFilters.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditContentFiltersBox.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditControlProvider.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditCrosspostSites.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditCrosspostSitesBox.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditEntryBox.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditNavigatorLinks.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditNavigatorLinksBox.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditService.asmx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditUser.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditUserBox.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Email.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EmailBox.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Eventlog.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EventlogBox.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/FormatControl.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/FormatPage.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/FreeTextBoxAdapter.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Global.asax
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Global.asax.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/LoginBox.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Logout.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/MonthView.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/MonthViewBox.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Profile.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ProfileCombo.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Search.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Search.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Search.ascx.designer.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/SearchView.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/SearchViewBox.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/SingleCommentView.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/SingleCommentView.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/SingleCommentView.ascx.designer.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/StatisticsListBase.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/SyndicationService.asmx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/SyndicationServiceExperimental.asmx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/TextBoxAdapter.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ThemeBar.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ThemeCombo.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/TimeLineControl.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/UserClickThroughs.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/UserClickThroughsBox.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/UserView.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/default.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ftb/ftb.inserttable.aspx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/AkismetSpamBlockingService.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/CategoryList.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/IPBlackList.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/MatchedTag.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/MatchedTagCollection.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/NamingPanel.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/NavigationLink.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Opml.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/ProfileMapperModule.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/RobotDefinition.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/SearchHighlight.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/SharedBaseControl.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/SharedBasePage.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/SideBarList.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/SideBarOpmlList.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/SiteConfig.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/SiteSecurity.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/SiteUtilities.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/TemplateProcessor.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Test/AssemblyInfo.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Test/OpmlSerializeTest.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Test/SiteConfigSerializeTest.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Test/UtilitiesTests.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Themes.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/TitleMapperModule.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/UrlMapperModule.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/ValidTag.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/ValidTagCollection.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/WebControls/ControlImageHandler.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/WebControls/ShadowBox.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/WeblogCalendar.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/AggregatorBugHandler.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/ApproveItemHandler.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/Atom10.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/AutoSaveEntryHandler.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/Blogger.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/BloggerAPI.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/CdfHandler.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/ClickThroughHandler.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/CommentAPI.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/ConfigEditingServiceImplementation.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/CrosspostReferrerHandler.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/DeleteItemHandler.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/EditServiceImplementation.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/GoogleSitemap.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/GoogleSitemapHandler.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/MailToWeblog.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/MicrosummaryHandler.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/PingbackAPI.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/ReportMailer.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/Rsd.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/Rss.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/SyndicationServiceBase.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/SyndicationServiceExperimentalImplementation.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/SyndicationServiceImplementation.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/Test/AssemblyInfo.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/Test/ConfigServiceTester.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/Test/Web References/ConfigService/Reference.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/Test/newtelligence.DasBlog.Web.Services.Test.csproj
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/Timeline.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/TimelineHandler.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/TrackbackHandler.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/XSSUpstreamer.cs

Modified: branches/refactoring_architecture/source/AssemblyInfo.cs
===================================================================
--- branches/refactoring_architecture/source/AssemblyInfo.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/AssemblyInfo.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -10,17 +10,14 @@
 
 using System;
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-[assembly: AssemblyTitle("dasBlog 2.1")]
-[assembly: AssemblyDescription("dasBlog 2.1 ASP.NET Blogging Engine")]
-[assembly: AssemblyProduct("newtelligence dasBlog")]
-[assembly: AssemblyCopyright("Copyright (c) 2007 newtelligence AG")]
-[assembly: ComVisible(false)]
-[assembly: CLSCompliant(false)]
-[assembly: Guid("22F15D36-4E7E-4c9b-A79C-F0A2177EE97B")]
-[assembly: AssemblyVersion("2.1.7238.742")]
-[assembly: AssemblyFileVersion("2.1.7238.742")]
-
-
+[assembly : AssemblyTitle("dasBlog 2.1")]
+[assembly : AssemblyDescription("dasBlog 2.1 ASP.NET Blogging Engine")]
+[assembly : AssemblyProduct("newtelligence dasBlog")]
+[assembly : AssemblyCopyright("Copyright (c) 2007 newtelligence AG")]
+[assembly : ComVisible(false)]
+[assembly : CLSCompliant(false)]
+[assembly : Guid("22F15D36-4E7E-4c9b-A79C-F0A2177EE97B")]
+[assembly : AssemblyVersion("2.1.7238.742")]
+[assembly : AssemblyFileVersion("2.1.7238.742")]
\ No newline at end of file

Modified: branches/refactoring_architecture/source/DasBlogUpgrader/AssemblyInfo.cs
===================================================================
--- branches/refactoring_architecture/source/DasBlogUpgrader/AssemblyInfo.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/DasBlogUpgrader/AssemblyInfo.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 
 //
 // General Information about an assembly is controlled through the following 

Modified: branches/refactoring_architecture/source/DasBlogUpgrader/DayExtraOld.cs
===================================================================
--- branches/refactoring_architecture/source/DasBlogUpgrader/DayExtraOld.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/DasBlogUpgrader/DayExtraOld.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -38,14 +38,11 @@
 #endregion
 
 using System;
-using System.Collections.Specialized;
 using System.Diagnostics;
-using System.Globalization;
 using System.IO;
 using System.Xml;
 using System.Xml.Serialization;
 using newtelligence.DasBlog.Util;
-using System.Web;
 
 namespace newtelligence.DasBlog.Runtime
 {

Modified: branches/refactoring_architecture/source/DasBlogUpgrader/MovableTypeBlacklist.cs
===================================================================
--- branches/refactoring_architecture/source/DasBlogUpgrader/MovableTypeBlacklist.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/DasBlogUpgrader/MovableTypeBlacklist.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -161,7 +161,7 @@
 		/// <returns>A <see cref="Match"/>.</returns>
 		public Match IsBlacklisted(string url)
 		{
-			if (!MovableTypeBlacklist.loaded)
+			if (!loaded)
 			{
 				return null;
 			}

Modified: branches/refactoring_architecture/source/DasBlogUpgrader/Program.cs
===================================================================
--- branches/refactoring_architecture/source/DasBlogUpgrader/Program.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/DasBlogUpgrader/Program.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -6,6 +6,7 @@
 using System.IO;
 using System.Security.Principal;
 using System.Text.RegularExpressions;
+using System.Threading;
 using System.Xml;
 using System.Xml.Serialization;
 using newtelligence.DasBlog.Runtime;
@@ -198,7 +199,7 @@
 					}
 					catch(Exception e)
 					{
-						ErrorTrace.Trace(System.Diagnostics.TraceLevel.Error,e);
+						ErrorTrace.Trace(TraceLevel.Error,e);
 					}
 					finally
 					{
@@ -408,7 +409,7 @@
 			Console.WriteLine("BACKUP YOUR CONTENT FOLDER BEFORE RUNNING THIS!");
 
 			// we need to set the role to admin so we get public entries
-			System.Threading.Thread.CurrentPrincipal = new GenericPrincipal(System.Threading.Thread.CurrentPrincipal.Identity, new string[] {"admin"});
+			Thread.CurrentPrincipal = new GenericPrincipal(Thread.CurrentPrincipal.Identity, new string[] {"admin"});
 
 			if (args.Length != 1)
 			{

Modified: branches/refactoring_architecture/source/DasBlogUpgrader/ReferralBlackList.cs
===================================================================
--- branches/refactoring_architecture/source/DasBlogUpgrader/ReferralBlackList.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/DasBlogUpgrader/ReferralBlackList.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -1,9 +1,8 @@
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using System.Text.RegularExpressions;
-using System.Web;
 using newtelligence.DasBlog.Runtime;
-using System.Collections.Generic;
 
 namespace newtelligence.DasBlog.Web.Core
 {

Modified: branches/refactoring_architecture/source/Lesnikowski.Pawel.Mail.Pop3/AssemblyInfo.cs
===================================================================
--- branches/refactoring_architecture/source/Lesnikowski.Pawel.Mail.Pop3/AssemblyInfo.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/Lesnikowski.Pawel.Mail.Pop3/AssemblyInfo.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 
 //
 // General Information about an assembly is controlled through the following 

Modified: branches/refactoring_architecture/source/Lesnikowski.Pawel.Mail.Pop3/Example.cs
===================================================================
--- branches/refactoring_architecture/source/Lesnikowski.Pawel.Mail.Pop3/Example.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/Lesnikowski.Pawel.Mail.Pop3/Example.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -1,11 +1,8 @@
 //Pawel Lesnikowski lesnikowski@...
 using System;
-using Lesnikowski.Pawel.Mail.Pop3;
-using System.IO;
-using System.Text;
 using System.Collections;
+using Lesnikowski.Pawel.Mail.Pop3;
 
-
 namespace Example
 {
 	

Modified: branches/refactoring_architecture/source/Lesnikowski.Pawel.Mail.Pop3/Pop3Message.cs
===================================================================
--- branches/refactoring_architecture/source/Lesnikowski.Pawel.Mail.Pop3/Pop3Message.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/Lesnikowski.Pawel.Mail.Pop3/Pop3Message.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -1,6 +1,3 @@
-using System;
-using System.Collections;
-
 namespace Lesnikowski.Pawel.Mail.Pop3
 {
 	public class Pop3Message : BaseEntity

Modified: branches/refactoring_architecture/source/Lesnikowski.Pawel.Mail.Pop3/QuotedCoding.cs
===================================================================
--- branches/refactoring_architecture/source/Lesnikowski.Pawel.Mail.Pop3/QuotedCoding.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/Lesnikowski.Pawel.Mail.Pop3/QuotedCoding.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -38,7 +38,7 @@
                         }
                         else
                         {
-                            buffer[bufferPosition]=System.Convert.ToByte(s.Substring(i+1,2),16);
+                            buffer[bufferPosition]=Convert.ToByte(s.Substring(i+1,2),16);
                         }
                         i+=2;
                     }

Modified: branches/refactoring_architecture/source/Subtext.Akismet/HttpClient.cs
===================================================================
--- branches/refactoring_architecture/source/Subtext.Akismet/HttpClient.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/Subtext.Akismet/HttpClient.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -26,7 +26,7 @@
 		/// <returns></returns>
 		public virtual string PostRequest(Uri url, string userAgent, int timeout, string formParameters)
 		{
-			System.Net.ServicePointManager.Expect100Continue = false;
+			ServicePointManager.Expect100Continue = false;
 			HttpWebRequest request = WebRequest.Create(url) as HttpWebRequest;
 
 			if (null != request)

Modified: branches/refactoring_architecture/source/WebControlCaptcha/AssemblyInfo.vb
===================================================================
--- branches/refactoring_architecture/source/WebControlCaptcha/AssemblyInfo.vb	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/WebControlCaptcha/AssemblyInfo.vb	2008-01-11 15:53:27 UTC (rev 793)
@@ -1,4 +1,3 @@
-Imports System
 Imports System.Reflection
 
 ' General Information about an assembly is controlled through the following 

Modified: branches/refactoring_architecture/source/WebControlCaptcha/CaptchaControl.vb
===================================================================
--- branches/refactoring_architecture/source/WebControlCaptcha/CaptchaControl.vb	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/WebControlCaptcha/CaptchaControl.vb	2008-01-11 15:53:27 UTC (rev 793)
@@ -1,9 +1,11 @@
 Imports System.ComponentModel
-Imports System.Web
+Imports System.Web.UI.WebControls
 Imports System.Web.UI
-Imports System.Web.UI.WebControls
-Imports System.Collections
 Imports System.Collections.Specialized
+Imports System.Drawing
+Imports System.Web
+Imports System.Text
+Imports System.Web.Caching
 
 ''' <summary>
 '''
@@ -18,7 +20,7 @@
 ''' </summary>
 <DefaultProperty("Text")> _
 Public Class CaptchaControl
-    Inherits System.Web.UI.WebControls.WebControl
+    Inherits WebControl
     Implements INamingContainer
     Implements IPostBackDataHandler
 
@@ -47,7 +49,7 @@
         End Set
     End Property
 
-    <DefaultValue(GetType(CaptchaControl.Layout), "Horizontal"), Description("Determines if image and input area are displayed horizontally, or vertically."), Category("Captcha")> _
+    <DefaultValue(GetType(Layout), "Horizontal"), Description("Determines if image and input area are displayed horizontally, or vertically."), Category("Captcha")> _
     Public Property LayoutStyle() As Layout
         Get
             Return _LayoutStyle
@@ -231,7 +233,7 @@
     ''' <summary>
     ''' returns HTML-ized color strings
     ''' </summary>
-    Private Function HtmlColor(ByVal color As Drawing.Color) As String
+    Private Function HtmlColor(ByVal color As Color) As String
         If color.IsEmpty Then Return ""
         If color.IsNamedColor Then
             Return color.ToKnownColor.ToString
@@ -247,7 +249,7 @@
     ''' based on standard control visual properties
     ''' </summary>
     Private Function CssStyle() As String
-        Dim sb As New System.Text.StringBuilder
+        Dim sb As New StringBuilder
         Dim strColor As String
 
         With sb
@@ -421,7 +423,7 @@
         If Not IsDesignMode Then
             'HttpContext.Current.Cache.Add(LocalGuid, _captcha, Nothing, DateTime.Now.AddMinutes(HttpContext.Current.Session.Timeout), TimeSpan.Zero, Caching.CacheItemPriority.Normal, Nothing)
             'No reason to keep the captcha in the cache very long.
-            HttpContext.Current.Cache.Add(LocalGuid, _captcha, Nothing, DateTime.Now.AddMinutes(1), TimeSpan.Zero, Caching.CacheItemPriority.High, Nothing)
+            HttpContext.Current.Cache.Add(LocalGuid, _captcha, Nothing, DateTime.Now.AddMinutes(1), TimeSpan.Zero, CacheItemPriority.High, Nothing)
         End If
         Me.CaptchaText = _captcha.Text
         Me.GeneratedAt = Now

Modified: branches/refactoring_architecture/source/WebControlCaptcha/CaptchaImage.vb
===================================================================
--- branches/refactoring_architecture/source/WebControlCaptcha/CaptchaImage.vb	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/WebControlCaptcha/CaptchaImage.vb	2008-01-11 15:53:27 UTC (rev 793)
@@ -1,7 +1,8 @@
-Imports System
 Imports System.Drawing
+Imports System.Drawing.Text
+Imports System.Text
+Imports System.Drawing.Imaging
 Imports System.Drawing.Drawing2D
-Imports System.Drawing.Imaging
 
 ''' <summary>
 ''' 
@@ -70,7 +71,7 @@
                 _strFontFamilyName = Value
                 font1.Dispose()
             Catch ex As Exception
-                _strFontFamilyName = Drawing.FontFamily.GenericSerif.Name
+                _strFontFamilyName = FontFamily.GenericSerif.Name
             End Try
         End Set
     End Property
@@ -181,8 +182,8 @@
     ''' .. that's not on our font blacklist (illegible for CAPTCHA)
     ''' </summary>
     Private Function RandomFontFamily() As String
-        Dim fc As New System.Drawing.Text.InstalledFontCollection
-        Dim ff() As System.Drawing.FontFamily = fc.Families
+        Dim fc As New InstalledFontCollection
+        Dim ff() As FontFamily = fc.Families
         Dim strFontFamilyName As String = "bogus"
 
         Do While _strGoodFontList.IndexOf(strFontFamilyName) = -1
@@ -198,7 +199,7 @@
     ''' eg, try to avoid numbers and characters that look alike
     ''' </summary>
     Private Function GenerateRandomText() As String
-        Dim sb As New System.Text.StringBuilder
+        Dim sb As New StringBuilder
         Dim n As Integer
         Dim intMaxLength As Integer = _strRandomTextChars.Length
         For n = 0 To _intRandomTextLength - 1

Modified: branches/refactoring_architecture/source/WebControlCaptcha/CaptchaImageHandler.vb
===================================================================
--- branches/refactoring_architecture/source/WebControlCaptcha/CaptchaImageHandler.vb	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/WebControlCaptcha/CaptchaImageHandler.vb	2008-01-11 15:53:27 UTC (rev 793)
@@ -1,6 +1,5 @@
-Imports System
 Imports System.Web
-Imports System.Drawing
+Imports System.Drawing.Imaging
 
 ''' <summary>
 ''' 
@@ -20,7 +19,7 @@
 Public Class CaptchaImageHandler
     Implements IHttpHandler
 
-    Public Sub ProcessRequest(ByVal context As System.Web.HttpContext) Implements System.Web.IHttpHandler.ProcessRequest
+    Public Sub ProcessRequest(ByVal context As HttpContext) Implements IHttpHandler.ProcessRequest
         Dim app As HttpApplication = context.ApplicationInstance
 
         '-- get the unique GUID of the captcha; this must be passed in via querystring 
@@ -47,7 +46,7 @@
         End If
 
         '-- write the image to the HTTP output stream as an array of bytes 
-        ci.Image.Save(app.Context.Response.OutputStream, Drawing.Imaging.ImageFormat.Jpeg)
+        ci.Image.Save(app.Context.Response.OutputStream, ImageFormat.Jpeg)
         app.Response.ContentType = "image/jpeg"
         app.Response.StatusCode = 200
         app.Response.End()
@@ -55,7 +54,7 @@
     End Sub
 
 
-    Public ReadOnly Property IsReusable() As Boolean Implements System.Web.IHttpHandler.IsReusable
+    Public ReadOnly Property IsReusable() As Boolean Implements IHttpHandler.IsReusable
         Get
             Return True
         End Get

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/BlogDataService.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/BlogDataService.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/BlogDataService.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -39,6 +39,7 @@
 
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using System.Diagnostics;
 using System.Globalization;
 using System.IO;
@@ -48,7 +49,6 @@
 using System.Web;
 using CookComputing.XmlRpc;
 using newtelligence.DasBlog.Runtime.Proxies;
-using System.Collections.Generic;
 
 namespace newtelligence.DasBlog.Runtime
 {

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CategoryCache.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CategoryCache.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CategoryCache.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -37,8 +37,6 @@
 */
 #endregion
 
-
-using System.Collections;
 using System.Collections.Generic;
 using System.Xml;
 using System.Xml.Serialization;

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CategoryCacheEntry.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CategoryCacheEntry.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CategoryCacheEntry.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -37,7 +37,6 @@
 */
 #endregion
 
-
 using System.Xml.Serialization;
 
 namespace newtelligence.DasBlog.Runtime

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CategoryCacheEntryCollection.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CategoryCacheEntryCollection.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CategoryCacheEntryCollection.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -1,6 +1,4 @@
-
 using System;
-using System.Collections;
 using System.Collections.Generic;
 
 namespace newtelligence.DasBlog.Runtime

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CategoryCacheEntryDetail.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CategoryCacheEntryDetail.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CategoryCacheEntryDetail.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -37,7 +37,6 @@
 */
 #endregion
 
-
 using System;
 using System.Xml.Serialization;
 

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CategoryCacheEntryDetailCollection.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CategoryCacheEntryDetailCollection.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CategoryCacheEntryDetailCollection.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -1,6 +1,4 @@
-
 using System;
-using System.Collections;
 using System.Collections.Generic;
 
 namespace newtelligence.DasBlog.Runtime

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CollectionFilter.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CollectionFilter.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CollectionFilter.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -1,7 +1,6 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Collections;
+using System.Collections.Generic;
 
 namespace newtelligence.DasBlog.Runtime
 {

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Comment.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Comment.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Comment.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -37,7 +37,6 @@
 */
 #endregion
 
-
 using System;
 using System.Xml;
 using System.Xml.Serialization;

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CommentCollection.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CommentCollection.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CommentCollection.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -1,8 +1,5 @@
-
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Globalization;
 
 namespace newtelligence.DasBlog.Runtime 
 {

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CommentFile.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CommentFile.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CommentFile.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -39,15 +39,12 @@
 
 #endregion
 
-
 using System;
 using System.Diagnostics;
 using System.IO;
 using System.Threading;
 using System.Xml.Serialization;
 
-using newtelligence.DasBlog.Util;
-
 namespace newtelligence.DasBlog.Runtime {
 	
     /// <summary>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CrossPostServerInfo.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CrossPostServerInfo.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CrossPostServerInfo.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -1,5 +1,3 @@
-using System;
-
 namespace newtelligence.DasBlog.Runtime
 {
 	/// <summary>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Crosspost.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Crosspost.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Crosspost.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -42,7 +42,6 @@
 using System.Collections.ObjectModel;
 using System.Xml.Serialization;
 
-
 namespace newtelligence.DasBlog.Runtime
 {
     [Serializable]

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CrosspostInfoCollection.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CrosspostInfoCollection.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CrosspostInfoCollection.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -37,7 +37,6 @@
 */
 #endregion
 
-
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CrosspostSite.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CrosspostSite.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/CrosspostSite.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -37,14 +37,12 @@
 */
 #endregion
 
-
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Xml;
 using System.Xml.Serialization;
 
-
 namespace newtelligence.DasBlog.Runtime
 {
   

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/DataManager.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/DataManager.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/DataManager.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -40,13 +40,9 @@
 #endregion
 
 using System;
-using System.Diagnostics;
+using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
-using System.Web;
-using System.Collections;
-using newtelligence.DasBlog.Util;
-using System.Collections.Generic;
 
 namespace newtelligence.DasBlog.Runtime
 {

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/DayEntry.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/DayEntry.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/DayEntry.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -37,14 +37,15 @@
 */
 #endregion
 
-
 using System;
+using System.Collections;
 using System.Diagnostics;
 using System.Globalization;
 using System.IO;
+using System.Security.Principal;
+using System.Threading;
 using System.Xml;
 using System.Xml.Serialization;
-using System.Collections;
 using newtelligence.DasBlog.Runtime.Proxies;
 using newtelligence.DasBlog.Util;
 
@@ -144,7 +145,7 @@
 			lock(entriesLock)
 			{
 				Predicate<Entry> filter = null;
-				if(!System.Threading.Thread.CurrentPrincipal.IsInRole("admin"))
+				if(!Thread.CurrentPrincipal.IsInRole("admin"))
 				{
                     filter += EntryCollectionFilter.DefaultFilters.IsPublic();
 				}
@@ -204,7 +205,7 @@
 					}
 					catch(Exception e)
 					{
-						ErrorTrace.Trace(System.Diagnostics.TraceLevel.Error,e);
+						ErrorTrace.Trace(TraceLevel.Error,e);
 					}
 					finally
 					{
@@ -233,7 +234,7 @@
 			}
 			else
 			{
-				System.Security.Principal.WindowsImpersonationContext wi = Impersonation.Impersonate();
+				WindowsImpersonationContext wi = Impersonation.Impersonate();
 
 				FileStream fileStream = FileUtils.OpenForWrite(fullPath);
 
@@ -249,7 +250,7 @@
 					}
 					catch(Exception e)
 					{
-						ErrorTrace.Trace(System.Diagnostics.TraceLevel.Error,e);
+						ErrorTrace.Trace(TraceLevel.Error,e);
 					}
 					finally
 					{

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/DayEntryCollection.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/DayEntryCollection.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/DayEntryCollection.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -1,6 +1,4 @@
-
 using System;
-using System.Collections;
 using System.Collections.Generic;
 
 namespace newtelligence.DasBlog.Runtime

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/DayEntryCollectionFilter.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/DayEntryCollectionFilter.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/DayEntryCollectionFilter.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace newtelligence.DasBlog.Runtime
 {

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/EntryCollection.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/EntryCollection.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/EntryCollection.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -1,6 +1,4 @@
-
 using System;
-using System.Collections;
 using System.Collections.Generic;
 
 namespace newtelligence.DasBlog.Runtime

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/EntryCollectionFilter.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/EntryCollectionFilter.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/EntryCollectionFilter.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -1,7 +1,5 @@
 using System;
-using System.Collections.Generic;
 
-
 namespace newtelligence.DasBlog.Runtime
 {
     public class EntryCollectionFilter : CollectionFilter<EntryCollection, Entry>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/EntryIdCache.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/EntryIdCache.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/EntryIdCache.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -38,10 +38,8 @@
 #endregion
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
 
-
 namespace newtelligence.DasBlog.Runtime
 {
     /// <summary>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/EntryIdCacheEntry.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/EntryIdCacheEntry.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/EntryIdCacheEntry.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -37,8 +37,8 @@
 */
 #endregion
 
-
 using System;
+using System.Globalization;
 using System.Xml.Serialization;
 
 namespace newtelligence.DasBlog.Runtime
@@ -61,7 +61,7 @@
 		{
 			get
 			{
-				string date = this.DateUtc.ToString("yyyy/MM/dd/", System.Globalization.CultureInfo.InvariantCulture);
+				string date = this.DateUtc.ToString("yyyy/MM/dd/", CultureInfo.InvariantCulture);
 				return date + this.CompressedTitle;
 			}
 		}

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/EntryIdCacheEntryCollection.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/EntryIdCacheEntryCollection.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/EntryIdCacheEntryCollection.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -1,7 +1,4 @@
-
 using System;
-using System.Collections;
-using newtelligence.DasBlog.Runtime;
 using System.Collections.Generic;
 
 namespace newtelligence.DasBlog.Runtime

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/ErrorTrace.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/ErrorTrace.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/ErrorTrace.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -37,7 +37,6 @@
 */
 #endregion
 
-
 using System;
 using System.Diagnostics;
 

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/EventDataItemCollection.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/EventDataItemCollection.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/EventDataItemCollection.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -37,11 +37,9 @@
 */
 #endregion
 
-
 using System;
-using System.Collections;
-using System.Collections.ObjectModel;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 
 namespace newtelligence.DasBlog.Runtime
 {

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/EventMessageTemplates.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/EventMessageTemplates.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/EventMessageTemplates.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -38,7 +38,6 @@
 #endregion
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
 
 namespace newtelligence.DasBlog.Runtime

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/IDayEntry.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/IDayEntry.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/IDayEntry.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -37,15 +37,6 @@
 */
 #endregion
 
-
-using System;
-using System.Diagnostics;
-using System.IO;
-using System.Xml;
-using System.Xml.Serialization;
-using System.Collections;
-using newtelligence.DasBlog.Util;
-
 namespace newtelligence.DasBlog.Runtime
 {
 	public interface IDayEntry

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/IFeedback.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/IFeedback.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/IFeedback.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -1,5 +1,3 @@
-using System;
-
 namespace newtelligence.DasBlog.Runtime
 {
 	public interface IFeedback

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/ISpamBlockingService.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/ISpamBlockingService.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/ISpamBlockingService.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -1,5 +1,3 @@
-using System;
-
 namespace newtelligence.DasBlog.Runtime
 {
 	public interface ISpamBlockingService

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/LogDataItem.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/LogDataItem.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/LogDataItem.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -37,7 +37,6 @@
 */
 #endregion
 
-
 using System;
 using System.Xml;
 using System.Xml.Serialization;

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/LogDataItemCollection.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/LogDataItemCollection.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/LogDataItemCollection.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -1,7 +1,4 @@
-
 using System;
-using System.Collections;
-using newtelligence.DasBlog.Runtime;
 using System.Collections.Generic;
 
 namespace newtelligence.DasBlog.Runtime

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/LogEncoder.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/LogEncoder.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/LogEncoder.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -1,4 +1,3 @@
-using System;
 using System.Text.RegularExpressions;
 
 namespace newtelligence.DasBlog.Runtime

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/LoggingDataService.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/LoggingDataService.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/LoggingDataService.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -43,7 +43,6 @@
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading;
-
 using newtelligence.DasBlog.Runtime.Proxies;
 using newtelligence.DasBlog.Util.Zip;
 

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/LoggingDataServiceFactory.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/LoggingDataServiceFactory.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/LoggingDataServiceFactory.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -1,4 +1,3 @@
-using System;
 using System.Collections;
 
 namespace newtelligence.DasBlog.Runtime

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/PingService.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/PingService.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/PingService.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -1,7 +1,7 @@
 using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Xml.Serialization;
-using System.Collections.ObjectModel;
-using System.Collections.Generic;
 
 namespace newtelligence.DasBlog.Runtime
 {
@@ -72,7 +72,7 @@
             ping.Name = "Weblogs";
             ping.Url = "http://www.weblogs.com";
             ping.Endpoint = "http://rpc.weblogs.com/RPC2";
-            ping.PingApi = PingService.PingApiType.Basic;
+            ping.PingApi = PingApiType.Basic;
             return ping;
         }
 
@@ -82,7 +82,7 @@
             ping.Name = "blo.gs";
             ping.Url = "http://www.blo.gs";
             ping.Endpoint = "http://ping.blo.gs/";
-            ping.PingApi = PingService.PingApiType.Extended;
+            ping.PingApi = PingApiType.Extended;
             return ping;
         }
     }

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/PingbackInfoCollection.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/PingbackInfoCollection.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/PingbackInfoCollection.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -1,7 +1,4 @@
-
 using System;
-using System.Collections;
-using newtelligence.DasBlog.Runtime;
 using System.Collections.Generic;
 
 namespace newtelligence.DasBlog.Runtime

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/SendMailInfo.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/SendMailInfo.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/SendMailInfo.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -37,8 +37,8 @@
 */
 #endregion
 
-
 using System;
+using System.Net;
 using System.Net.Mail;
 
 namespace newtelligence.DasBlog.Runtime
@@ -108,7 +108,7 @@
             if (this.enableSmtpAuthentication)
             {
                 mailClient.UseDefaultCredentials = false;
-                mailClient.Credentials = new System.Net.NetworkCredential(this.smtpUserName, this.smtpPassword);
+                mailClient.Credentials = new NetworkCredential(this.smtpUserName, this.smtpPassword);
             }
             mailClient.EnableSsl = this.useSSL;
             mailClient.Send(this.message);

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/SpamState.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/SpamState.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/SpamState.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -1,5 +1,3 @@
-using System;
-
 namespace newtelligence.DasBlog.Runtime
 {
 	/// <summary>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Test/AppTest.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Test/AppTest.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Test/AppTest.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -1,6 +1,5 @@
 using System;
 using NUnit.Framework;
-using newtelligence.DasBlog.Runtime;
 
 namespace newtelligence.DasBlog.Runtime.Test
 {

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Test/BlogDataServiceTests.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Test/BlogDataServiceTests.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Test/BlogDataServiceTests.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -1,9 +1,7 @@
 using System;
-using System.Collections;
+using System.Collections.Generic;
 using System.IO;
-using newtelligence.DasBlog.Runtime;
 using NUnit.Framework;
-using System.Collections.Generic;
 
 namespace newtelligence.DasBlog.Runtime.Test
 {

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Test/BloggerApiTest.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Test/BloggerApiTest.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Test/BloggerApiTest.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -1,7 +1,4 @@
 using System;
-using System.Diagnostics;
-using System.IO;
-using CookComputing.XmlRpc;
 using newtelligence.DasBlog.Runtime.Proxies;
 using NUnit.Framework;
 
@@ -23,8 +20,8 @@
 		{
 			site.ApiType = "metaweblog";
 			site.BlogId = "BlogId";
-			site.Username = BloggerApiTest.Username;
-			site.Password = BloggerApiTest.Password;
+			site.Username = Username;
+			site.Password = Password;
 			crosspostInfo = new CrosspostInfo(site);
 
 			proxy = new BloggerAPIClientProxy();
@@ -33,7 +30,7 @@
 			proxy.UserAgent="newtelligence dasBlog/1.4";
 
 			Entry testEntry = TestEntry.CreateEntry("MetaWeblog " + DateTime.Now.ToShortTimeString(), 5, 2);
-			testEntry.Author = BloggerApiTest.Username;
+			testEntry.Author = Username;
 
 			mwPost newPost = CreateMovableTypePost(testEntry);
 			
@@ -51,7 +48,7 @@
 		public void EditMetaWeblogPost()
 		{
 			Entry testEntry = TestEntry.CreateEntry("MetaWeblog " + DateTime.Now.ToLongTimeString(), 5, 2);
-			testEntry.Author = BloggerApiTest.Username;
+			testEntry.Author = Username;
 
 			// create a new entry
 			mwPost newPost = CreateMovableTypePost(testEntry);

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Test/EntryCollectionTests.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Test/EntryCollectionTests.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Test/EntryCollectionTests.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Text;
 using NUnit.Framework;
 
 namespace newtelligence.DasBlog.Runtime.Test

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Test/EntryTests.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Test/EntryTests.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Test/EntryTests.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -1,6 +1,5 @@
 using System;
 using System.Text;
-using newtelligence.DasBlog.Runtime;
 using NUnit.Framework;
 
 namespace newtelligence.DasBlog.Runtime.Test

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Test/TestBaseLocal.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Test/TestBaseLocal.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Test/TestBaseLocal.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -1,4 +1,3 @@
-using System;
 using System.IO;
 using newtelligence.DasBlog.Util;
 using NUnit.Framework;

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Test/TestBaseServer.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Test/TestBaseServer.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Test/TestBaseServer.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -1,4 +1,3 @@
-using System;
 using System.IO;
 using newtelligence.DasBlog.Util;
 using NUnit.Framework;

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Test/TrackbackTests.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Test/TrackbackTests.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Test/TrackbackTests.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -1,7 +1,5 @@
 using System;
-using System.IO;
-using newtelligence.DasBlog.Runtime;
-using newtelligence.DasBlog.Util;
+using System.Threading;
 using NUnit.Framework;
 
 namespace newtelligence.DasBlog.Runtime.Test
@@ -36,7 +34,7 @@
 				blogService.AddTracking( t );
 			}
 
-			System.Threading.Thread.Sleep(2000);
+			Thread.Sleep(2000);
 
 			TrackingCollection trackingCollection  = blogService.GetTrackingsFor(entries[0].EntryId);
 

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Test/assemblyinfo.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Test/assemblyinfo.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Test/assemblyinfo.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -1,5 +1,5 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
+using System.Security.Permissions;
 
 //
 // General Information about an assembly is controlled through the following 
@@ -57,4 +57,4 @@
 [assembly: AssemblyKeyFile("")]
 [assembly: AssemblyKeyName("")]
 
-[assembly: System.Security.Permissions.EnvironmentPermissionAttribute(System.Security.Permissions.SecurityAction.RequestMinimum)]
\ No newline at end of file
+[assembly: EnvironmentPermission(SecurityAction.RequestMinimum)]
\ No newline at end of file

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/TrackbackInfo.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/TrackbackInfo.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/TrackbackInfo.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -37,7 +37,6 @@
 */
 #endregion
 
-
 using System;
 
 namespace newtelligence.DasBlog.Runtime

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/TrackbackInfoCollection.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/TrackbackInfoCollection.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/TrackbackInfoCollection.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -1,4 +1,3 @@
-
 using System;
 using System.Collections.Generic;
 

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Tracking.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Tracking.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/Tracking.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -37,7 +37,6 @@
 */
 #endregion
 
-
 using System;
 using System.Xml;
 using System.Xml.Serialization;

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/TrackingCollection.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/TrackingCollection.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/TrackingCollection.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -1,7 +1,4 @@
-
 using System;
-using System.Collections;
-using newtelligence.DasBlog.Runtime;
 using System.Collections.Generic;
 
 namespace newtelligence.DasBlog.Runtime

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/WeblogUpdatePingInfo.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/WeblogUpdatePingInfo.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/WeblogUpdatePingInfo.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -37,7 +37,6 @@
 */
 #endregion
 
-
 using System;
 
 namespace newtelligence.DasBlog.Runtime

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime.Proxies/BloggerAPIClientProxy.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime.Proxies/BloggerAPIClientProxy.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime.Proxies/BloggerAPIClientProxy.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -303,7 +303,7 @@
         /// <summary>
         /// 
         /// </summary>
-        public System.DateTime dateCreated;
+        public DateTime dateCreated;
         /// <summary>
         /// 
         /// </summary>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime.Proxies/ImpersonationSharing.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime.Proxies/ImpersonationSharing.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime.Proxies/ImpersonationSharing.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -1,3 +1,6 @@
+using System.Security.Principal;
+using System.Threading;
+
 /// <summary>
 /// Provides help to share identity between threads.
 /// http://aspalliance.com/articleViewer.aspx?aId=650&vId=1&pId
@@ -19,18 +22,18 @@
 		#endregion
 
 		#region ApplicationIdentity
-		private static System.Security.Principal.WindowsIdentity applicationIdentity;
+		private static WindowsIdentity applicationIdentity;
 		/// <summary>
 		/// Gets the current application identity.
 		/// </summary>
 		/// <remarks>If the identity has not been set, it will return 
 		/// <see cref="System.Security.Principal.WindowsIdentity.GetCurrent"/>.</remarks>
-		public static System.Security.Principal.WindowsIdentity ApplicationIdentity
+		public static WindowsIdentity ApplicationIdentity
 		{
 			get
 			{
 				if (applicationIdentity == null)
-					applicationIdentity = System.Security.Principal.WindowsIdentity.GetCurrent();
+					applicationIdentity = WindowsIdentity.GetCurrent();
 				return applicationIdentity;
 			}
 			set
@@ -44,11 +47,11 @@
 		/// <summary>
 		/// Impersonates the identity specified by <see cref="ApplicationIdentity"/>.
 		/// </summary>
-		public static System.Security.Principal.WindowsImpersonationContext Impersonate()
+		public static WindowsImpersonationContext Impersonate()
 		{
-			System.Security.Principal.WindowsPrincipal newPrin = 
-				new System.Security.Principal.WindowsPrincipal(ApplicationIdentity);
-			System.Threading.Thread.CurrentPrincipal = newPrin;
+			WindowsPrincipal newPrin = 
+				new WindowsPrincipal(ApplicationIdentity);
+			Thread.CurrentPrincipal = newPrin;
 			return ApplicationIdentity.Impersonate();
 		}
 		#endregion

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime.Proxies/XmlStorageSystemClientProxy.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime.Proxies/XmlStorageSystemClientProxy.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime.Proxies/XmlStorageSystemClientProxy.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -34,13 +34,10 @@
 */
 #endregion
 
-using System;
 using System.Security.Cryptography;
 using System.Text;
-using System.Xml;
 using CookComputing.XmlRpc;
 
-
 namespace newtelligence.DasBlog.Runtime.Proxies
 {
     [XmlRpcMissingMapping(MappingAction.Ignore)]

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Util/CommandLineSwitchAttribute.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Util/CommandLineSwitchAttribute.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Util/CommandLineSwitchAttribute.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -18,7 +18,7 @@
 	/// <remark>Only currently is implemented for properties, so all
 	/// auto-switching variables should have a get/set method supplied.</remark>
 	[AttributeUsage( AttributeTargets.Property )]
-	public class CommandLineSwitchAttribute : System.Attribute
+	public class CommandLineSwitchAttribute : Attribute
 	{
 		#region Private Variables
 		private string m_name = "";
@@ -54,7 +54,7 @@
 	/// defines an alias for it.
 	/// </summary>
 	[AttributeUsage( AttributeTargets.Property )]
-	public class CommandLineAliasAttribute : System.Attribute
+	public class CommandLineAliasAttribute : Attribute
 	{
 		#region Private Variables
 		protected string m_Alias = "";

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Html/HtmlTokenizer.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Html/HtmlTokenizer.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Html/HtmlTokenizer.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -47,8 +47,6 @@
 #endregion
 
 using System;
-using System.IO;
-using System.Text;
 
 namespace newtelligence.DasBlog.Util.Html 
 {

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Util/HttpHelper.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Util/HttpHelper.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Util/HttpHelper.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -1,6 +1,5 @@
-using System;
-using System.Collections.Generic;
 using System.Text;
+using System.Web;
 
 namespace newtelligence.DasBlog.Util
 {
@@ -82,7 +81,7 @@
                 }
             }
 
-            return System.Web.HttpUtility.UrlEncode(retVal.ToString());
+            return HttpUtility.UrlEncode(retVal.ToString());
         }
     }
 }

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Parser.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Parser.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Parser.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -9,6 +9,9 @@
 // called Eas.Console that serves a similar purpose and should be investigated
 // before another command line parser workspace is created.
 using System;
+using System.Collections;
+using System.Reflection;
+using System.Text;
 using System.Text.RegularExpressions;
 
 namespace RJH.CommandLineHelper
@@ -33,7 +36,7 @@
 			public string Name				{ get { return (m_Switch as SwitchRecord).Name; } }
 			public string Description		{ get { return (m_Switch as SwitchRecord).Description; } }
 			public string[] Aliases			{ get { return (m_Switch as SwitchRecord).Aliases; } }
-			public System.Type Type			{ get { return (m_Switch as SwitchRecord).Type; } }
+			public Type Type			{ get { return (m_Switch as SwitchRecord).Type; } }
 			public object Value				{ get { return (m_Switch as SwitchRecord).Value; } }
 			public object InternalValue	{ get { return (m_Switch as SwitchRecord).InternalValue; } }
 			public bool   IsEnum				{ get { return (m_Switch as SwitchRecord).Type.IsEnum; } }
@@ -68,14 +71,14 @@
 			private string m_name = "";
 			private string m_description = "";
 			private object m_value = null;
-			private System.Type m_switchType = typeof(bool);
-			private System.Collections.ArrayList m_Aliases = null;
+			private Type m_switchType = typeof(bool);
+			private ArrayList m_Aliases = null;
 			private string m_Pattern = "";
 
 			// The following advanced functions allow for callbacks to be
 			// made to manipulate the associated data type.
-			private System.Reflection.MethodInfo m_SetMethod = null;
-			private System.Reflection.MethodInfo m_GetMethod = null;
+			private MethodInfo m_SetMethod = null;
+			private MethodInfo m_GetMethod = null;
 			private object m_PropertyOwner = null;
 			#endregion
 
@@ -120,7 +123,7 @@
 					strPatternEnd = @")(?::|\s+))(?<value>" + e_str + @")";
 				}
 				else
-					throw new System.ArgumentException();
+					throw new ArgumentException();
 
 				// Set the internal regular expression pattern.
 				m_Pattern = strPatternStart + matchString + strPatternEnd + strCommonSuffix;
@@ -156,7 +159,7 @@
 				set { m_description = value; }
 			}
 
-			public System.Type Type 
+			public Type Type 
 			{
 				get { return m_switchType; }
 			}
@@ -171,12 +174,12 @@
 				get { return m_Pattern; }
 			}
 			
-			public System.Reflection.MethodInfo SetMethod 
+			public MethodInfo SetMethod 
 			{
 				set { m_SetMethod = value; }
 			}
 			
-			public System.Reflection.MethodInfo GetMethod 
+			public MethodInfo GetMethod 
 			{
 				set { m_GetMethod = value; }
 			}
@@ -202,7 +205,7 @@
 				get 
 				{
 					if ( m_switchType.IsEnum )
-						return System.Enum.GetNames( m_switchType );
+						return Enum.GetNames( m_switchType );
 					else
 						return null;
 				}
@@ -215,7 +218,7 @@
 				Initialize( name, description );
 			}
 
-			public SwitchRecord( string name, string description, System.Type type )
+			public SwitchRecord( string name, string description, Type type )
 			{
 				if ( type == typeof(bool)   ||
 					  type == typeof(string) ||
@@ -234,7 +237,7 @@
 			public void AddAlias( string alias )
 			{
 				if ( m_Aliases == null )
-					m_Aliases = new System.Collections.ArrayList();
+					m_Aliases = new ArrayList();
 				m_Aliases.Add( alias );
 
 				BuildPattern();
@@ -260,7 +263,7 @@
 		private string m_workingString = "";
 		private string m_applicationName = "";
 		private string[] m_splitParameters = null;
-		private System.Collections.ArrayList m_switches = null;
+		private ArrayList m_switches = null;
 		#endregion
 
 		#region Private Utility Functions
@@ -356,7 +359,7 @@
 							else if ( s.Type == typeof(int) )
 								s.Notify( int.Parse( value ) );
 							else if ( s.Type.IsEnum )
-								s.Notify( System.Enum.Parse(s.Type,value,true) );
+								s.Notify( Enum.Parse(s.Type,value,true) );
 						}
 					}
 
@@ -438,7 +441,7 @@
 		public void AddSwitch( string name, string description )
 		{
 			if ( m_switches == null )
-				m_switches = new System.Collections.ArrayList();
+				m_switches = new ArrayList();
 
 			SwitchRecord rec = new SwitchRecord( name, description );
 			m_switches.Add( rec );
@@ -447,7 +450,7 @@
 		public void AddSwitch( string[] names, string description )
 		{
 			if ( m_switches == null )
-				m_switches = new System.Collections.ArrayList();
+				m_switches = new ArrayList();
 			SwitchRecord rec = new SwitchRecord( names[0], description );
 			for ( int s=1; s<names.Length; s++ )
 				rec.AddAlias( names[s] );
@@ -469,9 +472,9 @@
 
 		public string GetHelpText()
 		{
-			System.Text.StringBuilder message = new System.Text.StringBuilder("");
+			StringBuilder message = new StringBuilder("");
 			message.Append( this.ApplicationName + " ");
-			foreach(Parser.SwitchInfo switchInfo in this.Switches)
+			foreach(SwitchInfo switchInfo in this.Switches)
 			{
 				message.Append( "[/" );
 				if(switchInfo.Aliases != null)
@@ -495,7 +498,7 @@
 			}
 
 			message.Append("\n\n");
-			foreach(Parser.SwitchInfo switchInfo in this.Switches)
+			foreach(SwitchInfo switchInfo in this.Switches)
 			{
 				message.AppendFormat("\t/{0,-17}-{1}\n", switchInfo.Name, switchInfo.Description);
 				if(switchInfo.Aliases != null)
@@ -529,7 +532,7 @@
 			m_commandLine = commandLine;
 
 			Type type = classForAutoAttributes.GetType();
-			System.Reflection.MemberInfo[] members = type.GetMembers();
+			MemberInfo[] members = type.GetMembers();
 
 			for(int i=0; i<members.Length; i++)
 			{
@@ -547,9 +550,9 @@
 
 							// Get the property information.  We're only handling
 							// properties at the moment!
-							if ( members[i] is System.Reflection.PropertyInfo )
+							if ( members[i] is PropertyInfo )
 							{
-								System.Reflection.PropertyInfo pi = (System.Reflection.PropertyInfo) members[i];
+								PropertyInfo pi = (PropertyInfo) members[i];
 
 								rec = new SwitchRecord( switchAttrib.Name,
 																switchAttrib.Description,
@@ -589,7 +592,7 @@
 					if ( rec != null )
 					{
 						if ( m_switches == null )
-							m_switches = new System.Collections.ArrayList();
+							m_switches = new ArrayList();
 						m_switches.Add( rec );
 					}
 				}

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Util/RFC2822Date.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Util/RFC2822Date.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Util/RFC2822Date.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -38,7 +38,6 @@
 using System;
 using System.Collections;
 using System.Text.RegularExpressions;
-using System.Diagnostics;
 
 namespace newtelligence.DasBlog.Util
 {

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Util/ReflectionHelper.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Util/ReflectionHelper.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Util/ReflectionHelper.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -1,7 +1,6 @@
-using System;
-using System.Text;
 using System.Diagnostics;
 using System.Reflection;
+using System.Text;
 
 namespace newtelligence.DasBlog.Util
 {

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Resources/WebUtil.Designer.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Resources/WebUtil.Designer.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Resources/WebUtil.Designer.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -8,10 +8,15 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
+using System.CodeDom.Compiler;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+using System.Resources;
+using System.Runtime.CompilerServices;
+
 namespace newtelligence.DasBlog.Util.Resources {
-    using System;
-    
-    
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
@@ -19,27 +24,27 @@
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    [GeneratedCode("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")]
+    [DebuggerNonUserCode()]
+    [CompilerGenerated()]
     internal class WebUtil {
         
-        private static global::System.Resources.ResourceManager resourceMan;
+        private static ResourceManager resourceMan;
         
-        private static global::System.Globalization.CultureInfo resourceCulture;
+        private static CultureInfo resourceCulture;
         
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
         internal WebUtil() {
         }
         
         /// <summary>
         ///   Returns the cached ResourceManager instance used by this class.
         /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
+        [EditorBrowsable(EditorBrowsableState.Advanced)]
+        internal static ResourceManager ResourceManager {
             get {
-                if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("newtelligence.DasBlog.Util.Resources.WebUtil", typeof(WebUtil).Assembly);
+                if (ReferenceEquals(resourceMan, null)) {
+                    ResourceManager temp = new ResourceManager("newtelligence.DasBlog.Util.Resources.WebUtil", typeof(WebUtil).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
@@ -50,8 +55,8 @@
         ///   Overrides the current thread's CurrentUICulture property for all
         ///   resource lookups using this strongly typed resource class.
         /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture {
+        [EditorBrowsable(EditorBrowsableState.Advanced)]
+        internal static CultureInfo Culture {
             get {
                 return resourceCulture;
             }

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Test/BlogSource.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Test/BlogSource.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Test/BlogSource.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -1,5 +1,3 @@
-using System;
-
 namespace RJH.CommandLineHelper.Test
 {
 	/// <summary>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Test/CommandLine.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Test/CommandLine.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Test/CommandLine.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -1,8 +1,5 @@
-using RJH.CommandLineHelper;
+using System.Diagnostics;
 
-using System;
-
-
 namespace RJH.CommandLineHelper.Test
 {
 	/// <summary>
@@ -13,12 +10,12 @@
 		[CommandLineSwitch("SourceType","Specify the blog program from which to import content.")]
 		public BlogSourceType Source
 		{
-			[System.Diagnostics.DebuggerStepThrough()]
+			[DebuggerStepThrough()]
 			get 
 			{ 
 				return _source; 
 			}  
-			[System.Diagnostics.DebuggerStepThrough()]
+			[DebuggerStepThrough()]
 			set
 			{ 
 				_source = value; 
@@ -30,12 +27,12 @@
 		[CommandLineAlias("to")]
 		public string ContentDirectory
 		{
-			[System.Diagnostics.DebuggerStepThrough()]
+			[DebuggerStepThrough()]
 			get 
 			{ 
 				return _contentDirectory; 
 			}  
-			[System.Diagnostics.DebuggerStepThrough()]
+			[DebuggerStepThrough()]
 			set
 			{ 
 				_contentDirectory = value; 
@@ -47,12 +44,12 @@
 		[CommandLineAlias("from")]
 		public string SourceDirectory
 		{
-			[System.Diagnostics.DebuggerStepThrough()]
+			[DebuggerStepThrough()]
 			get 
 			{ 
 				return _sourceDirectory; 
 			}  
-			[System.Diagnostics.DebuggerStepThrough()]
+			[DebuggerStepThrough()]
 			set
 			{ 
 				_sourceDirectory = value; 
@@ -63,12 +60,12 @@
 		[CommandLineSwitch("Help", "Displays the command line help.")]
 		public bool Help
 		{
-			[System.Diagnostics.DebuggerStepThrough()]
+			[DebuggerStepThrough()]
 			get 
 			{ 
 				return _help; 
 			}  
-			[System.Diagnostics.DebuggerStepThrough()]
+			[DebuggerStepThrough()]
 			set
 			{ 
 				_help = value; 

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Test/ParserTest.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Test/ParserTest.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Test/ParserTest.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -1,9 +1,6 @@
 using System;
 using NUnit.Framework;
-using RJH.CommandLineHelper;
 
-
-
 namespace RJH.CommandLineHelper.Test
 {
 	/// <summary>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Test/ReflectionHelperTest.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Test/ReflectionHelperTest.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Test/ReflectionHelperTest.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -1,6 +1,4 @@
-using System;
 using System.Reflection;
-using newtelligence.DasBlog.Util;
 using NUnit.Framework;
 
 namespace newtelligence.DasBlog.Util.Test

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Util/TimeZones.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Util/TimeZones.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Util/TimeZones.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -1,10 +1,10 @@
 using System;
+using System.Collections;
+using System.Globalization;
 using System.IO;
 using System.Security.Permissions;
 using System.Xml.Serialization;
 using Microsoft.Win32;
-using System.Collections;
-using System.Globalization;
 
 namespace newtelligence.DasBlog.Util
 {
@@ -434,7 +434,7 @@
 	/// <summary>
 	/// A collection of elements of type WindowsTimeZone
 	/// </summary>
-	public class WindowsTimeZoneCollection: System.Collections.CollectionBase
+	public class WindowsTimeZoneCollection: CollectionBase
 	{
 		/// <summary>
 		/// Initializes a new empty instance of the WindowsTimeZoneCollection class.
@@ -513,13 +513,13 @@
 		/// <summary>
 		/// Type-specific enumeration class, used by WindowsTimeZoneCollection.GetEnumerator.
 		/// </summary>
-		public class Enumerator: System.Collections.IEnumerator
+		public class Enumerator: IEnumerator
 		{
-			private System.Collections.IEnumerator wrapped;
+			private IEnumerator wrapped;
 
 			public Enumerator(WindowsTimeZoneCollection collection)
 			{
-				this.wrapped = ((System.Collections.CollectionBase)collection).GetEnumerator();
+				this.wrapped = ((CollectionBase)collection).GetEnumerator();
 			}
 
 			public WindowsTimeZone Current
@@ -530,7 +530,7 @@
 				}
 			}
 
-			object System.Collections.IEnumerator.Current
+			object IEnumerator.Current
 			{
 				get
 				{
@@ -557,9 +557,9 @@
 		/// <returns>
 		/// An object that implements System.Collections.IEnumerator.
 		/// </returns>        
-		public new virtual WindowsTimeZoneCollection.Enumerator GetEnumerator()
+		public new virtual Enumerator GetEnumerator()
 		{
-			return new WindowsTimeZoneCollection.Enumerator(this);
+			return new Enumerator(this);
 		}
 
 		public void SortByTimeZoneBias()

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Util/XmlNamespaceUpgradeReader.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Util/XmlNamespaceUpgradeReader.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Util/XmlNamespaceUpgradeReader.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -1,7 +1,3 @@
-using System;
-using System.IO;
-using System.Xml;
-
 namespace newtelligence.DasBlog.Util
 {
     //SDH: Requires FullTrust

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Zip/Crc32.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Zip/Crc32.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Zip/Crc32.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -19,6 +19,7 @@
 // 
 
 using System;
+using System.IO;
 
 namespace newtelligence.DasBlog.Util.Zip
 {
@@ -43,7 +44,7 @@
       /// </summary>
       /// <param name="input">The stream over which to calculate the CRC32</param>
       /// <returns>the CRC32 calculation</returns>
-      public UInt32 GetCrc32(System.IO.Stream input)
+      public UInt32 GetCrc32(Stream input)
       {
 	return GetCrc32AndCopy(input, null) ;
       }
@@ -54,7 +55,7 @@
       /// <param name="input">The stream over which to calculate the CRC32</param>
       /// <param name="output">The stream into which to deflate the input</param>
       /// <returns>the CRC32 calculation</returns>
-      public UInt32 GetCrc32AndCopy(System.IO.Stream input, System.IO.Stream output)
+      public UInt32 GetCrc32AndCopy(Stream input, Stream output)
       {
          unchecked
          {

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Zip/Shared.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Zip/Shared.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Zip/Shared.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -9,6 +9,7 @@
 
 
 using System;
+using System.IO;
 
 namespace newtelligence.DasBlog.Util.Zip
 {
@@ -23,11 +24,11 @@
             {
                 c[i] = (char)buf[i]; // System.BitConverter.ToChar(buf, start+i*2);
             }
-            string s = new System.String(c, 0, i);
+            string s = new String(c, 0, i);
             return s;
         }
 
-        protected internal static int ReadSignature(System.IO.Stream s)
+        protected internal static int ReadSignature(Stream s)
         {
             int n = 0;
             byte[] sig = new byte[4];
@@ -37,7 +38,7 @@
             return signature;
         }
 
-        protected internal static long FindSignature(System.IO.Stream s, int SignatureToFind)
+        protected internal static long FindSignature(Stream s, int SignatureToFind)
         {
             long startingPosition = s.Position;
 
@@ -59,10 +60,10 @@
                     {
                         if (batch[i] == targetBytes[3])
                         {
-                            s.Seek(i - n, System.IO.SeekOrigin.Current);
+                            s.Seek(i - n, SeekOrigin.Current);
                             int sig = ReadSignature(s);
                             success = (sig == SignatureToFind);
-                            if (!success) s.Seek(-3, System.IO.SeekOrigin.Current);
+                            if (!success) s.Seek(-3, SeekOrigin.Current);
                             break; // out of for loop
                         }
                     }
@@ -72,7 +73,7 @@
             } while (true);
             if (!success)
             {
-                s.Seek(startingPosition, System.IO.SeekOrigin.Begin);
+                s.Seek(startingPosition, SeekOrigin.Begin);
                 return -1;  // or throw?
             }
 
@@ -95,8 +96,8 @@
             int minute = (packedTime & 0x07E0) >> 5;
             int second = packedTime & 0x001F;
 
-            DateTime d = System.DateTime.Now;
-            try { d = new System.DateTime(year, month, day, hour, minute, second, 0); }
+            DateTime d = DateTime.Now;
+            try { d = new DateTime(year, month, day, hour, minute, second, 0); }
             catch
             {
                 Console.Write("\nInvalid date/time?:\nyear: {0} ", year);

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Zip/ZipDirEntry.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Zip/ZipDirEntry.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Zip/ZipDirEntry.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -9,6 +9,7 @@
 
 
 using System;
+using System.IO;
 
 namespace newtelligence.DasBlog.Util.Zip
 {
@@ -88,21 +89,21 @@
         internal ZipDirEntry(ZipEntry ze) { }
 
 
-        public static ZipDirEntry Read(System.IO.Stream s)
+        public static ZipDirEntry Read(Stream s)
         {
             return Read(s, false);
         }
 
 
-        public static ZipDirEntry Read(System.IO.Stream s, bool TurnOnDebug)
+        public static ZipDirEntry Read(Stream s, bool TurnOnDebug)
         {
 
-            int signature = newtelligence.DasBlog.Util.Zip.Shared.ReadSignature(s);
+            int signature = Shared.ReadSignature(s);
             // return null if this is not a local file header signature
             if (SignatureIsNotValid(signature))
             {
-                s.Seek(-4, System.IO.SeekOrigin.Current);
-                if (TurnOnDebug) System.Console.WriteLine("  ZipDirEntry::Read(): Bad signature ({0:X8}) at position {1}", signature, s.Position);
+                s.Seek(-4, SeekOrigin.Current);
+                if (TurnOnDebug) Console.WriteLine("  ZipDirEntry::Read(): Bad signature ({0:X8}) at position {1}", signature, s.Position);
                 return null;
             }
 
@@ -123,7 +124,7 @@
             zde._CompressedSize = block[i++] + block[i++] * 256 + block[i++] * 256 * 256 + block[i++] * 256 * 256 * 256;
             zde._UncompressedSize = block[i++] + block[i++] * 256 + block[i++] * 256 * 256 + block[i++] * 256 * 256 * 256;
 
-            zde._LastModified = newtelligence.DasBlog.Util.Zip.Shared.PackedToDateTime(zde._LastModDateTime);
+            zde._LastModified = Shared.PackedToDateTime(zde._LastModDateTime);
 
             Int16 filenameLength = (short)(block[i++] + block[i++] * 256);
             Int16 extraFieldLength = (short)(block[i++] + block[i++] * 256);
@@ -135,14 +136,14 @@
 
             block = new byte[filenameLength];
             n = s.Read(block, 0, block.Length);
-            zde._FileName = newtelligence.DasBlog.Util.Zip.Shared.StringFromBuffer(block, 0, block.Length);
+            zde._FileName = Shared.StringFromBuffer(block, 0, block.Length);
 
             zde._Extra = new byte[extraFieldLength];
             n = s.Read(zde._Extra, 0, zde._Extra.Length);
 
             block = new byte[commentLength];
             n = s.Read(block, 0, block.Length);
-            zde._Comment = newtelligence.DasBlog.Util.Zip.Shared.StringFromBuffer(block, 0, block.Length);
+            zde._Comment = Shared.StringFromBuffer(block, 0, block.Length);
 
             return zde;
         }

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Zip/ZipEntry.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Zip/ZipEntry.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Zip/ZipEntry.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -10,6 +10,7 @@
 
 using System;
 using System.IO;
+using System.IO.Compression;
 
 namespace newtelligence.DasBlog.Util.Zip
 {
@@ -107,18 +108,18 @@
             }
         }
 
-        private System.IO.MemoryStream _UnderlyingMemoryStream;
-        private System.IO.Compression.DeflateStream _CompressedStream;
-        private System.IO.Compression.DeflateStream CompressedStream
+        private MemoryStream _UnderlyingMemoryStream;
+        private DeflateStream _CompressedStream;
+        private DeflateStream CompressedStream
         {
             get
             {
                 if (_CompressedStream == null)
                 {
-                    _UnderlyingMemoryStream = new System.IO.MemoryStream();
+                    _UnderlyingMemoryStream = new MemoryStream();
                     bool LeaveUnderlyingStreamOpen = true;
-                    _CompressedStream = new System.IO.Compression.DeflateStream(_UnderlyingMemoryStream,
-                                                    System.IO.Compression.CompressionMode.Compress,
+                    _CompressedStream = new DeflateStream(_UnderlyingMemoryStream,
+                                                    CompressionMode.Compress,
                                                     LeaveUnderlyingStreamOpen);
                 }
                 return _CompressedStream;
@@ -137,15 +138,15 @@
         private int _RelativeOffsetOfHeader;
 
 
-        private static bool ReadHeader(System.IO.Stream s, ZipEntry ze)
+        private static bool ReadHeader(Stream s, ZipEntry ze)
         {
-            int signature = newtelligence.DasBlog.Util.Zip.Shared.ReadSignature(s);
+            int signature = Shared.ReadSignature(s);
 
             // return null if this is not a local file header signature
             if (SignatureIsNotValid(signature))
             {
-                s.Seek(-4, System.IO.SeekOrigin.Current);
-                if (ze._Debug) System.Console.WriteLine("  ZipEntry::Read(): Bad signature ({0:X8}) at position {1}", signature, s.Position);
+                s.Seek(-4, SeekOrigin.Current);
+                if (ze._Debug) Console.WriteLine("  ZipEntry::Read(): Bad signature ({0:X8}) at position {1}", signature, s.Position);
                 return false;
             }
 
@@ -181,19 +182,19 @@
 
             block = new byte[filenameLength];
             n = s.Read(block, 0, block.Length);
-            ze._FileName = newtelligence.DasBlog.Util.Zip.Shared.StringFromBuffer(block, 0, block.Length);
+            ze._FileName = Shared.StringFromBuffer(block, 0, block.Length);
 
             ze._Extra = new byte[extraFieldLength];
             n = s.Read(ze._Extra, 0, ze._Extra.Length);
 
             // transform the time data into something usable
-            ze._LastModified = newtelligence.DasBlog.Util.Zip.Shared.PackedToDateTime(ze._LastModDateTime);
+            ze._LastModified = Shared.PackedToDateTime(ze._LastModDateTime);
 
             // actually get the compressed size and CRC if necessary
             if ((ze._BitField & 0x0008) == 0x0008)
             {
                 long posn = s.Position;
-                long SizeOfDataRead = newtelligence.DasBlog.Util.Zip.Shared.FindSignature(s, ZipEntryDataDescriptorSignature);
+                long SizeOfDataRead = Shared.FindSignature(s, ZipEntryDataDescriptorSignature);
                 if (SizeOfDataRead == -1) return false; 
 
                 // read 3x 4-byte fields (CRC, Compressed Size, Uncompressed Size)
@@ -209,7 +210,7 @@
                     throw new Exception("Data format error (bit 3 is set)"); 
                 
                 // seek back to previous position, to read file data
-                s.Seek(posn, System.IO.SeekOrigin.Begin);
+                s.Seek(posn, SeekOrigin.Begin);
             }
 
             return true;
@@ -222,13 +223,13 @@
         }
 
 
-        public static ZipEntry Read(System.IO.Stream s)
+        public static ZipEntry Read(Stream s)
         {
             return Read(s, false);
         }
 
 
-        public static ZipEntry Read(System.IO.Stream s, bool TurnOnDebug)
+        public static ZipEntry Read(Stream s, bool TurnOnDebug)
         {
             ZipEntry entry = new ZipEntry();
             entry._Debug = TurnOnDebug;
@@ -243,7 +244,7 @@
             // finally, seek past the (already read) Data descriptor if necessary
             if ((entry._BitField & 0x0008) == 0x0008)
             {
-                s.Seek(16, System.IO.SeekOrigin.Current);
+                s.Seek(16, SeekOrigin.Current);
             }
             return entry;
         }
@@ -255,16 +256,16 @@
             ZipEntry entry = new ZipEntry();
             entry._FileName = filename;
 
-            entry._LastModified = System.IO.File.GetLastWriteTime(filename);
+            entry._LastModified = File.GetLastWriteTime(filename);
 	    // adjust the time if the .NET BCL thinks it is in DST.  
 	    // see the note elsewhere in this file for more info. 
             if (entry._LastModified.IsDaylightSavingTime())
             {
-                System.DateTime AdjustedTime = entry._LastModified - new System.TimeSpan(1, 0, 0);
-                entry._LastModDateTime = newtelligence.DasBlog.Util.Zip.Shared.DateTimeToPacked(AdjustedTime);
+                DateTime AdjustedTime = entry._LastModified - new TimeSpan(1, 0, 0);
+                entry._LastModDateTime = Shared.DateTimeToPacked(AdjustedTime);
             }
             else
-                entry._LastModDateTime = newtelligence.DasBlog.Util.Zip.Shared.DateTimeToPacked(entry._LastModified);
+                entry._LastModDateTime = Shared.DateTimeToPacked(entry._LastModified);
 
             // we don't actually slurp in the file until the caller invokes Write on this entry.
 
@@ -278,7 +279,7 @@
             Extract(".");
         }
 
-        public void Extract(System.IO.Stream s)
+        public void Extract(Stream s)
         {
             Extract(null, s);
         }
@@ -291,18 +292,18 @@
 
         // pass in either basedir or s, but not both. 
         // In other words, you can extract to a stream or to a directory, but not both!
-        private void Extract(string basedir, System.IO.Stream s)
+        private void Extract(string basedir, Stream s)
         {
             string TargetFile = null;
             if (basedir != null)
             {
-                TargetFile = System.IO.Path.Combine(basedir, FileName);
+                TargetFile = Path.Combine(basedir, FileName);
 
                 // check if a directory
                 if (FileName.EndsWith("/"))
                 {
-                    if (!System.IO.Directory.Exists(TargetFile))
-                        System.IO.Directory.CreateDirectory(TargetFile);
+                    if (!Directory.Exists(TargetFile))
+                        Directory.CreateDirectory(TargetFile);
                     return;
                 }
             }
@@ -315,10 +316,10 @@
             else throw new Exception("Invalid input.");
 
 
-            using (System.IO.MemoryStream memstream = new System.IO.MemoryStream(_FileData))
+            using (MemoryStream memstream = new MemoryStream(_FileData))
             {
 
-                System.IO.Stream input = null;
+                Stream input = null;
                 try
                 {
 
@@ -330,25 +331,25 @@
                     }
                     else
                     {
-                        input = new System.IO.Compression.DeflateStream(memstream, System.IO.Compression.CompressionMode.Decompress);
+                        input = new DeflateStream(memstream, CompressionMode.Decompress);
                     }
 
 
                     if (TargetFile != null)
                     {
                         // ensure the target path exists
-                        if (!System.IO.Directory.Exists(System.IO.Path.GetDirectoryName(TargetFile)))
+                        if (!Directory.Exists(Path.GetDirectoryName(TargetFile)))
                         {
-                            System.IO.Directory.CreateDirectory(System.IO.Path.GetDirectoryName(TargetFile));
+                            Directory.CreateDirectory(Path.GetDirectoryName(TargetFile));
                         }
                     }
 
 
-                    System.IO.Stream output = null;
+                    Stream output = null;
                     try
                     {
                         if (TargetFile != null)
-                            output = new System.IO.FileStream(TargetFile, System.IO.FileMode.CreateNew);
+                            output = new FileStream(TargetFile, FileMode.CreateNew);
                         else
                             output = s;
 
@@ -369,12 +370,12 @@
                             for (int j = 0; j < n; j += 2)
                             {
                                 if ((j > 0) && (j % 40 == 0))
-                                    System.Console.WriteLine();
-                                System.Console.Write(" {0:X2}", _FileData[j]);
+                                    Console.WriteLine();
+                                Console.Write(" {0:X2}", _FileData[j]);
                                 if (j + 1 < n)
-                                    System.Console.Write("{0:X2}", _FileData[j + 1]);
+                                    Console.Write("{0:X2}", _FileData[j + 1]);
                             }
-                            System.Console.WriteLine("\n");
+                            Console.WriteLine("\n");
                         }
 
                         n = 1; // anything non-zero
@@ -454,11 +455,11 @@
 
                         if (LastModified.IsDaylightSavingTime())
                         {
-                            DateTime AdjustedLastModified = LastModified + new System.TimeSpan(1, 0, 0);
-                            System.IO.File.SetLastWriteTime(TargetFile, AdjustedLastModified);
+                            DateTime AdjustedLastModified = LastModified + new TimeSpan(1, 0, 0);
+                            File.SetLastWriteTime(TargetFile, AdjustedLastModified);
                         }
                         else
-                            System.IO.File.SetLastWriteTime(TargetFile, LastModified);
+                            File.SetLastWriteTime(TargetFile, LastModified);
                     }
 
                 }
@@ -476,7 +477,7 @@
         }
 
 
-        internal void WriteCentralDirectoryEntry(System.IO.Stream s)
+        internal void WriteCentralDirectoryEntry(Stream s)
         {
             byte[] bytes = new byte[4096];
             int i = 0;
@@ -525,21 +526,21 @@
             bytes[i++] = (byte)((_RelativeOffsetOfHeader & 0x00FF0000) >> 16);
             bytes[i++] = (byte)((_RelativeOffsetOfHeader & 0xFF000000) >> 24);
 
-            if (_Debug) System.Console.WriteLine("\ninserting filename into CDS: (length= {0})", Header.Length - 30);
+            if (_Debug) Console.WriteLine("\ninserting filename into CDS: (length= {0})", Header.Length - 30);
             // actual filename (starts at offset 34 in header) 
             for (j = 0; j < Header.Length - 30; j++)
             {
                 bytes[i + j] = Header[30 + j];
-                if (_Debug) System.Console.Write(" {0:X2}", bytes[i + j]);
+                if (_Debug) Console.Write(" {0:X2}", bytes[i + j]);
             }
-            if (_Debug) System.Console.WriteLine();
+            if (_Debug) Console.WriteLine();
             i += j;
 
             s.Write(bytes, 0, i);
         }
 
 
-        private void WriteHeader(System.IO.Stream s, byte[] bytes)
+        private void WriteHeader(Stream s, byte[] bytes)
         {
             // write the header info
 
@@ -574,7 +575,7 @@
             // CRC32 (Int32)
             CRC32 crc32 = new CRC32();
             UInt32 crc = 0;
-            using (System.IO.Stream input = System.IO.File.OpenRead(FileName))
+            using (Stream input = File.OpenRead(FileName))
             {
                 crc = crc32.GetCrc32AndCopy(input, CompressedStream);
             }
@@ -594,7 +595,7 @@
             bytes[i++] = (byte)((sz & 0xFF000000) >> 24);
 
             // UncompressedSize (Int32)
-            if (_Debug) System.Console.WriteLine("Uncompressed Size: {0}", crc32.TotalBytesRead);
+            if (_Debug) Console.WriteLine("Uncompressed Size: {0}", crc32.TotalBytesRead);
             bytes[i++] = (byte)(crc32.TotalBytesRead & 0x000000FF);
             bytes[i++] = (byte)((crc32.TotalBytesRead & 0x0000FF00) >> 8);
             bytes[i++] = (byte)((crc32.TotalBytesRead & 0x00FF0000) >> 16);
@@ -635,15 +636,15 @@
 
             if (_Debug)
             {
-                System.Console.WriteLine("local header: writing filename, {0} chars", c.Length);
-                System.Console.WriteLine("starting offset={0}", i);
+                Console.WriteLine("local header: writing filename, {0} chars", c.Length);
+                Console.WriteLine("starting offset={0}", i);
             }
             for (j = 0; (j < c.Length) && (i + j < bytes.Length); j++)
             {
-                bytes[i + j] = System.BitConverter.GetBytes(c[j])[0];
-                if (_Debug) System.Console.Write(" {0:X2}", bytes[i + j]);
+                bytes[i + j] = BitConverter.GetBytes(c[j])[0];
+                if (_Debug) Console.Write(" {0:X2}", bytes[i + j]);
             }
-            if (_Debug) System.Console.WriteLine();
+            if (_Debug) Console.WriteLine();
 
             i += j;
 
@@ -656,24 +657,24 @@
 
             if (_Debug)
             {
-                System.Console.WriteLine("\nAll header data:");
+                Console.WriteLine("\nAll header data:");
                 for (j = 0; j < i; j++)
-                    System.Console.Write(" {0:X2}", bytes[j]);
-                System.Console.WriteLine();
+                    Console.Write(" {0:X2}", bytes[j]);
+                Console.WriteLine();
             }
             // finally, write the header to the stream
             s.Write(bytes, 0, i);
 
             // preserve this header data for use with the central directory structure.
             _header = new byte[i];
-            if (_Debug) System.Console.WriteLine("preserving header of {0} bytes", _header.Length);
+            if (_Debug) Console.WriteLine("preserving header of {0} bytes", _header.Length);
             for (j = 0; j < i; j++)
                 _header[j] = bytes[j];
 
         }
 
 
-        internal void Write(System.IO.Stream s)
+        internal void Write(Stream s)
         {
             byte[] bytes = new byte[4096];
             int n;
@@ -699,12 +700,12 @@
                     for (int j = 0; j < n; j += 2)
                     {
                         if ((j > 0) && (j % 40 == 0))
-                            System.Console.WriteLine();
-                        System.Console.Write(" {0:X2}", bytes[j]);
+                            Console.WriteLine();
+                        Console.Write(" {0:X2}", bytes[j]);
                         if (j + 1 < n)
-                            System.Console.Write("{0:X2}", bytes[j + 1]);
+                            Console.Write("{0:X2}", bytes[j + 1]);
                     }
-                    System.Console.WriteLine("\n");
+                    Console.WriteLine("\n");
                 }
 
                 s.Write(bytes, 0, n);

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Zip/ZipFile.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Zip/ZipFile.cs	2008-01-11 14:47:26 UTC (rev 792)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Zip/ZipFile.cs	2008-01-11 15:53:27 UTC (rev 793)
@@ -62,12 +62,15 @@
 
 
 using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
 
 namespace newtelligence.DasBlog.Util.Zip
 {
 
 
-    public class ZipFile : System.Collections.Generic.IEnumerable<ZipEntry>,
+    public class ZipFile : IEnumerable<ZipEntry>,
       IDisposable
     {
         private string _name;
@@ -100,25 +103,25 @@
 
 
 
-        private System.IO.Stream ReadStream
+        private Stream ReadStream
         {
             get
             {
                 if (_readstream == null)
                 {
-                    _readstream = System.IO.File.OpenRead(_name);
+                    _readstream = File.OpenRead(_name);
                 }
                 return _readstream;
             }
         }
 
-        private System.IO.FileStream WriteStream
+        private FileStream WriteStream
         {
             get
             {
                 if (_writestream == null)
                 {
-                    _writestream = new System.IO.FileStream(_name, System.IO.FileMode.CreateNew);
+                    _writestream = new FileStream(_name, FileMode.CreateNew);
                 }
                 return _writestream;
             }
@@ -133,9 +136,9 @@
         {
             // create a new zipfile
             _name = NewZipFileName;
-            if (System.IO.File.Exists(_name))
-                throw new System.Exception(String.Format("That file ({0}) already exists.", NewZipFileName));
-            _entries = new System.Collections.Generic.List<ZipEntry>();
+            if (File.Exists(_name))
+                throw new Exception(String.Format("That file ({0}) already exists.", NewZipFileName));
+            _entries = new List<ZipEntry>();
         }
 
 
@@ -146,9 +149,9 @@
 
         public void AddItem(string FileOrDirectoryName, bool WantVerbose)
         {
-            if (System.IO.File.Exists(FileOrDirectoryName))
+            if (File.Exists(FileOrDirectoryName))
                 AddFile(FileOrDirectoryName, WantVerbose);
-            else if (System.IO.Directory.Exists(FileOrDirectoryName))
+            else if (Directory.Exists(FileOrDirectoryName))
                 AddDirectory(FileOrDirectoryName, WantVerbose);
 
             else
@@ -176,13 +179,13 @@
 
         public void AddDirectory(string DirectoryName, bool WantVerbose)
         {
-            String[] filenames = System.IO.Directory.GetFiles(DirectoryName);
+            String[] filenames = Directory.GetFiles(DirectoryName);
             foreach (String filename in filenames)
             {
                 AddFile(filename, WantVerbose);
             }
 
-            String[] dirnames = System.IO.Directory.GetDirectories(DirectoryName);
+            String[] dirnames = Directory.GetDirectories(DirectoryName);
             foreach (String dir in dirnames)
             {
                 AddDirectory(dir, WantVerbose);
@@ -288,34 +291,34 @@
             ZipFile zf = new ZipFile();
             zf._Debug = TurnOnDebug;
             zf._name = zipfilename;
-            zf._entries = new System.Collections.Generic.List<ZipEntry>();
+            zf._entries = new List<ZipEntry>();
             ZipEntry e;
             while ((e = ZipEntry.Read(zf.ReadStream, zf._Debug)) != null)
             {
-                if (zf._Debug) System.Console.WriteLine("  ZipFile::Read(): ZipEntry: {0}", e.FileName);
+                if (zf._Debug) Console.WriteLine("  ZipFile::Read(): ZipEntry: {0}", e.FileName);
                 zf._entries.Add(e);
             }
 
             // read the zipfile's central directory structure here.
-            zf._direntries = new System.Collections.Generic.List<ZipDirEntry>();
+            zf._direntries = new List<ZipDirEntry>();
 
             ZipDirEntry de;
             while ((de = ZipDirEntry.Read(zf.ReadStream, zf._Debug)) != null)
             {
-                if (zf._Debug) System.Console.WriteLine("  ZipFile::Read(): ZipDirEntry: {0}", de.FileName);
+                if (zf._Debug) Console.WriteLine("  ZipFile::Read(): ZipDirEntry: {0}", de.FileName);
                 zf._direntries.Add(de);
             }
 
             return zf;
         }
 
-        public System.Collections.Generic.IEnumerator<ZipEntry> GetEnumerator()
+        public IEnumerator<ZipEntry> GetEnumerator()
         {
             foreach (ZipEntry e in _entries)
                 yield return e;
         }
 
-        System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
+        IEnumerator IEnumerable.GetEnumerator()
         {
             return GetEnumerator();
         }
@@ -334,13 +337,13 @@
             {
                 if (header)
                 {
-                    System.Console.WriteLine("\n{1,-22} {2,-6} {3,4}   {4,-8}  {0}",
+                    Console.WriteLine("\n{1,-22} {2,-6} {3,4}   {4,-8}  {0}",
                                  "Name", "Modified", "Size", "Ratio", "Packed");
-                    System.Console.WriteLine(new System.String('-', 72));
+                    Console.WriteLine(new String('-', 72));
                     header = false;
                 }
                 if (WantVerbose)

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Dasblogce-cvs] SF.net SVN: dasblogce: [794] branches/refactoring_architecture/source

From: <sfcaus@us...> - 2008-01-11 18:05

Revision: 794
          http://dasblogce.svn.sourceforge.net/dasblogce/?rev=794&view=rev
Author:   sfcaus
Date:     2008-01-11 10:05:01 -0800 (Fri, 11 Jan 2008)

Log Message:
-----------
- reformating code
- some minor fixes

Modified Paths:
--------------
    branches/refactoring_architecture/source/Subtext.Akismet/AkismetClient.cs
    branches/refactoring_architecture/source/Subtext.Akismet/Comment.cs
    branches/refactoring_architecture/source/Subtext.Akismet/HttpClient.cs
    branches/refactoring_architecture/source/Subtext.Akismet/IComment.cs
    branches/refactoring_architecture/source/Subtext.Akismet/InvalidResponseException.cs
    branches/refactoring_architecture/source/WebControlCaptcha/CaptchaControl.vb
    branches/refactoring_architecture/source/WebControlCaptcha/CaptchaImage.vb
    branches/refactoring_architecture/source/WebControlCaptcha/CaptchaImageHandler.vb
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/CategoryList.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Macros.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/NamingPanel.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/NavigationLink.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Opml.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/ProfileMapperModule.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/ReferralBlackList.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/ReferralUrlBlacklist.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/RobotDefinition.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/SearchHighlight.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/SharedBaseControl.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/SharedBasePage.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/SideBarOpmlList.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/AggregatorBugHandler.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/ApproveItemHandler.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/AutoSaveEntryHandler.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/Blogger.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/BloggerAPI.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/CdfHandler.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/ClickThroughHandler.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/CommentAPI.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/ConfigEditingServiceImplementation.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/CrosspostReferrerHandler.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/DeleteItemHandler.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/EditServiceImplementation.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/GoogleSitemapHandler.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/MailToWeblog.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/MicrosummaryHandler.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/Test/AssemblyInfo.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/Test/ConfigServiceTester.cs

Modified: branches/refactoring_architecture/source/Subtext.Akismet/AkismetClient.cs
===================================================================
--- branches/refactoring_architecture/source/Subtext.Akismet/AkismetClient.cs	2008-01-11 15:53:27 UTC (rev 793)
+++ branches/refactoring_architecture/source/Subtext.Akismet/AkismetClient.cs	2008-01-11 18:05:01 UTC (rev 794)
@@ -4,251 +4,271 @@
 
 namespace Subtext.Akismet
 {
-	/// <summary>
-	/// The client class used to communicate with the 
-	/// <see href="http://akismet.com/">Akismet</see> service.
-	/// </summary>
-	public class AkismetClient
-	{
-		private HttpClient httpClient;
-		static readonly string version = typeof(HttpClient).Assembly.GetName().Version.ToString();
-		static readonly Uri verifyUrl = new Uri("http://rest.akismet.com/1.1/verify-key");
-		const string checkUrlFormat = "http://{0}.rest.akismet.com/1.1/comment-check";
-		const string submitSpamUrlFormat = "http://{0}.rest.akismet.com/1.1/submit-spam";
-		const string submitHamUrlFormat = "http://{0}.rest.akismet.com/1.1/submit-ham";
+    /// <summary>
+    /// The client class used to communicate with the 
+    /// <see href="http://akismet.com/">Akismet</see> service.
+    /// </summary>
+    public class AkismetClient
+    {
+        private const string checkUrlFormat = "http://{0}.rest.akismet.com/1.1/comment-check";
+        private const string submitHamUrlFormat = "http://{0}.rest.akismet.com/1.1/submit-ham";
+        private const string submitSpamUrlFormat = "http://{0}.rest.akismet.com/1.1/submit-spam";
+        private static readonly Uri verifyUrl = new Uri("http://rest.akismet.com/1.1/verify-key");
+        private static readonly string version = typeof (HttpClient).Assembly.GetName().Version.ToString();
+        private readonly HttpClient httpClient;
+        private string apiKey;
+        private Uri blogUrl;
 
-		Uri submitSpamUrl;
-		Uri submitHamUrl;
-		Uri checkUrl;
-		
-		
-		/// <summary>
-		/// Initializes a new instance of the <see cref="AkismetClient"/> class.
-		/// </summary>
-		/// <remarks>
-		/// This constructor takes in all the dependencies to allow for 
-		/// dependency injection and unit testing. Seems like overkill, 
-		/// but it's worth it.
-		/// </remarks>
-		/// <param name="apiKey">The Akismet API key.</param>
-		/// <param name="blogUrl">The root url of the blog.</param>
-		/// <param name="httpClient">Client class used to make the underlying requests.</param>
-		public AkismetClient(string apiKey, Uri blogUrl, HttpClient httpClient)
-		{
-			if(apiKey == null)
-				throw new ArgumentNullException("The akismet Api Key must be specified");
+        private Uri checkUrl;
+        private Uri submitHamUrl;
+        private Uri submitSpamUrl;
+        private int timeout = 5000;
+        private string userAgent = null;
 
-			if (blogUrl == null)
-				throw new ArgumentNullException("The blog's url must be specified");
-			
-			if (httpClient == null)
-				throw new ArgumentNullException("Must supply an http client");
-			
-			this.apiKey = apiKey;
-			this.blogUrl = blogUrl;
-			this.httpClient = httpClient;
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AkismetClient"/> class.
+        /// </summary>
+        /// <remarks>
+        /// This constructor takes in all the dependencies to allow for 
+        /// dependency injection and unit testing. Seems like overkill, 
+        /// but it's worth it.
+        /// </remarks>
+        /// <param name="apiKey">The Akismet API key.</param>
+        /// <param name="blogUrl">The root url of the blog.</param>
+        /// <param name="httpClient">Client class used to make the underlying requests.</param>
+        public AkismetClient(string apiKey, Uri blogUrl, HttpClient httpClient)
+        {
+            if (apiKey == null)
+            {
+                throw new ArgumentNullException("apiKey", "The akismet Api Key must be specified");
+            }
 
-			SetServiceUrls();
-		}
-		
-		/// <summary>
-		/// Initializes a new instance of the <see cref="AkismetClient"/> class.
-		/// </summary>
-		/// <param name="apiKey">The Akismet API key.</param>
-		/// <param name="blogUrl">The root url of the blog.</param>
-		public AkismetClient(string apiKey, Uri blogUrl) : this(apiKey, blogUrl, new HttpClient())
-		{
-			
-		}
-		
-		void SetServiceUrls()
-		{
-			this.submitHamUrl = new Uri(String.Format(submitHamUrlFormat, this.apiKey));
-			this.submitSpamUrl = new Uri(String.Format(submitSpamUrlFormat, this.apiKey));
-			this.checkUrl = new Uri(String.Format(checkUrlFormat, this.apiKey));
-		}
+            if (blogUrl == null)
+            {
+                throw new ArgumentNullException("blogUrl", "The blog's url must be specified");
+            }
 
-		/// <summary>
-		/// Gets or sets the Akismet API key.
-		/// </summary>
-		/// <value>The API key.</value>
-		public string ApiKey
-		{
-			get { return (this.apiKey == null) ? string.Empty : this.apiKey; }
-			set 
-			{ 
-				this.apiKey = (value == null) ? string.Empty : value;
-				SetServiceUrls();
-			}
-		}
+            if (httpClient == null)
+            {
+                throw new ArgumentNullException("httpClient", "Must supply an http client");
+            }
 
-		string apiKey;
+            this.apiKey = apiKey;
+            this.blogUrl = blogUrl;
+            this.httpClient = httpClient;
 
-		/// <summary>
-		/// Gets or sets the Usera Agent for the Akismet Client.  
-		/// Do not confuse this with the user agent for the comment 
-		/// being checked.
-		/// </summary>
-		/// <value>The API key.</value>
-		public string UserAgent
-		{
-			get { return (this.userAgent == null) ? BuildUserAgent("DasBlog", version) : this.userAgent; }
-			set { this.userAgent = value; }
-		}
+            SetServiceUrls();
+        }
 
-		string userAgent = null;
+        /// <summary>
+        /// Initializes a new instance of the <see cref="AkismetClient"/> class.
+        /// </summary>
+        /// <param name="apiKey">The Akismet API key.</param>
+        /// <param name="blogUrl">The root url of the blog.</param>
+        public AkismetClient(string apiKey, Uri blogUrl) : this(apiKey, blogUrl, new HttpClient())
+        {
+        }
 
-		/// <summary>
-		/// Helper method for building a user agent string in the format 
-		/// preferred by Akismet.
-		/// </summary>
-		/// <param name="applicationName">Name of the application.</param>
-		/// <param name="appVersion">The version of the app.</param>
-		/// <returns></returns>
-		public static string BuildUserAgent(string applicationName, string appVersion)
-		{
-			return string.Format("{0}/{1} | Akismet/1.11", applicationName, version);
-		}
+        /// <summary>
+        /// Gets or sets the Akismet API key.
+        /// </summary>
+        /// <value>The API key.</value>
+        public string ApiKey
+        {
+            get { return apiKey ?? string.Empty; }
+            set
+            {
+                apiKey = value ?? string.Empty;
+                SetServiceUrls();
+            }
+        }
 
-		/// <summary>
-		/// Gets or sets the timeout in milliseconds for the http request to Akismet. 
-		/// By default 5000 (5 seconds).
-		/// </summary>
-		/// <value>The timeout.</value>
-		public int Timeout
-		{
-			get { return this.timeout; }
-			set { this.timeout = value; }
-		}
+        /// <summary>
+        /// Gets or sets the Usera Agent for the Akismet Client.  
+        /// Do not confuse this with the user agent for the comment 
+        /// being checked.
+        /// </summary>
+        /// <value>The API key.</value>
+        public string UserAgent
+        {
+            get { return userAgent ?? BuildUserAgent("DasBlog", version); }
+            set { userAgent = value; }
+        }
 
-		int timeout = 5000;
-		
-		/// <summary>
-		/// Gets or sets the root URL to the blog.
-		/// </summary>
-		/// <value>The blog URL.</value>
-		public Uri BlogUrl
-		{
-			get { return this.blogUrl; }
-			set { this.blogUrl = value; }
-		}
+        /// <summary>
+        /// Gets or sets the timeout in milliseconds for the http request to Akismet. 
+        /// By default 5000 (5 seconds).
+        /// </summary>
+        /// <value>The timeout.</value>
+        public int Timeout
+        {
+            get { return timeout; }
+            set { timeout = value; }
+        }
 
-		Uri blogUrl;
+        /// <summary>
+        /// Gets or sets the root URL to the blog.
+        /// </summary>
+        /// <value>The blog URL.</value>
+        public Uri BlogUrl
+        {
+            get { return blogUrl; }
+            set { blogUrl = value; }
+        }
 
-		/// <summary>
-		/// Verifies the API key.  You really only need to 
-		/// call this once, perhaps at startup.
-		/// </summary>
-		/// <returns></returns>
-		public bool VerifyApiKey()
-		{
-			string parameters = "key=" + HttpUtility.UrlEncode(this.ApiKey) + "&blog=" + HttpUtility.UrlEncode(this.BlogUrl.ToString());
-			string result = this.httpClient.PostRequest(verifyUrl, this.UserAgent, this.Timeout, parameters);
+        private void SetServiceUrls()
+        {
+            submitHamUrl = new Uri(String.Format(submitHamUrlFormat, apiKey));
+            submitSpamUrl = new Uri(String.Format(submitSpamUrlFormat, apiKey));
+            checkUrl = new Uri(String.Format(checkUrlFormat, apiKey));
+        }
 
-			if (String.IsNullOrEmpty(result))
-				throw new InvalidResponseException("Akismet returned an empty response");
-			
-			return (System.String.Compare("valid", result, true) == 0);
-		}
-		
-		/// <summary>
-		/// Checks the comment and returns true if it is spam, otherwise false.
-		/// </summary>
-		/// <param name="comment"></param>
-		/// <returns></returns>
-		public bool CheckCommentForSpam(IComment comment)
-		{
-			string result = SubmitComment(comment, this.checkUrl);
+        /// <summary>
+        /// Helper method for building a user agent string in the format 
+        /// preferred by Akismet.
+        /// </summary>
+        /// <param name="applicationName">Name of the application.</param>
+        /// <param name="appVersion">The version of the app.</param>
+        /// <returns></returns>
+        public static string BuildUserAgent(string applicationName, string appVersion)
+        {
+            return string.Format("{0}/{1} | Akismet/1.11", applicationName, version);
+        }
 
-			if (String.IsNullOrEmpty(result))
-				throw new InvalidResponseException("Akismet returned an empty response");
-			
-			if (result != "true" && result != "false")
-				throw new InvalidResponseException(string.Format("Received the response '{0}' from Akismet. Probably a bad API key.", result));
-			
-			return bool.Parse(result);
-		}
+        /// <summary>
+        /// Verifies the API key.  You really only need to 
+        /// call this once, perhaps at startup.
+        /// </summary>
+        /// <returns></returns>
+        public bool VerifyApiKey()
+        {
+            string parameters = "key=" + HttpUtility.UrlEncode(ApiKey) + "&blog=" +
+                                HttpUtility.UrlEncode(BlogUrl.ToString());
+            string result = httpClient.PostRequest(verifyUrl, UserAgent, Timeout, parameters);
 
-		/// <summary>
-		/// Submits a comment to Akismet that should have been 
-		/// flagged as SPAM, but was not flagged by Akismet.
-		/// </summary>
-		/// <param name="comment"></param>
-		/// <returns></returns>
-		public void SubmitSpam(IComment comment)
-		{
-			SubmitComment(comment, this.submitSpamUrl);
-		}
+            if (String.IsNullOrEmpty(result))
+                throw new InvalidResponseException("Akismet returned an empty response");
 
-		/// <summary>
-		/// Submits a comment to Akismet that should not have been 
-		/// flagged as SPAM (a false positive).
-		/// </summary>
-		/// <param name="comment"></param>
-		/// <returns></returns>
-		public void SubmitHam(IComment comment)
-		{
-			SubmitComment(comment, this.submitHamUrl);
-		}
-		
-		string SubmitComment(IComment comment, Uri url)
-		{
-			//Not too many concatenations.  Might not need a string builder.
-			string parameters = "blog=" + HttpUtility.UrlEncode(this.blogUrl.ToString())
-								+ "&user_ip=" + comment.IpAddress.ToString()
-								+ "&user_agent=" + HttpUtility.UrlEncode(comment.UserAgent);
+            return (System.String.Compare("valid", result, true) == 0);
+        }
 
-			if (!String.IsNullOrEmpty(comment.Referer))
-				parameters += "&referer=" + HttpUtility.UrlEncode(comment.Referer);
+        /// <summary>
+        /// Checks the comment and returns true if it is spam, otherwise false.
+        /// </summary>
+        /// <param name="comment"></param>
+        /// <returns></returns>
+        public bool CheckCommentForSpam(IComment comment)
+        {
+            string result = SubmitComment(comment, checkUrl);
 
-			if (comment.Permalink != null)
-				parameters += "&permalink=" + HttpUtility.UrlEncode(comment.Permalink.ToString());
+            if (String.IsNullOrEmpty(result))
+            {
+                throw new InvalidResponseException("Akismet returned an empty response");
+            }
 
-			if (!String.IsNullOrEmpty(comment.CommentType))
-				parameters += "&comment_type=" + HttpUtility.UrlEncode(comment.CommentType);
+            if (result != "true" && result != "false")
+            {
+                throw new InvalidResponseException(
+                    string.Format("Received the response '{0}' from Akismet. Probably a bad API key.", result));
+            }
 
-			if (!String.IsNullOrEmpty(comment.Author))
-				parameters += "&comment_author=" + HttpUtility.UrlEncode(comment.Author);
+            return bool.Parse(result);
+        }
 
-			if (!String.IsNullOrEmpty(comment.AuthorEmail))
-				parameters += "&comment_author_email=" + HttpUtility.UrlEncode(comment.AuthorEmail);
+        /// <summary>
+        /// Submits a comment to Akismet that should have been 
+        /// flagged as SPAM, but was not flagged by Akismet.
+        /// </summary>
+        /// <param name="comment"></param>
+        /// <returns></returns>
+        public void SubmitSpam(IComment comment)
+        {
+            SubmitComment(comment, submitSpamUrl);
+        }
 
-			if (comment.AuthorUrl != null)
-				parameters += "&comment_author_url=" + HttpUtility.UrlEncode(comment.AuthorUrl.ToString());
+        /// <summary>
+        /// Submits a comment to Akismet that should not have been 
+        /// flagged as SPAM (a false positive).
+        /// </summary>
+        /// <param name="comment"></param>
+        /// <returns></returns>
+        public void SubmitHam(IComment comment)
+        {
+            SubmitComment(comment, submitHamUrl);
+        }
 
-			if (!String.IsNullOrEmpty(comment.Content))
-				parameters += "&comment_content=" + HttpUtility.UrlEncode(comment.Content);
+        private string SubmitComment(IComment comment, Uri url)
+        {
+            //Not too many concatenations.  Might not need a string builder.
+            string parameters = "blog=" + HttpUtility.UrlEncode(blogUrl.ToString())
+                                + "&user_ip=" + comment.IpAddress
+                                + "&user_agent=" + HttpUtility.UrlEncode(comment.UserAgent);
 
-			if (comment.ServerEnvironmentVariables != null)
-			{
-				foreach (string key in comment.ServerEnvironmentVariables)
-				{
-					parameters += "&" + key + "=" + HttpUtility.UrlEncode(comment.ServerEnvironmentVariables[key]);
-				}
-			}
+            if (!String.IsNullOrEmpty(comment.Referer))
+            {
+                parameters += "&referer=" + HttpUtility.UrlEncode(comment.Referer);
+            }
 
-			return this.httpClient.PostRequest(url, this.UserAgent, this.Timeout, parameters).ToLower(CultureInfo.InvariantCulture);
-		}
-	}
+            if (comment.Permalink != null)
+            {
+                parameters += "&permalink=" + HttpUtility.UrlEncode(comment.Permalink.ToString());
+            }
 
-	/// <summary>
-	/// Provides .NET 2.0 System.String features
-	/// </summary>
-	/// <remarks>
-	/// The idea is to reduce the differences between our version of the library and Subtext's version.
-	/// The fewer differences in the codebase, the easier it will be to merge in new features they add (in theory)
-	/// </remarks>
-	internal class String 
-	{
-		public static bool IsNullOrEmpty(string stringToCheck)
-		{
-			if (stringToCheck == null) return true;
-			return (stringToCheck.Length == 0);
-		}
+            if (!String.IsNullOrEmpty(comment.CommentType))
+            {
+                parameters += "&comment_type=" + HttpUtility.UrlEncode(comment.CommentType);
+            }
 
-		public static string Format(string format, params object[] args)
-		{
-			return System.String.Format(format, args);
-		}
-	}
-}
+            if (!String.IsNullOrEmpty(comment.Author))
+            {
+                parameters += "&comment_author=" + HttpUtility.UrlEncode(comment.Author);
+            }
+
+            if (!String.IsNullOrEmpty(comment.AuthorEmail))
+            {
+                parameters += "&comment_author_email=" + HttpUtility.UrlEncode(comment.AuthorEmail);
+            }
+
+            if (comment.AuthorUrl != null)
+            {
+                parameters += "&comment_author_url=" + HttpUtility.UrlEncode(comment.AuthorUrl.ToString());
+            }
+
+            if (!String.IsNullOrEmpty(comment.Content))
+            {
+                parameters += "&comment_content=" + HttpUtility.UrlEncode(comment.Content);
+            }
+
+            if (comment.ServerEnvironmentVariables != null)
+            {
+                foreach (string key in comment.ServerEnvironmentVariables)
+                {
+                    parameters += "&" + key + "=" + HttpUtility.UrlEncode(comment.ServerEnvironmentVariables[key]);
+                }
+            }
+
+            return httpClient.PostRequest(url, UserAgent, Timeout, parameters).ToLower(CultureInfo.InvariantCulture);
+        }
+    }
+
+    /// <summary>
+    /// Provides .NET 2.0 System.String features
+    /// </summary>
+    /// <remarks>
+    /// The idea is to reduce the differences between our version of the library and Subtext's version.
+    /// The fewer differences in the codebase, the easier it will be to merge in new features they add (in theory)
+    /// </remarks>
+    internal class String
+    {
+        public static bool IsNullOrEmpty(string stringToCheck)
+        {
+            if (stringToCheck == null) return true;
+            return (stringToCheck.Length == 0);
+        }
+
+        public static string Format(string format, params object[] args)
+        {
+            return System.String.Format(format, args);
+        }
+    }
+}
\ No newline at end of file

Modified: branches/refactoring_architecture/source/Subtext.Akismet/Comment.cs
===================================================================
--- branches/refactoring_architecture/source/Subtext.Akismet/Comment.cs	2008-01-11 15:53:27 UTC (rev 793)
+++ branches/refactoring_architecture/source/Subtext.Akismet/Comment.cs	2008-01-11 18:05:01 UTC (rev 794)
@@ -4,118 +4,122 @@
 
 namespace Subtext.Akismet
 {
-	public class Comment : IComment
-	{
-		private NameValueCollection serverEnvironmentVariables = new NameValueCollection();
-		private IPAddress ipAddress;
-		private string commentType;
-		private string userAgent;
-		private Uri permalink;
-		private string referer;
-		private string content;
-		private Uri authorUrl;
-		private string authorEmail;
-		private string author;
+    public class Comment : IComment
+    {
+        private readonly IPAddress ipAddress;
+        private readonly NameValueCollection serverEnvironmentVariables = new NameValueCollection();
+        private readonly string userAgent;
+        private string author;
+        private string authorEmail;
+        private Uri authorUrl;
+        private string commentType;
+        private string content;
+        private Uri permalink;
+        private string referer;
 
-		/// <summary>
-		/// Initializes a new instance of the <see cref="Comment"/> class.
-		/// </summary>
-		/// <param name="authorIpAddress">The author ip address.</param>
-		/// <param name="authorUserAgent">The author user agent.</param>
-		public Comment(IPAddress authorIpAddress, string authorUserAgent)
-		{
-			this.ipAddress = authorIpAddress;
-			this.userAgent = authorUserAgent;
-		}
-		
-		/// <summary>
-		/// The name submitted with the comment.
-		/// </summary>
-		public string Author
-		{
-			get { return this.author; }
-			set { this.author = value;}
-		}
+        /// <summary>
+        /// Initializes a new instance of the <see cref="Comment"/> class.
+        /// </summary>
+        /// <param name="authorIpAddress">The author ip address.</param>
+        /// <param name="authorUserAgent">The author user agent.</param>
+        public Comment(IPAddress authorIpAddress, string authorUserAgent)
+        {
+            ipAddress = authorIpAddress;
+            userAgent = authorUserAgent;
+        }
 
-		/// <summary>
-		/// The email submitted with the comment.
-		/// </summary>
-		public string AuthorEmail
-		{
-			get { return this.authorEmail; }
-			set { this.authorEmail = value;}
-		}
+        #region IComment Members
 
-		/// <summary>
-		/// The url submitted if provided.
-		/// </summary>
-		public Uri AuthorUrl
-		{
-			get { return this.authorUrl; }
-			set { this.authorUrl = value; }
-		}
+        /// <summary>
+        /// The name submitted with the comment.
+        /// </summary>
+        public string Author
+        {
+            get { return author; }
+            set { author = value; }
+        }
 
-		/// <summary>
-		/// Content of the comment
-		/// </summary>
-		public string Content
-		{
-			get { return this.content; }
-			set { this.content = value; }
-		}
+        /// <summary>
+        /// The email submitted with the comment.
+        /// </summary>
+        public string AuthorEmail
+        {
+            get { return authorEmail; }
+            set { authorEmail = value; }
+        }
 
-		/// <summary>
-		/// The HTTP_REFERER header value of the 
-		/// originating comment.
-		/// </summary>
-		public string Referer
-		{
-			get { return this.referer; }
-			set { this.referer = value; }
-		}
+        /// <summary>
+        /// The url submitted if provided.
+        /// </summary>
+        public Uri AuthorUrl
+        {
+            get { return authorUrl; }
+            set { authorUrl = value; }
+        }
 
-		/// <summary>
-		/// Permanent location of the entry the comment was 
-		/// submitted to.
-		/// </summary>
-		public Uri Permalink
-		{
-			get { return this.permalink; }
-			set { this.permalink = value; }
-		}
+        /// <summary>
+        /// Content of the comment
+        /// </summary>
+        public string Content
+        {
+            get { return content; }
+            set { content = value; }
+        }
 
-		/// <summary>
-		/// User agent of the requester. (Required)
-		/// </summary>
-		public string UserAgent
-		{
-			get { return this.userAgent; }
-		}
+        /// <summary>
+        /// The HTTP_REFERER header value of the 
+        /// originating comment.
+        /// </summary>
+        public string Referer
+        {
+            get { return referer; }
+            set { referer = value; }
+        }
 
-		/// <summary>
-		/// May be one of the following: {blank}, "comment", "trackback", "pingback", or a made-up value 
-		/// like "registration".
-		/// </summary>
-		public string CommentType
-		{
-			get { return this.commentType; }
-			set { this.commentType = value; }
-		}
+        /// <summary>
+        /// Permanent location of the entry the comment was 
+        /// submitted to.
+        /// </summary>
+        public Uri Permalink
+        {
+            get { return permalink; }
+            set { permalink = value; }
+        }
 
-		/// <summary>
-		/// IPAddress of the submitter
-		/// </summary>
-		public IPAddress IpAddress
-		{
-			get { return this.ipAddress; }
-		}
+        /// <summary>
+        /// User agent of the requester. (Required)
+        /// </summary>
+        public string UserAgent
+        {
+            get { return userAgent; }
+        }
 
-		/// <summary>
-		/// Optional collection of various server environment variables. 
-		/// </summary>
-		public NameValueCollection ServerEnvironmentVariables
-		{
-			get { return this.serverEnvironmentVariables; }
-		}
-	}
+        /// <summary>
+        /// May be one of the following: {blank}, "comment", "trackback", "pingback", or a made-up value 
+        /// like "registration".
+        /// </summary>
+        public string CommentType
+        {
+            get { return commentType; }
+            set { commentType = value; }
+        }
+
+        /// <summary>
+        /// IPAddress of the submitter
+        /// </summary>
+        public IPAddress IpAddress
+        {
+            get { return ipAddress; }
+        }
+
+        /// <summary>
+        /// Optional collection of various server environment variables. 
+        /// </summary>
+        public NameValueCollection ServerEnvironmentVariables
+        {
+            get { return serverEnvironmentVariables; }
+        }
+
+        #endregion
+    }
 }
\ No newline at end of file

Modified: branches/refactoring_architecture/source/Subtext.Akismet/HttpClient.cs
===================================================================
--- branches/refactoring_architecture/source/Subtext.Akismet/HttpClient.cs	2008-01-11 15:53:27 UTC (rev 793)
+++ branches/refactoring_architecture/source/Subtext.Akismet/HttpClient.cs	2008-01-11 18:05:01 UTC (rev 794)
@@ -5,56 +5,62 @@
 
 namespace Subtext.Akismet
 {
-	/// <summary>
-	/// Class used to make the actual HTTP requests.
-	/// </summary>
-	/// <remarks>
-	/// Yeah, I know you're thinking this is overkill, but it makes it 
-	/// easier to write tests to have this layer of abstraction from the 
-	/// underlying Http request.
-	/// </remarks>
-	public class HttpClient
-	{
-		/// <summary>
-		/// Posts the request and returns a text response.  
-		/// This is all that is needed for Akismet.
-		/// </summary>
-		/// <param name="url">The URL.</param>
-		/// <param name="userAgent">The user agent.</param>
-		/// <param name="timeout">The timeout.</param>
-		/// <param name="formParameters">The properly formatted parameters.</param>
-		/// <returns></returns>
-		public virtual string PostRequest(Uri url, string userAgent, int timeout, string formParameters)
-		{
-			ServicePointManager.Expect100Continue = false;
-			HttpWebRequest request = WebRequest.Create(url) as HttpWebRequest;
+    /// <summary>
+    /// Class used to make the actual HTTP requests.
+    /// </summary>
+    /// <remarks>
+    /// Yeah, I know you're thinking this is overkill, but it makes it 
+    /// easier to write tests to have this layer of abstraction from the 
+    /// underlying Http request.
+    /// </remarks>
+    public class HttpClient
+    {
+        /// <summary>
+        /// Posts the request and returns a text response.  
+        /// This is all that is needed for Akismet.
+        /// </summary>
+        /// <param name="url">The URL.</param>
+        /// <param name="userAgent">The user agent.</param>
+        /// <param name="timeout">The timeout.</param>
+        /// <param name="formParameters">The properly formatted parameters.</param>
+        /// <returns></returns>
+        public virtual string PostRequest(Uri url, string userAgent, int timeout, string formParameters)
+        {
+            ServicePointManager.Expect100Continue = false;
+            HttpWebRequest request = WebRequest.Create(url) as HttpWebRequest;
 
-			if (null != request)
-			{			
-				request.UserAgent = userAgent;
-				request.Timeout = timeout;
-				request.Method = "POST";
-				request.ContentLength = formParameters.Length;
-				request.ContentType = "application/x-www-form-urlencoded; charset=utf-8";
-				request.KeepAlive = true;
+            if (null != request)
+            {
+                request.UserAgent = userAgent;
+                request.Timeout = timeout;
+                request.Method = "POST";
+                request.ContentLength = formParameters.Length;
+                request.ContentType = "application/x-www-form-urlencoded; charset=utf-8";
+                request.KeepAlive = true;
 
-				using (StreamWriter myWriter = new StreamWriter(request.GetRequestStream()))
-				{
-					myWriter.Write(formParameters);
-				}
-			}
+                using (StreamWriter myWriter = new StreamWriter(request.GetRequestStream()))
+                {
+                    myWriter.Write(formParameters);
+                }
+            }
 
-			HttpWebResponse response = (HttpWebResponse)request.GetResponse();
-			if (response.StatusCode < HttpStatusCode.OK && response.StatusCode >= HttpStatusCode.Ambiguous)
-				throw new InvalidResponseException(string.Format("The service was not able to handle our request. Http Status '{0}'.", response.StatusCode), response.StatusCode);
+            HttpWebResponse response = (HttpWebResponse) request.GetResponse();
 
-			string responseText;
-			using(StreamReader reader = new StreamReader(response.GetResponseStream(), Encoding.ASCII)) //They only return "true" or "false"
-			{
-				responseText = reader.ReadToEnd();
-			}
-			
-			return responseText;
-		}
-	}
-}
+            if (response.StatusCode < HttpStatusCode.OK && response.StatusCode >= HttpStatusCode.Ambiguous)
+            {
+                throw new InvalidResponseException(
+                    string.Format("The service was not able to handle our request. Http Status '{0}'.",
+                                  response.StatusCode), response.StatusCode);
+            }
+
+            string responseText;
+            using (StreamReader reader = new StreamReader(response.GetResponseStream(), Encoding.ASCII))
+                //They only return "true" or "false"
+            {
+                responseText = reader.ReadToEnd();
+            }
+
+            return responseText;
+        }
+    }
+}
\ No newline at end of file

Modified: branches/refactoring_architecture/source/Subtext.Akismet/IComment.cs
===================================================================
--- branches/refactoring_architecture/source/Subtext.Akismet/IComment.cs	2008-01-11 15:53:27 UTC (rev 793)
+++ branches/refactoring_architecture/source/Subtext.Akismet/IComment.cs	2008-01-11 18:05:01 UTC (rev 794)
@@ -4,63 +4,63 @@
 
 namespace Subtext.Akismet
 {
-	/// <summary>
-	/// Defines the base information about a comment submitted to 
-	/// Akismet.
-	/// </summary>
-	public interface IComment
-	{
-		/// <summary>
-		/// The name submitted with the comment.
-		/// </summary>
-		string Author {get;}
-		
-		/// <summary>
-		/// The email submitted with the comment.
-		/// </summary>
-		string AuthorEmail {get;}
+    /// <summary>
+    /// Defines the base information about a comment submitted to 
+    /// Akismet.
+    /// </summary>
+    public interface IComment
+    {
+        /// <summary>
+        /// The name submitted with the comment.
+        /// </summary>
+        string Author { get; }
 
-		/// <summary>
-		/// The url submitted if provided.
-		/// </summary>
-		Uri AuthorUrl { get;}
+        /// <summary>
+        /// The email submitted with the comment.
+        /// </summary>
+        string AuthorEmail { get; }
 
-		/// <summary>
-		/// Content of the comment
-		/// </summary>
-		string Content { get;}
+        /// <summary>
+        /// The url submitted if provided.
+        /// </summary>
+        Uri AuthorUrl { get; }
 
-		/// <summary>
-		/// The HTTP_REFERER header value of the 
-		/// originating comment.
-		/// </summary>
-		string Referer { get;}
+        /// <summary>
+        /// Content of the comment
+        /// </summary>
+        string Content { get; }
 
-		/// <summary>
-		/// Permanent location of the entry the comment was 
-		/// submitted to.
-		/// </summary>
-		Uri Permalink { get;}
+        /// <summary>
+        /// The HTTP_REFERER header value of the 
+        /// originating comment.
+        /// </summary>
+        string Referer { get; }
 
-		/// <summary>
-		/// User agent of the requester. (Required)
-		/// </summary>
-		string UserAgent { get;}
+        /// <summary>
+        /// Permanent location of the entry the comment was 
+        /// submitted to.
+        /// </summary>
+        Uri Permalink { get; }
 
-		/// <summary>
-		/// May be one of the following: {blank}, "comment", "trackback", "pingback", or a made-up value 
-		/// like "registration".
-		/// </summary>
-		string CommentType { get;}
+        /// <summary>
+        /// User agent of the requester. (Required)
+        /// </summary>
+        string UserAgent { get; }
 
-		/// <summary>
-		/// IPAddress of the submitter
-		/// </summary>
-		IPAddress IpAddress { get;}
+        /// <summary>
+        /// May be one of the following: {blank}, "comment", "trackback", "pingback", or a made-up value 
+        /// like "registration".
+        /// </summary>
+        string CommentType { get; }
 
-		/// <summary>
-		/// Optional collection of various server environment variables. 
-		/// </summary>
-		NameValueCollection ServerEnvironmentVariables { get; }
-	}
-}
+        /// <summary>
+        /// IPAddress of the submitter
+        /// </summary>
+        IPAddress IpAddress { get; }
+
+        /// <summary>
+        /// Optional collection of various server environment variables. 
+        /// </summary>
+        NameValueCollection ServerEnvironmentVariables { get; }
+    }
+}
\ No newline at end of file

Modified: branches/refactoring_architecture/source/Subtext.Akismet/InvalidResponseException.cs
===================================================================
--- branches/refactoring_architecture/source/Subtext.Akismet/InvalidResponseException.cs	2008-01-11 15:53:27 UTC (rev 793)
+++ branches/refactoring_architecture/source/Subtext.Akismet/InvalidResponseException.cs	2008-01-11 18:05:01 UTC (rev 794)
@@ -3,61 +3,58 @@
 
 namespace Subtext.Akismet
 {
-	/// <summary>
-	/// Exception thrown when a response other than 200 is returned.
-	/// </summary>
-	/// <remarks>
-	/// This exception does not have any custom properties, 
-	/// thus it does not implement ISerializable.
-	/// </remarks>
-	[Serializable]
-	public sealed class InvalidResponseException : Exception
-	{
-		HttpStatusCode status = (HttpStatusCode)0;
+    /// <summary>
+    /// Exception thrown when a response other than 200 is returned.
+    /// </summary>
+    /// <remarks>
+    /// This exception does not have any custom properties, 
+    /// thus it does not implement ISerializable.
+    /// </remarks>
+    [Serializable]
+    public sealed class InvalidResponseException : Exception
+    {
+        private readonly HttpStatusCode status = (HttpStatusCode) 0;
 
-		/// <summary>
-		/// Initializes a new instance of the <see cref="InvalidResponseException"/> class.
-		/// </summary>
-		public InvalidResponseException() : base()
-		{
-		}
+        /// <summary>
+        /// Initializes a new instance of the <see cref="InvalidResponseException"/> class.
+        /// </summary>
+        public InvalidResponseException()
+        {
+        }
 
-		/// <summary>
-		/// Initializes a new instance of the <see cref="InvalidResponseException"/> class.
-		/// </summary>
-		/// <param name="message">The message.</param>
-		public InvalidResponseException(string message) : base(message)
-		{
-		}
+        /// <summary>
+        /// Initializes a new instance of the <see cref="InvalidResponseException"/> class.
+        /// </summary>
+        /// <param name="message">The message.</param>
+        public InvalidResponseException(string message) : base(message)
+        {
+        }
 
-		/// <summary>
-		/// Initializes a new instance of the <see cref="InvalidResponseException"/> class.
-		/// </summary>
-		/// <param name="message">The message.</param>
-		/// <param name="innerException">The inner exception.</param>
-		public InvalidResponseException(string message, Exception innerException) : base(message, innerException)
-		{
-		}
+        /// <summary>
+        /// Initializes a new instance of the <see cref="InvalidResponseException"/> class.
+        /// </summary>
+        /// <param name="message">The message.</param>
+        /// <param name="innerException">The inner exception.</param>
+        public InvalidResponseException(string message, Exception innerException) : base(message, innerException)
+        {
+        }
 
-		/// <summary>
-		/// Initializes a new instance of the <see cref="InvalidResponseException"/> class.
-		/// </summary>
-		/// <param name="message">The message.</param>
-		public InvalidResponseException(string message, HttpStatusCode status) : base(message)
-		{
-			this.status = status;
-		}
+        /// <summary>
+        /// Initializes a new instance of the <see cref="InvalidResponseException"/> class.
+        /// </summary>
+        /// <param name="message">The message.</param>
+        public InvalidResponseException(string message, HttpStatusCode status) : base(message)
+        {
+            this.status = status;
+        }
 
-		/// <summary>
-		/// Gets the HTTP status returned by the service.
-		/// </summary>
-		/// <value>The HTTP status.</value>
-		public HttpStatusCode HttpStatus
-		{
-			get
-			{
-				return this.status;
-			}
-		}
-	}
-}
+        /// <summary>
+        /// Gets the HTTP status returned by the service.
+        /// </summary>
+        /// <value>The HTTP status.</value>
+        public HttpStatusCode HttpStatus
+        {
+            get { return status; }
+        }
+    }
+}
\ No newline at end of file

Modified: branches/refactoring_architecture/source/WebControlCaptcha/CaptchaControl.vb
===================================================================
--- branches/refactoring_architecture/source/WebControlCaptcha/CaptchaControl.vb	2008-01-11 15:53:27 UTC (rev 793)
+++ branches/refactoring_architecture/source/WebControlCaptcha/CaptchaControl.vb	2008-01-11 18:05:01 UTC (rev 794)
@@ -39,7 +39,8 @@
 
     Public Event UserValidationEvent(ByVal Validated As Boolean)
 
-    <DefaultValue("Enter the code shown above:"), Description("Instructional text displayed next to CAPTCHA image."), Category("Captcha")> _
+    <DefaultValue("Enter the code shown above:"), Description("Instructional text displayed next to CAPTCHA image."), _
+        Category("Captcha")> _
     Public Property [Text]() As String
         Get
             Return _strText
@@ -49,7 +50,9 @@
         End Set
     End Property
 
-    <DefaultValue(GetType(Layout), "Horizontal"), Description("Determines if image and input area are displayed horizontally, or vertically."), Category("Captcha")> _
+    <DefaultValue(GetType(Layout), "Horizontal"), _
+        Description("Determines if image and input area are displayed horizontally, or vertically."), _
+        Category("Captcha")> _
     Public Property LayoutStyle() As Layout
         Get
             Return _LayoutStyle
@@ -76,7 +79,9 @@
         End Set
     End Property
 
-    <DefaultValue(""), Description("Font used to render CAPTCHA text. If font name is blankd, a random font will be chosen."), Category("Captcha")> _
+    <DefaultValue(""), _
+        Description("Font used to render CAPTCHA text. If font name is blankd, a random font will be chosen."), _
+        Category("Captcha")> _
     Public Property CaptchaFont() As String
         Get
             Return _strFont
@@ -87,7 +92,9 @@
         End Set
     End Property
 
-    <DefaultValue(""), Description("Characters used to render CAPTCHA text. A character will be picked randomly from the string."), Category("Captcha")> _
+    <DefaultValue(""), _
+        Description("Characters used to render CAPTCHA text. A character will be picked randomly from the string."), _
+        Category("Captcha")> _
     Public Property CaptchaChars() As String
         Get
             Return _captcha.TextChars
@@ -107,7 +114,9 @@
         End Set
     End Property
 
-    <DefaultValue(0), Description("Number of seconds this CAPTCHA is valid after it is generated. Zero means valid forever."), Category("Captcha")> _
+    <DefaultValue(0), _
+        Description("Number of seconds this CAPTCHA is valid after it is generated. Zero means valid forever."), _
+        Category("Captcha")> _
     Public Property CaptchaTimeout() As Integer
         Get
             Return _intTimeoutSeconds
@@ -117,7 +126,8 @@
         End Set
     End Property
 
-    <DefaultValue(GetType(CaptchaImage.FontWarpFactor), "Low"), Description("Amount of random font warping used on the CAPTCHA text"), Category("Captcha")> _
+    <DefaultValue(GetType(CaptchaImage.FontWarpFactor), "Low"), _
+        Description("Amount of random font warping used on the CAPTCHA text"), Category("Captcha")> _
     Public Property CaptchaFontWarping() As CaptchaImage.FontWarpFactor
         Get
             Return _captcha.FontWarp
@@ -218,7 +228,8 @@
         RaiseEvent UserValidationEvent(_blnUserValidated)
     End Function
 
-    Public Function LoadPostData(ByVal PostDataKey As String, ByVal Values As NameValueCollection) As Boolean Implements IPostBackDataHandler.LoadPostData
+    Public Function LoadPostData(ByVal PostDataKey As String, ByVal Values As NameValueCollection) As Boolean _
+        Implements IPostBackDataHandler.LoadPostData
         ValidateCaptcha(Convert.ToString(Values(Me.UniqueID)))
         GenerateNewCaptcha()
         Return False
@@ -423,7 +434,8 @@
         If Not IsDesignMode Then
             'HttpContext.Current.Cache.Add(LocalGuid, _captcha, Nothing, DateTime.Now.AddMinutes(HttpContext.Current.Session.Timeout), TimeSpan.Zero, Caching.CacheItemPriority.Normal, Nothing)
             'No reason to keep the captcha in the cache very long.
-            HttpContext.Current.Cache.Add(LocalGuid, _captcha, Nothing, DateTime.Now.AddMinutes(1), TimeSpan.Zero, CacheItemPriority.High, Nothing)
+            HttpContext.Current.Cache.Add(LocalGuid, _captcha, Nothing, DateTime.Now.AddMinutes(1), TimeSpan.Zero, _
+                                           CacheItemPriority.High, Nothing)
         End If
         Me.CaptchaText = _captcha.Text
         Me.GeneratedAt = Now
@@ -432,5 +444,4 @@
     Protected Overrides Sub OnPreRender(ByVal E As EventArgs)
         If LocalGuid = "" Then GenerateNewCaptcha()
     End Sub
-
 End Class
\ No newline at end of file

Modified: branches/refactoring_architecture/source/WebControlCaptcha/CaptchaImage.vb
===================================================================
--- branches/refactoring_architecture/source/WebControlCaptcha/CaptchaImage.vb	2008-01-11 15:53:27 UTC (rev 793)
+++ branches/refactoring_architecture/source/WebControlCaptcha/CaptchaImage.vb	2008-01-11 18:05:01 UTC (rev 794)
@@ -208,7 +208,8 @@
         Return sb.ToString
     End Function
 
-    Private Function RandomPoint(ByVal xmin As Integer, ByVal xmax As Integer, ByRef ymin As Integer, ByRef ymax As Integer) As PointF
+    Private Function RandomPoint(ByVal xmin As Integer, ByVal xmax As Integer, ByRef ymin As Integer, _
+                                  ByRef ymax As Integer) As PointF
         Return New PointF(_rand.Next(xmin, xmax), _rand.Next(ymin, ymax))
     End Function
 
@@ -283,8 +284,13 @@
 
             Dim p1 As PointF = RandomPoint(0, intWrange, 0, intHrange)
             Dim p2 As PointF = RandomPoint(rect.Width - (intWrange - Convert.ToInt32(p1.X)), rect.Width, 0, intHrange)
-            Dim p3 As PointF = RandomPoint(0, intWrange, rect.Height - (intHrange - Convert.ToInt32(p1.Y)), rect.Height)
-            Dim p4 As PointF = RandomPoint(rect.Width - (intWrange - Convert.ToInt32(p3.X)), rect.Width, rect.Height - (intHrange - Convert.ToInt32(p2.Y)), rect.Height)
+            Dim _
+                p3 As PointF = _
+                    RandomPoint(0, intWrange, rect.Height - (intHrange - Convert.ToInt32(p1.Y)), rect.Height)
+            Dim _
+                p4 As PointF = _
+                    RandomPoint(rect.Width - (intWrange - Convert.ToInt32(p3.X)), rect.Width, _
+                                 rect.Height - (intHrange - Convert.ToInt32(p2.Y)), rect.Height)
 
             Dim points As PointF() = New PointF() {p1, p2, p3, p4}
             Dim m As New Matrix
@@ -301,7 +307,8 @@
         Dim i As Integer
         For i = 0 To Convert.ToInt32(((rect.Width * rect.Height) / 30))
             graphics1.FillEllipse(brush1, _rand.Next(rect.Width), _rand.Next(rect.Height), _
-                _rand.Next(Convert.ToInt32(intMaxDim / 50)), _rand.Next(Convert.ToInt32(intMaxDim / 50)))
+                                   _rand.Next(Convert.ToInt32(intMaxDim / 50)), _
+                                   _rand.Next(Convert.ToInt32(intMaxDim / 50)))
         Next
 
         '-- it's important to clean up unmanaged resources
@@ -334,5 +341,4 @@
     End Sub
 
 #End Region
-
 End Class
\ No newline at end of file

Modified: branches/refactoring_architecture/source/WebControlCaptcha/CaptchaImageHandler.vb
===================================================================
--- branches/refactoring_architecture/source/WebControlCaptcha/CaptchaImageHandler.vb	2008-01-11 15:53:27 UTC (rev 793)
+++ branches/refactoring_architecture/source/WebControlCaptcha/CaptchaImageHandler.vb	2008-01-11 18:05:01 UTC (rev 794)
@@ -59,5 +59,4 @@
             Return True
         End Get
     End Property
-
 End Class
\ No newline at end of file

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/CategoryList.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/CategoryList.cs	2008-01-11 15:53:27 UTC (rev 793)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/CategoryList.cs	2008-01-11 18:05:01 UTC (rev 794)
@@ -168,7 +168,7 @@
                     expandableLink.NavigateUrl = "javascript:ct_toggleExpansionStatus( '" + collapsablePanel.ClientID +
                                                  "', '" + imgBadge.ClientID + "' )";
                     imgBadge.ImageUrl = requestPage.GetThemedImageUrl("outlinedown");
-                    imgBadge.ToolTip = requestPage.CoreStringTables.GetString("tooltip_expand");
+                    imgBadge.ToolTip = SharedBasePage.CoreStringTables.GetString("tooltip_expand");
 
                     HyperLink hlHead = new HyperLink();
                     hlHead.CssClass = "categoryListNestedOutlineTitleStyle";

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Macros.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Macros.cs	2008-01-11 15:53:27 UTC (rev 793)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Macros.cs	2008-01-11 18:05:01 UTC (rev 794)
@@ -395,7 +395,7 @@
             Image img = new Image();
             img.CssClass = "xmlCoffeeMugImageStyle";
             img.ImageUrl = requestPage.GetThemedImageUrl("xmlCoffeeMug");
-            img.ToolTip = img.AlternateText = requestPage.CoreStringTables.GetString("text_subscribe");
+            img.ToolTip = img.AlternateText = SharedBasePage.CoreStringTables.GetString("text_subscribe");
             xmlLink.Controls.Add(img);
 
             return xmlLink;
@@ -432,7 +432,7 @@
 
             Image img = new Image();
             img.CssClass = "mailToImageStyle";
-            img.ToolTip = img.AlternateText = requestPage.CoreStringTables.GetString("text_send_mail");
+            img.ToolTip = img.AlternateText = SharedBasePage.CoreStringTables.GetString("text_send_mail");
             img.ImageUrl = requestPage.GetThemedImageUrl("mailTo");
             xmlLink.Controls.Add(img);
 
@@ -707,7 +707,7 @@
             else
             {
                 HyperLink hl = new HyperLink();
-                hl.Text = requestPage.CoreStringTables.GetString("text_log_on");
+                hl.Text = SharedBasePage.CoreStringTables.GetString("text_log_on");
                 hl.NavigateUrl = "Login.aspx";
 
                 return hl;
@@ -1419,7 +1419,8 @@
                     lnkNext.NavigateUrl = SiteUtilities.GetStartPageUrl();
                 }
 
-                LiteralControl litNext = new LiteralControl(requestPage.CoreStringTables.GetString("text_next_posts"));
+                LiteralControl litNext =
+                    new LiteralControl(SharedBasePage.CoreStringTables.GetString("text_next_posts"));
                 HtmlGenericControl spanNextSign = new HtmlGenericControl("span");
                 spanNextSign.InnerHtml = "&raquo;";
 
@@ -1447,7 +1448,7 @@
                 lnkPrevious.NavigateUrl = SiteUtilities.GetPagedViewUrl(requestPage.PageIndex + 1);
 
                 LiteralControl litPrevious =
-                    new LiteralControl(requestPage.CoreStringTables.GetString("text_previous_posts"));
+                    new LiteralControl(SharedBasePage.CoreStringTables.GetString("text_previous_posts"));
 
                 HtmlGenericControl spanPreviousSign = new HtmlGenericControl("span");
                 spanPreviousSign.InnerHtml = "&laquo;";
@@ -1628,12 +1629,12 @@
                     {
                         HtmlAnchor previous = new HtmlAnchor();
                         previous.HRef = SiteUtilities.GetCategoryViewUrl(requestPage.CategoryName, page - 1);
-                        previous.InnerText = requestPage.CoreStringTables.GetString("text_category_previouspage");
+                        previous.InnerText = SharedBasePage.CoreStringTables.GetString("text_category_previouspage");
                         div.Controls.Add(previous);
                         div.Controls.Add(new LiteralControl(" "));
                     }
 
-                    string pagexofy = requestPage.CoreStringTables.GetString("text_category_pagexofy");
+                    string pagexofy = SharedBasePage.CoreStringTables.GetString("text_category_pagexofy");
                     div.Controls.Add(
                         new LiteralControl(String.Format(pagexofy, page, maxpage, requestPage.CategoryName)));
 
@@ -1642,7 +1643,7 @@
                         div.Controls.Add(new LiteralControl(" "));
                         HtmlAnchor next = new HtmlAnchor();
                         next.HRef = SiteUtilities.GetCategoryViewUrl(requestPage.CategoryName, page + 1);
-                        next.InnerText = requestPage.CoreStringTables.GetString("text_category_nextpage");
+                        next.InnerText = SharedBasePage.CoreStringTables.GetString("text_category_nextpage");
                         div.Controls.Add(next);
                     }
 
@@ -1889,11 +1890,11 @@
             }
 
             // localize strings			
-            string totalPostsString = requestPage.CoreStringTables.GetString("text_blogstats_totalposts");
-            string thisWeekString = requestPage.CoreStringTables.GetString("text_blogstats_thisweek");
-            string thisMonthString = requestPage.CoreStringTables.GetString("text_blogstats_thismonth");
-            string thisYearString = requestPage.CoreStringTables.GetString("text_blogstats_thisyear");
-            string commentsString = requestPage.CoreStringTables.GetString("text_blogstats_comments");
+            string totalPostsString = SharedBasePage.CoreStringTables.GetString("text_blogstats_totalposts");
+            string thisWeekString = SharedBasePage.CoreStringTables.GetString("text_blogstats_thisweek");
+            string thisMonthString = SharedBasePage.CoreStringTables.GetString("text_blogstats_thismonth");
+            string thisYearString = SharedBasePage.CoreStringTables.GetString("text_blogstats_thisyear");
+            string commentsString = SharedBasePage.CoreStringTables.GetString("text_blogstats_comments");
 
             // render content
             StringBuilder sb = new StringBuilder();
@@ -1932,9 +1933,9 @@
                         try
                         {
                             string totalPostsString =
-                                requestPage.CoreStringTables.GetString("text_blogtopposters_totalposts");
+                                SharedBasePage.CoreStringTables.GetString("text_blogtopposters_totalposts");
                             string commentsString =
-                                requestPage.CoreStringTables.GetString("text_blogtopposters_comments");
+                                SharedBasePage.CoreStringTables.GetString("text_blogtopposters_comments");
 
                             ArrayList userItems = new ArrayList();
                             Hashtable userKeys = new Hashtable();
@@ -2152,7 +2153,7 @@
 
             Image img = new Image();
             img.CssClass = "mailToImageStyle";
-            img.ToolTip = img.AlternateText = requestPage.CoreStringTables.GetString("text_send_mail");
+            img.ToolTip = img.AlternateText = SharedBasePage.CoreStringTables.GetString("text_send_mail");
             img.ImageUrl = requestPage.GetThemedImageUrl("mailTo");
             mailLink.Controls.Add(img);
 
@@ -2435,7 +2436,7 @@
 
                     bodyContent =
                         String.Format("<p style=\"color:red;font-size:smaller\">{0} {1}/{2} ({3})<p>{4}",
-                                      requestPage.CoreStringTables.GetString("text_item_lang_note"), ci.EnglishName,
+                                      SharedBasePage.CoreStringTables.GetString("text_item_lang_note"), ci.EnglishName,
                                       ci.NativeName, entry.Language, bodyContent);
                 }
 
@@ -2444,7 +2445,7 @@
                     requestPage.SiteConfig.FrontPageCategory.Length > 0)
                 {
                     bodyContent = "<p style=\"color:red;font-size:smaller\">" +
-                                  requestPage.CoreStringTables.GetString("text_item_cat_note") + "<p>" + bodyContent;
+                                  SharedBasePage.CoreStringTables.GetString("text_item_cat_note") + "<p>" + bodyContent;
                 }
 
                 return new LiteralControl(bodyContent);
@@ -2500,7 +2501,7 @@
                         String.Format(
                             "<div class=\"itemReadMoreStyle\"><a href=\"{0}\" rel=\"bookmark\">{1}</a></div>",
                             SiteUtilities.GetPermaLinkUrl(requestPage.SiteConfig, entry),
-                            requestPage.CoreStringTables.GetString("text_read_more"));
+                            SharedBasePage.CoreStringTables.GetString("text_read_more"));
                 }
 
                 if (!requestPage.HideAdminTools && entry.Language != null && entry.Language.Length > 0)
@@ -2517,7 +2518,7 @@
 
                     bodyContent =
                         String.Format("<p style=\"color:red;font-size:smaller\">{0} {1}/{2} ({3})<p>{4}",
-                                      requestPage.CoreStringTables.GetString("text_item_lang_note"), ci.EnglishName,
+                                      SharedBasePage.CoreStringTables.GetString("text_item_lang_note"), ci.EnglishName,
                                       ci.NativeName, entry.Language, bodyContent);
                 }
 
@@ -2526,7 +2527,7 @@
                     requestPage.SiteConfig.FrontPageCategory.Length > 0)
                 {
                     bodyContent = "<p style=\"color:red;font-size:smaller\">" +
-                                  requestPage.CoreStringTables.GetString("text_item_cat_note") + "<p>" + bodyContent;
+                                  SharedBasePage.CoreStringTables.GetString("text_item_cat_note") + "<p>" + bodyContent;
                 }
 
                 return new LiteralControl(bodyContent);
@@ -2705,7 +2706,7 @@
                     new Uri(new Uri(SiteUtilities.GetBaseUrl(requestPage.SiteConfig)),
                             requestPage.GetThemedImageUrl("itemLink")).ToString();
                 img.CssClass = "permalinkImageStyle";
-                img.ToolTip = requestPage.CoreStringTables.GetString("text_permalink");
+                img.ToolTip = SharedBasePage.CoreStringTables.GetString("text_permalink");
                 img.AlternateText = "#";
                 hl.Controls.Add(img);
                 hl.NavigateUrl = SiteUtilities.GetPermaLinkUrl(entry);
@@ -2775,7 +2776,7 @@
                         HyperLink hl = new HyperLink();
                         hl.CssClass = "commentLinkStyle";
                         hl.NavigateUrl = SiteUtilities.GetCommentViewUrl(entry.EntryId) + "#commentstart";
-                        hl.Text = requestPage.CoreStringTables.GetString("text_comments") + " [" +
+                        hl.Text = SharedBasePage.CoreStringTables.GetString("text_comments") + " [" +
                                   comments.Count + "]";
 
                         return hl;
@@ -2785,7 +2786,7 @@
                         HyperLink hl = new HyperLink();
                         hl.CssClass = "commentLinkStyle";
                         hl.NavigateUrl = SiteUtilities.GetCommentViewUrl(entry.EntryId) + "#commentstart";
-                        hl.Text = requestPage.CoreStringTables.GetString("text_comments");
+                        hl.Text = SharedBasePage.CoreStringTables.GetString("text_comments");
 
                         return hl;
                     }
@@ -2835,8 +2836,8 @@
                     HyperLink hl = new HyperLink();
                     hl.CssClass = "trackbackLinkStyle";
                     hl.NavigateUrl = SiteUtilities.GetTrackbackUrl(entry.EntryId);
-                    hl.ToolTip = requestPage.CoreStringTables.GetString("tooltip_trackback");
-                    hl.Text = requestPage.CoreStringTables.GetString("text_trackback");
+                    hl.ToolTip = SharedBasePage.CoreStringTables.GetString("tooltip_trackback");
+                    hl.Text = SharedBasePage.CoreStringTables.GetString("text_trackback");
 
                     return hl;
                 }
@@ -2868,7 +2869,7 @@
 
                         placeHolder.Controls.Add(trkSpan);
                         trkSpan.Controls.Add(
-                            new LiteralControl(requestPage.CoreStringTables.GetString("text_trackings") + "<br />"));
+                            new LiteralControl(SharedBasePage.CoreStringTables.GetString("text_trackings") + "<br />"));
 
                         foreach (Tracking trk in trackings)
                         {
@@ -2997,7 +2998,8 @@
 
                         placeHolder.Controls.Add(relatedPosts);
                         relatedPosts.Controls.Add(
-                            new LiteralControl(requestPage.CoreStringTables.GetString("text_related_posts") + "<br />"));
+                            new LiteralControl(SharedBasePage.CoreStringTables.GetString("text_related_posts") +
+                                               "<br />"));
 
                         int count = 0;
                         entries.Sort(new EntrySorter());
@@ -3106,7 +3108,7 @@
                         new Uri(new Uri(SiteUtilities.GetBaseUrl(requestPage.SiteConfig)),
                                 requestPage.GetThemedImageUrl("editbutton")).ToString();
                     img.BorderWidth = 0;
-                    img.AlternateText = requestPage.CoreStringTables.GetString("alttext_editbutton");
+                    img.AlternateText = SharedBasePage.CoreStringTables.GetString("alttext_editbutton");
                     hl.Controls.Add(img);
                     hl.NavigateUrl = SiteUtilities.GetEditViewUrl(entry.EntryId);
                     hl.ToolTip = HttpUtility.HtmlEncode("Edit " + entry.Title);
@@ -3121,7 +3123,7 @@
                         new Uri(new Uri(SiteUtilities.GetBaseUrl(requestPage.SiteConfig)),
                                 requestPage.GetThemedImageUrl("deletebutton")).ToString();
                     img.BorderWidth = 0;
-                    img.AlternateText = requestPage.CoreStringTables.GetString("alttext_deletebutton");
+                    img.AlternateText = SharedBasePage.CoreStringTables.GetString("alttext_deletebutton");
                     hl.Controls.Add(img);
                     hl.NavigateUrl =
                         String.Format("javascript:deleteEntry(\"{0}\", \"{1}\")", entry.EntryId,
@@ -3145,8 +3147,8 @@
             get
             {
                 HyperLink hl = new HyperLink();
-                hl.ToolTip = requestPage.CoreStringTables.GetString("tooltip_disclaimer");
-                hl.Text = requestPage.CoreStringTables.GetString("text_disclaimer");
+                hl.ToolTip = SharedBasePage.CoreStringTables.GetString("tooltip_disclaimer");
+                hl.Text = SharedBasePage.CoreStringTables.GetString("text_disclaimer");
                 hl.CssClass = "disclaimerLinkStyle";
                 hl.NavigateUrl = String.Format("FormatPage.aspx?path={0}", "siteConfig/disclaimer.format.html");
 
@@ -4001,7 +4003,7 @@
                         referralSpan.Controls.Add(new LiteralControl("<br/>"));
                         HyperLink hl = new HyperLink();
                         referralSpan.Controls.Add(hl);
-                        hl.Text = requestPage.CoreStringTables.GetString("text_referrallist_more");
+                        hl.Text = SharedBasePage.CoreStringTables.GetString("text_referrallist_more");
                         hl.ID = "referralMore";
                         //string script = "document.getElementById('"+ referralSpanHidden.ClientID + "').style.display='inline';";
                         //script += "document.getElementById('" + hl.ClientID + "').style.display='none';";

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/NamingPanel.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/NamingPanel.cs	2008-01-11 15:53:27 UTC (rev 793)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/NamingPanel.cs	2008-01-11 18:05:01 UTC (rev 794)
@@ -8,12 +8,12 @@
     /// into a naming container. Required for some script wizardry
     /// </summary>
     [ToolboxData("<{0}:NamingPanel runat=server></{0}:NamingPanel>")]
-	public class NamingPanel : Panel, INamingContainer
-	{
+    public class NamingPanel : Panel, INamingContainer
+    {
         public NamingPanel()
         {
-            this.Style.Add("padding","0px");
-            this.Style.Add("margin","0px");
+            Style.Add("padding", "0px");
+            Style.Add("margin", "0px");
         }
     }
-}                                                         
+}
\ No newline at end of file

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/NavigationLink.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/NavigationLink.cs	2008-01-11 15:53:27 UTC (rev 793)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/NavigationLink.cs	2008-01-11 18:05:01 UTC (rev 794)
@@ -1,4 +1,5 @@
 #region Copyright (c) 2003, newtelligence AG. All rights reserved.
+
 /*
 // Copyright (c) 2003, newtelligence AG. (http://www.newtelligence.com)
 // Original BlogX Source Code: Copyright (c) 2003, Chris Anderson (http://simplegeek.com)
@@ -35,6 +36,7 @@
 // or following this notice. 
 //
 */
+
 #endregion
 
 using System;
@@ -48,25 +50,39 @@
     [XmlRoot("links")]
     public class NavigationRoot
     {
-        NavigationLinkCollection items = new NavigationLinkCollection();
+        private NavigationLinkCollection items = new NavigationLinkCollection();
 
         [XmlElement("link")]
-        public NavigationLinkCollection Items { get { return items; } set { items = value; } }
+        public NavigationLinkCollection Items
+        {
+            get { return items; }
+            set { items = value; }
+        }
     }
 
     [Serializable]
     public class NavigationLink
     {
-        string name;
-        string url;
+        private string name;
+        private string url;
 
         [XmlElement("name")]
-        public string Name { get { return name; } set { name = value; } }
+        public string Name
+        {
+            get { return name; }
+            set { name = value; }
+        }
+
         [XmlElement("url")]
-        public string Url { get { return url; } set { url = value; } }
+        public string Url
+        {
+            get { return url; }
+            set { url = value; }
+        }
     }
 
     #region Collection
+
     /// <summary>
     /// A collection of elements of type NavigationLink
     /// </summary>
@@ -77,9 +93,7 @@
         /// Initializes a new empty instance of the NavigationLinkCollection class.
         /// </summary>
         public NavigationLinkCollection()
-            : base()
         {
-            // empty
         }
 
         /// <summary>
@@ -89,15 +103,14 @@
         /// <param name="items">
         /// The array whose elements are to be added to the new NavigationLinkCollection.
         /// </param>
-        public NavigationLinkCollection(IList<NavigationLink> items)
-            : base()
+        public NavigationLinkCollection(IEnumerable<NavigationLink> items)
         {
-            if (items == null) {
+            if (items == null)
+            {
                 throw new ArgumentNullException("items");
             }
 
-            this.AddRange(items);
-
+            AddRange(items);
         }
 
         /// <summary>
@@ -108,13 +121,14 @@
         /// </param>
         public virtual void AddRange(IEnumerable<NavigationLink> items)
         {
-            if (items == null) {
+            if (items == null)
+            {
                 throw new ArgumentNullException("items");
             }
 
             foreach (NavigationLink item in items)
             {
-                this.Add(item);
+                Add(item);
             }
         }
 
@@ -128,9 +142,10 @@
         {
             foreach (NavigationLink item in items)
             {
-                this.Add(item);
+                Add(item);
             }
         }
     }
+
     #endregion
-}
+}
\ No newline at end of file

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Opml.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Opml.cs	2008-01-11 15:53:27 UTC (rev 793)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Opml.cs	2008-01-11 18:05:01 UTC (rev 794)
@@ -1,4 +1,5 @@
 #region Copyright (c) 2003, newtelligence AG. All rights reserved.
+
 /*
 // Copyright (c) 2003, newtelligence AG. (http://www.newtelligence.com)
 // Original BlogX Source Code: Copyright (c) 2003, Chris Anderson (http://simplegeek.com)
@@ -35,6 +36,7 @@
 // or following this notice. 
 //
 */
+
 #endregion
 
 using System;
@@ -50,8 +52,11 @@
     [XmlRoot("opml", Namespace = "")]
     public class Opml
     {
+        [XmlAnyAttribute] public XmlAttribute[] anyAttributes;
+        [XmlAnyElement] public XmlElement[] anyElements;
+
+        public OpmlBody body;
         public OpmlHead head;
-        public OpmlBody body;
 
         public Opml()
         {
@@ -64,11 +69,6 @@
             head.title = title;
             body = new OpmlBody();
         }
-
-        [XmlAnyAttribute]
-        public XmlAttribute[] anyAttributes;
-        [XmlAnyElement]
-        public XmlElement[] anyElements;
     }
 
     [Serializable]
@@ -76,44 +76,97 @@
     [XmlRoot("head", Namespace = "")]
     public class OpmlHead
     {
-        private string _title;
         private string _dateCreated;
         private string _dateModified;
+        private string _expansionState;
+        private string _ownerEmail;
         private string _ownerName;
-        private string _ownerEmail;
-        private string _expansionState;
+        private string _title;
         private string _vertScrollState;
-        private int _windowTop;
+        private int _windowBottom;
         private int _windowLeft;
-        private int _windowBottom;
         private int _windowRight;
+        private int _windowTop;
 
+        [XmlAnyAttribute] public XmlAttribute[] anyAttributes;
+        [XmlAnyElement] public XmlElement[] anyElements;
+
         [XmlElement("title")]
-        public string title { get { return _title; } set { _title = value; } }
+        public string title
+        {
+            get { return _title; }
+            set { _title = value; }
+        }
+
         [XmlElement("dateCreated")]
-        public string dateCreated { get { return _dateCreated; } set { _dateCreated = value; } }
+        public string dateCreated
+        {
+            get { return _dateCreated; }
+            set { _dateCreated = value; }
+        }
+
         [XmlElement("dateModified")]
-        public string dateModified { get { return _dateModified; } set { _dateModified = value; } }
+        public string dateModified
+        {
+            get { return _dateModified; }
+            set { _dateModified = value; }
+        }
+
         [XmlElement("ownerName")]
-        public string ownerName { get { return _ownerName; } set { _ownerName = value; } }
+        public string ownerName
+        {
+            get { return _ownerName; }
+            set { _ownerName = value; }
+        }
+
         [XmlElement("ownerEMail")]
-        public string ownerEmail { get { return _ownerEmail; } set { _ownerEmail = value; } }
+        public string ownerEmail
+        {
+            get { return _ownerEmail; }
+            set { _ownerEmail = value; }
+        }
+
         [XmlElement("expansionState")]
-        public string expansionState { get { return _expansionState; } set { _expansionState = value; } }
+        public string expansionState
+        {
+            get { return _expansionState; }
+            set { _expansionState = value; }
+        }
+
         [XmlElement("vertScrollState")]
-        public string vertScrollState { get { return _vertScrollState; } set { _vertScrollState = value; } }
+        public string vertScrollState
+        {
+            get { return _vertScrollState; }
+            set { _vertScrollState = value; }
+        }
+
         [XmlElement("windowTop")]
-        public int windowTop { get { return _windowTop; } set { _windowTop = value; } }
+        public int windowTop
+        {
+            get { return _windowTop; }
+            set { _windowTop = value; }
+        }
+
         [XmlElement("windowLeft")]
-        public int windowLeft { get { return _windowLeft; } set { _windowLeft = value; } }
+        public int windowLeft
+        {
+            get { return _windowLeft; }
+            set { _windowLeft = value; }
+        }
+
         [XmlElement("windowBottom")]
-        public int windowBottom { get { return _windowBottom; } set { _windowBottom = value; } }
+        public int windowBottom
+        {
+            get { return _windowBottom; }
+            set { _windowBottom = value; }
+        }
+
         [XmlElement("windowRight")]
-        public int windowRight { get { return _windowRight; } set { _windowRight = value; } }
-        [XmlAnyAttribute]
-        public XmlAttribute[] anyAttributes;
-        [XmlAnyElement]
-        public XmlElement[] anyElements;
+        public int windowRight
+        {
+            get { return _windowRight; }
+            set { _windowRight = value; }
+        }
     }
 
     [Serializable]
@@ -121,26 +174,29 @@
     [XmlRoot("body", Namespace = "")]
     public class OpmlBody
     {
-        OpmlOutlineCollection _outlineCollection = new OpmlOutlineCollection();
+        private readonly OpmlOutlineCollection _outlineCollection = new OpmlOutlineCollection();
 
         // sort the array when we need to.
+
+        [XmlAnyAttribute] public XmlAttribute[] anyAttributes;
+        [XmlAnyElement] public XmlElement[] anyElements;
+
         [XmlElement("outline")]
-        public OpmlOutline[] outlineArray { 
-            get { 
-                return _outlineCollection.Count == 0 ? null : _outlineCollection.ToArraySortedByTitle(); 
-            } 
-            set { 
-                _outlineCollection.Clear(); 
-                _outlineCollection.AddRange(value); 
-            } 
+        public OpmlOutline[] outlineArray
+        {
+            get { return _outlineCollection.Count == 0 ? null : _outlineCollection.ToArraySortedByTitle(); }
+            set
+            {
+                _outlineCollection.Clear();
+                _outlineCollection.AddRange(value);
+            }
         }
+
         [XmlIgnore]
-        public OpmlOutlineCollection outline { get { return _outlineCollection; } }
-
-        [XmlAnyAttribute]
-        public XmlAttribute[] anyAttributes;
-        [XmlAnyElement]
-        public XmlElement[] anyElements;
+        public OpmlOutlineCollection outline
+        {
+            get { return _outlineCollection; }
+        }
     }
 
     [Serializable]
@@ -148,41 +204,92 @@
     [XmlRoot("outline", Namespace = "")]
     public class OpmlOutline
     {
-        string _type;
-        string _description;
-        string _title;
-        string _xmlUrl;
-        string _htmlUrl;
-        string _language;
-        string _isComment;
-        string _isBreakpoint;
-        OpmlOutlineCollection _outlineCollection = new OpmlOutlineCollection();
+        private readonly OpmlOutlineCollection _outlineCollection = new OpmlOutlineCollection();
+        private string _description;
+        private string _htmlUrl;
+        private string _isBreakpoint;
+        private string _isComment;
+        private string _language;
+        private string _title;
+        private string _type;
+        private string _xmlUrl;
 
+        [XmlAnyAttribute] public XmlAttribute[] anyAttributes;
+        [XmlAnyElement] public XmlElement[] anyElements;
+
         [XmlAttribute]
-        public string type { get { return _type; } set { _type = value; } }
+        public string type
+        {
+            get { return _type; }
+            set { _type = value; }
+        }
+
         [XmlAttribute]
-        public string description { get { return _description; } set { _description = value; } }
+        public string description
+        {
+            get { return _description; }
+            set { _description = value; }
+        }
+
         [XmlAttribute]
-        public string title { get { return _title; } set { _title = value; } }
+        public string title
+        {
+            get { return _title; }
+            set { _title = value; }
+        }
+
         [XmlAttribute]
-        public string xmlUrl { get { return _xmlUrl; } set { _xmlUrl = value; } }
+        public string xmlUrl
+        {
+            get { return _xmlUrl; }
+            set { _xmlUrl = value; }
+        }
+
         [XmlAttribute]
-        public string htmlUrl { get { return _htmlUrl; } set { _htmlUrl = value; } }
+        public string htmlUrl
+        {
+            get { return _htmlUrl; }
+            set { _htmlUrl = value; }
+        }
+
         [XmlAttribute]
-        public string language { get { return _language; } set { _language = value; } }
+        public string language
+        {
+            get { return _language; }
+            set { _language = value; }
+        }
+
         [XmlAttribute]
-        public string isComment { get { return _isComment; } set { _isComment = value; } }
+        public string isComment
+        {
+            get { return _isComment; }
+            set { _isComment = value; }
+        }
+
         [XmlAttribute]
-        public string isBreakpoint { get { return _isBreakpoint; } set { _isBreakpoint = value; } }
+        public string isBreakpoint
+        {
+            get { return _isBreakpoint; }
+            set { _isBreakpoint = value; }
+        }
+
         // sort the array when we need to
         [XmlElement("outline")]
-        public OpmlOutline[] outlineArray { get { return _outlineCollection.Count == 0 ? null : _outlineCollection.ToArraySortedByTitle(); } set { _outlineCollection.Clear(); _outlineCollection.AddRange(value); } }
+        public OpmlOutline[] outlineArray
+        {
+            get { return _outlineCollection.Count == 0 ? null : _outlineCollection.ToArraySortedByTitle(); }
+            set
+            {
+                _outlineCollection.Clear();
+                _outlineCollection.AddRange(value);
+            }
+        }
+
         [XmlIgnore]
-        public OpmlOutlineCollection outline { get { return _outlineCollection; } }
-        [XmlAnyAttribute]
-        public XmlAttribute[] anyAttributes;
-        [XmlAnyElement]
-        public XmlElement[] anyElements;
+        public OpmlOutlineCollection outline
+        {
+            get { return _outlineCollection; }
+        }
     }
 
     /// <summary>
@@ -195,9 +302,7 @@
         /// Initializes a new empty instance of the OpmlOutlineCollection class.
         /// </summary>
         public OpmlOutlineCollection()
-            : base()
         {
-            // empty
         }
 
         /// <summary>
@@ -207,15 +312,14 @@
         /// <param name="items">
         /// The array whose elements are to be added to the new OpmlOutlineCollection.
         /// </param>
-        protected OpmlOutlineCollection(IList<OpmlOutline> items)
-            : base()
+        protected OpmlOutlineCollection(IEnumerable<OpmlOutline> items)
         {
-            if (items == null) {
+            if (items == null)
+            {
                 throw new ArgumentNullException("items");
             }
 
-            this.AddRange(items);
-
+            AddRange(items);
         }
 
         /// <summary>
@@ -233,15 +337,15 @@
 
             foreach (OpmlOutline item in items)
             {
-                this.Items.Add(item);
+                Items.Add(item);
             }
         }
 
 
         public OpmlOutline[] ToArray()
         {
-            OpmlOutline[] result = new OpmlOutline[this.Count];
-            this.CopyTo(result, 0);
+            OpmlOutline[] result = new OpmlOutline[Count];
+            CopyTo(result, 0);
 
             return result;
         }
@@ -249,10 +353,8 @@
         public OpmlOutline[] ToArraySortedByTitle()
         {
             OpmlOutline[] result = ToArray();
-            Array.Sort(result, delegate(OpmlOutline x, OpmlOutline y)
-            {
-                return String.Compare(x.title, y.title, StringComparison.InvariantCultureIgnoreCase);
-            });
+            Array.Sort(result,
+                       delegate(OpmlOutline x, OpmlOutline y) { return String.Compare(x.title, y.title, StringComparison.InvariantCultureIgnoreCase); });
 
             return result;
         }
@@ -260,12 +362,15 @@
         public OpmlOutline[] ToArraySortedByDescription()
         {
             OpmlOutline[] result = ToArray();
-            Array.Sort(result, delegate(OpmlOutline x, OpmlOutline y)
-            {
-                return String.Compare(x.description, y.description, StringComparison.InvariantCultureIgnoreCase);
-            });
+            Array.Sort(result,
+                       delegate(OpmlOutline x, OpmlOutline y)
+                           {
+                               return
+                                   String.Compare(x.description, y.description,
+                                                  StringComparison.InvariantCultureIgnoreCase);
+                           });
 
             return result;
         }
     }
-}
+}
\ No newline at end of file

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/ProfileMapperModule.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/ProfileMapperModule.cs	2008-01-11 15:53:27 UTC (rev 793)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/ProfileMapperModule.cs	2008-01-11 18:05:01 UTC (rev 794)
@@ -3,65 +3,74 @@
 
 namespace newtelligence.DasBlog.Web.Core
 {
-	public class ProfileMapperModule : IHttpModule
-	{
-        static readonly string[] HttpHandlerStrings = new string[] {"CaptchaImage.aspx", "aggbug.ashx", "blogger.aspx", "pingback.aspx", "trackback.aspx", "get_aspx_ver.aspx"};
-        private EventHandler onBeginRequest;
+    public class ProfileMapperModule : IHttpModule
+    {
+        private static readonly string[] HttpHandlerStrings =
+            new string[]
+                {
+                    "CaptchaImage.aspx", "aggbug.ashx", "blogger.aspx", "pingback.aspx", "trackback.aspx",
+                    "get_aspx_ver.aspx"
+                };
 
-		public ProfileMapperModule()
-		{
-			onBeginRequest = new EventHandler( HandleBeginRequest );
-		}
+        private readonly EventHandler onBeginRequest;
 
-		public void Init( HttpApplication context )
-		{
-			context.BeginRequest += onBeginRequest;
-		}
+        public ProfileMapperModule()
+        {
+            onBeginRequest = HandleBeginRequest;
+        }
 
-		public void Dispose()
-		{
-		}
+        #region IHttpModule Members
 
-		private void HandleBeginRequest( object sender, EventArgs evargs )
-		{
-			HttpApplication app = sender as HttpApplication;
-			string requestUrl = "";
+        public void Init(HttpApplication context)
+        {
+            context.BeginRequest += onBeginRequest;
+        }
 
-            if ( app != null )
+        public void Dispose()
+        {
+        }
+
+        #endregion
+
+        private static void HandleBeginRequest(object sender, EventArgs evargs)
+        {
+            HttpApplication app = sender as HttpApplication;
+            string requestUrl;
+
+            if (app != null)
             {
                 requestUrl = app.Context.Request.Url.PathAndQuery;
-                if ( requestUrl.IndexOf(",") == -1 && requestUrl.IndexOf("?") == -1 && requestUrl.EndsWith(".aspx") )
+                if (requestUrl.IndexOf(",") == -1 && requestUrl.IndexOf("?") == -1 && requestUrl.EndsWith(".aspx"))
                 {
-                    if ( app.Context.Request.Url.Segments.Length >= 2 )
+                    if (app.Context.Request.Url.Segments.Length >= 2)
                     {
-                        string title     = app.Context.Request.Url.Segments[app.Context.Request.Url.Segments.Length - 1];
+                        string title = app.Context.Request.Url.Segments[app.Context.Request.Url.Segments.Length - 1];
                         string directory = app.Context.Request.Url.Segments[app.Context.Request.Url.Segments.Length - 2];
 
-                        if ( Array.IndexOf(HttpHandlerStrings, title) == -1 && directory.ToUpper() == "PROFILES/" )
+                        if (Array.IndexOf(HttpHandlerStrings, title) == -1 && directory.ToUpper() == "PROFILES/")
                         {
                             title = title.Replace(".aspx", "");
                             title = title.Replace(" ", "");
                             title = title.Replace("%2b", " ");
-                            title = title.Replace("%20", " "); 
+                            title = title.Replace("%20", " ");
                             title = title.Replace("+", " ");
                             title = title.Replace("-", " ");
 
-                            User user = SiteSecurity.GetUserByDisplayName( title );
+                            User user = SiteSecurity.GetUserByDisplayName(title);
 
-                            if ( user != null )
+                            if (user != null)
                             {
                                 requestUrl = "~/Profile.aspx?user=" + user.Name;
-                                app.Context.RewritePath( requestUrl );
+                                app.Context.RewritePath(requestUrl);
                             }
                             else
                             {
-                                app.Response.Redirect( "FormatPage.aspx?path=SiteConfig/pageerror.format.html", true );
-
+                                app.Response.Redirect("FormatPage.aspx?path=SiteConfig/pageerror.format.html", true);
                             }
                         }
                     }
                 }
             }
-		}
-	}
+        }
+    }
 }
\ No newline at end of file

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/ReferralBlackList.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/ReferralBlackList.cs	2008-01-11 15:53:27 UTC (rev 793)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/ReferralBlackList.cs	2008-01-11 18:05:01 UTC (rev 794)
@@ -6,174 +6,198 @@
 
 namespace newtelligence.DasBlog.Web.Core
 {
-	/// <summary>
-	/// Enumeration used for the return code of <see cref="IBlogDataService.SaveEntry"/>
-	/// </summary>
-	public enum BlacklistUpdateState
-	{
-		None, 
-		Updated, 
-		Failed 
-	}
+    /// <summary>
+    /// Enumeration used for the return code of <see cref="IBlogDataService.SaveEntry"/>
+    /// </summary>
+    public enum BlacklistUpdateState
+    {
+        None,
+        Updated,
+        Failed
+    }
 
-	public interface IBlackList
-	{
-		void Initialize(string blacklist);
-		BlacklistUpdateState UpdateBlacklist();
-		Match IsBlacklisted(string url);
-	}
+    public interface IBlackList
+    {
+        void Initialize(string blacklist);
+        BlacklistUpdateState UpdateBlacklist();
+        Match IsBlacklisted(string url);
+    }
 
-	public static class ReferralBlackListFactory
-	{
-        private static Dictionary<string, IBlackList> blacklists = new Dictionary<string, IBlackList>();
+    public static class ReferralBlackListFactory
+    {
+        private static readonly Dictionary<string, IBlackList> blacklists = new Dictionary<string, IBlackList>();
 
-		private static bool InitializeBlacklist(IBlackList referrerBlacklist, string path)
-		{
-			ILoggingDataService loggingService = LoggingDataServiceFactory.GetService(SiteConfig.GetLogPathFromCurrentContext());
+        public static IBlackList[] Lists
+        {
+            get
+            {
+                List<IBlackList> list = new List<IBlackList>();
+                foreach (IBlackList referralBlacklist in blacklists.Values)
+                {
+                    list.Add(referralBlacklist);
+                }
 
-			try
-			{
-				referrerBlacklist.Initialize(path);
-				BlacklistUpdateState updateState = referrerBlacklist.UpdateBlacklist();
-					
-				if (updateState == BlacklistUpdateState.Failed)
-				{
-					loggingService.AddEvent(
-						new EventDataItem(EventCodes.Error, referrerBlacklist.ToString() + " could not be updated: ", "InitializeBlacklist"));
-				}
-				else if (updateState == BlacklistUpdateState.Updated)
-				{
-					loggingService.AddEvent(
-						new EventDataItem(EventCodes.ApplicationStartup, referrerBlacklist.ToString() + " updated: ", "InitializeBlacklist"));
-				}
-				
-				return true;
-			}
-			catch (Exception ex)
-			{
-				loggingService.AddEvent(new EventDataItem(EventCodes.Error, referrerBlacklist.ToString() + " could not be initialized: " + ex.ToString(), "InitializeBlacklist"));
-			}
+                return list.ToArray();
+            }
+        }
 
-			return false;
-		}
+        private static bool InitializeBlacklist(IBlackList referrerBlacklist, string path)
+        {
+            ILoggingDataService loggingService =
+                LoggingDataServiceFactory.GetService(SiteConfig.GetLogPathFromCurrentContext());
 
-		public static void AddBlacklist(IBlackList blackList, string path)
-		{
-			if (blacklists.ContainsKey(blackList.GetType().Name) == false)
-			{
-				bool success = InitializeBlacklist(blackList, path);
-				if (success) blacklists.Add(blackList.GetType().Name, blackList);
-			}
-			else
-			{
+            try
+            {
+                referrerBlacklist.Initialize(path);
+                BlacklistUpdateState updateState = referrerBlacklist.UpdateBlacklist();
+
+                if (updateState == BlacklistUpdateState.Failed)
+                {
+                    loggingService.AddEvent(
+                        new EventDataItem(EventCodes.Error, referrerBlacklist + " could not be updated: ",
+                                          "InitializeBlacklist"));
+                }
+                else if (updateState == BlacklistUpdateState.Updated)
+                {
+                    loggingService.AddEvent(
+                        new EventDataItem(EventCodes.ApplicationStartup, referrerBlacklist + " updated: ",
+                                          "InitializeBlacklist"));
+                }
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                loggingService.AddEvent(
+                    new EventDataItem(EventCodes.Error,
+                                      referrerBlacklist + " could not be initialized: " + ex,
+                                      "InitializeBlacklist"));
+            }
+
+            return false;
+        }
+
+        public static void AddBlacklist(IBlackList blackList, string path)
+        {
+            if (blacklists.ContainsKey(blackList.GetType().Name) == false)
+            {
+                bool success = InitializeBlacklist(blackList, path);
+                if (success) blacklists.Add(blackList.GetType().Name, blackList);
+            }
+            else
+            {
                 IBlackList referrerBlacklist = blacklists[blackList.GetType().Name];
-				InitializeBlacklist(referrerBlacklist, path);
-			}
-		}
+                InitializeBlacklist(referrerBlacklist, path);
+            }
+        }
 
-		public static void RemoveBlacklist(Type type)
-		{
-			ILoggingDataService loggingService = LoggingDataServiceFactory.GetService(SiteConfig.GetLogPathFromCurrentContext());
-			if (blacklists.ContainsKey(type.Name)== true)
-			{
-				try
-				{
-					blacklists.Remove(type.Name);
-				}
-				catch (Exception ex)
-				{
-					loggingService.AddEvent(new EventDataItem(EventCodes.Error, type.Name.ToString() + " could not be removed: " + ex.ToString(), ""));
-				}
-			}
-		}
+        public static void RemoveBlacklist(Type type)
+        {
+            ILoggingDataService loggingService =
+                LoggingDataServiceFactory.GetService(SiteConfig.GetLogPathFromCurrentContext());
 
-		public static IBlackList[] Lists
-		{
-			get
-			{
+            if (blacklists.ContainsKey(type.Name))
+            {
+                try
+                {
+                    blacklists.Remove(type.Name);
+                }
+                catch (Exception ex)
+                {
+                    loggingService.AddEvent(
+                        new EventDataItem(EventCodes.Error,
+                                          type.Name + " could not be removed: " + ex, ""));
+                }
+            }
+        }
+    }
 
-                List<IBlackList> list = new List<IBlackList>();
-				foreach (IBlackList referralBlacklist in blacklists.Values)
-				{
-					list.Add(referralBlacklist);
-				}
+    public class ReferralBlackList
+    {
+        public static bool IsBlockedReferrer(string referrer)
+        {
+            return IsBlockedReferrer(referrer, null);
+        }
 
-				return list.ToArray();
-			}
-		}
-	}
+        public static bool IsBlockedReferrer(string referrer, string entryTitle)
+        {
+            HttpContext context = HttpContext.Current;
 
-	public class ReferralBlackList
-	{
-		public static bool IsBlockedReferrer(string referrer)
-		{
-			return IsBlockedReferrer(referrer, null);
-		}
+            if (referrer == null || referrer.Length == 0 || context == null)
+            {
+                return false;
+            }
 
-		public static bool IsBlockedReferrer(string referrer, string entryTitle)
-		{
-			HttpContext context = HttpContext.Current;
-			if (referrer == null || referrer.Length == 0 || context == null)
-			{
-				return false;
-			}
+            SiteConfig siteConfig = SiteConfig.GetSiteConfig();
 
-			SiteConfig siteConfig = SiteConfig.GetSiteConfig();
+            // return if this is a local page
+            // bail if we are getting a local referral from our website
+            if (context.Request.UrlReferrer != null &&
+                SiteUtilities.ReferralFromSelf(siteConfig, context.Request.UrlReferrer.ToString()))
+            {
+                return false;
+            }
 
-			// return if this is a local page
-			// bail if we are getting a local referral from our website
-			if (context.Request.UrlReferrer!= null && 
-				SiteUtilities.ReferralFromSelf(siteConfig, context.Request.UrlReferrer.ToString()) == true)
-			{
-				return false;
-			}
-
-            ILoggingDataService loggingService = LoggingDataServiceFactory.GetService(SiteConfig.GetLogPathFromCurrentContext());
+            ILoggingDataService loggingService =
+                LoggingDataServiceFactory.GetService(SiteConfig.GetLogPathFromCurrentContext());
             bool retVal = false;
-			Match match = null;
-			
-			foreach (IBlackList referralBlacklist in ReferralBlackListFactory.Lists)
-			{
-				try
-				{
-					match = referralBlacklist.IsBlacklisted(referrer);
-					if (match!= null)
-					{
-						retVal = match.Success;
-						if (retVal) break;
-					}
-				}
-				catch (Exception ex)
-				{
-                    loggingService.AddEvent(new EventDataItem(EventCodes.Error, ex.ToString(), referralBlacklist.ToString() + " Regular Expression"));
-					return false;
-				}
-			}
+            Match match = null;
 
-			// if either Blacklist has a return value of true, we block the referral and log the event
-			if(context != null && retVal == true)		
-			{
-				if (siteConfig.LogBlockedReferrals)
-				{
-					if (entryTitle != null && entryTitle != "")
-					{
-                        loggingService.AddEvent(new EventDataItem(EventCodes.ItemReferralBlocked, context.Request.UserHostAddress + " because of \"" + match.Value + "\"", context.Request.RawUrl, referrer, entryTitle));
-					}
-					else
-					{
-                        loggingService.AddEvent(new EventDataItem(EventCodes.ReferralBlocked, context.Request.UserHostAddress + " because of \"" + match.Value + "\"", context.Request.RawUrl, referrer));
-					}
-				}
+            foreach (IBlackList referralBlacklist in ReferralBlackListFactory.Lists)
+            {
+                try
+                {
+                    match = referralBlacklist.IsBlacklisted(referrer);
 
-				if(siteConfig.EnableReferralUrlBlackList404s == true)
-				{
-					context.Response.StatusCode = 404;
-					context.Response.SuppressContent = true;
-					context.Response.End();
-				}
-			}
+                    if (match != null)
+                    {
+                        retVal = match.Success;
 
-			return retVal;
-		}
-	}
-}
+                        if (retVal)
+                        {
+                            break;
+                        }
+                    }
+                }
+                catch (Exception ex)
+                {
+                    loggingService.AddEvent(
+                        new EventDataItem(EventCodes.Error, ex.ToString(),
+                                          referralBlacklist + " Regular Expression"));
+                    return false;
+                }
+            }
+
+            // if either Blacklist has a return value of true, we block the referral and log the event
+            if (retVal)
+            {
+                if (siteConfig.LogBlockedReferrals)
+                {
+                    if (entryTitle != null && entryTitle != "")
+                    {
+                        loggingService.AddEvent(
+                            new EventDataItem(EventCodes.ItemReferralBlocked,
+                                              context.Request.UserHostAddress + " because of \"" + match.Value + "\"",
+                                              context.Request.RawUrl, referrer, entryTitle));
+                    }
+                    else
+                    {
+                        loggingService.AddEvent(
+                            new EventDataItem(EventCodes.ReferralBlocked,
+                                              context.Request.UserHostAddress + " because of \"" + match.Value + "\"",
+                                              context.Request.RawUrl, referrer));
+                    }
+                }
+
+                if (siteConfig.EnableReferralUrlBlackList404s)
+                {
+                    context.Response.StatusCode = 404;
+                    context.Response.SuppressContent = true;
+                    context.Response.End();
+                }
+            }
+
+            return retVal;
+        }
+    }
+}
\ No newline at end of file

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/ReferralUrlBlacklist.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/ReferralUrlBlacklist.cs	2008-01-11 15:53:27 UTC (rev 793)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/ReferralUrlBlacklist.cs	2008-01-11 18:05:01 UTC (rev 794)
@@ -3,73 +3,80 @@
 
 namespace newtelligence.DasBlog.Web.Core
 {
-	/// <summary>
-	/// Summary description for ContentReferralBlacklist.
-	/// </summary>
-	public class ReferralUrlBlacklist : IBlackList
-	{
-		private static bool loaded = false;
-		private static Regex blackListRegex = null;
-		private static string blacklist = null;
-		private static object blackListLock = new object();
+    /// <summary>
+    /// Summary description for ContentReferralBlacklist.
+    /// </summary>
+    public class ReferralUrlBlacklist : IBlackList
+    {
+        private static readonly object blackListLock = new object();
+        private static string blacklist = null;
+        private static Regex blackListRegex = null;
+        private static bool loaded = false;
 
-		public void Initialize(string newBlackList)
-		{
-			lock(blackListLock)
-			{
-				if (blacklist == null || blacklist != newBlackList)
-				{
-					if (newBlackList != null && newBlackList.Length > 0)
-					{
-						blacklist = newBlackList;
-						blacklist = blacklist.Replace(";","|");
-						blacklist = blacklist.Replace("+","\\+");
-						blacklist = blacklist.Replace("*","\\*");
-						blackListRegex = new Regex(blacklist,RegexOptions.Compiled|RegexOptions.IgnoreCase|RegexOptions.IgnorePatternWhitespace);
-					}
-					else
-					{
-						throw new NullReferenceException("blacklist string is empty");
-					}
-				}
-			}
+        #region IBlackList Members
 
-			loaded = true;
-		}
+        public void Initialize(string newBlackList)
+        {
+            lock (blackListLock)
+            {
+                if (blacklist == null || blacklist != newBlackList)
+                {
+                    if (newBlackList != null && newBlackList.Length > 0)
+                    {
+                        blacklist = newBlackList;
+                        blacklist = blacklist.Replace(";", "|");
+                        blacklist = blacklist.Replace("+", "\\+");
+                        blacklist = blacklist.Replace("*", "\\*");
+                        blackListRegex =
+                            new Regex(blacklist,
+                                      RegexOptions.Compiled | RegexOptions.IgnoreCase |
+                                      RegexOptions.IgnorePatternWhitespace);
+                    }
+                    else
+                    {
+                        throw new NullReferenceException("blacklist string is empty");
+                    }
+                }
+            }
 
-		public Match IsBlacklisted(string url)
-		{
-			if (!loaded)
-			{
-				return null;
-			}
+            loaded = true;
+        }
 
-			try
-			{
-				Match match = null;
-				Uri urlReferrer = new Uri(url);
+        public Match IsBlacklisted(string url)
+        {
+            if (!loaded)
+            {
+                return null;
+            }
 
-				// we want to remove the Query from the url as it may contain keywords that easily match
-				// the black list. 
-				// However, we CHECK against the stripped referrer and log the COMPLETE referral!
-				string strippedReferrer = (urlReferrer != null) ? urlReferrer.Scheme + "://" + urlReferrer.Authority + urlReferrer.AbsolutePath : String.Empty;
+            try
+            {
+                Match match;
+                Uri urlReferrer = new Uri(url);
 
-				lock (blackListLock)
-				{
-					match = blackListRegex.Match(strippedReferrer);
-				}
+                // we want to remove the Query from the url as it may contain keywords that easily match
+                // the black list. However, we CHECK against the stripped referrer and log the COMPLETE referral!
+                string strippedReferrer = urlReferrer.Scheme + "://" + urlReferrer.Authority + urlReferrer.AbsolutePath;
 
-				return match;
-			}
-			catch (Exception ex)
-			{
-				throw new Exception(String.Format("An error occured trying to determine if {0} is blacklisted", url), ex.InnerException);
-			}
-		}
+                lock (blackListLock)
+                {
+                    match = blackListRegex.Match(strippedReferrer);
+                }
 
-		public BlacklistUpdateState UpdateBlacklist()
-		{
-			return BlacklistUpdateState.None;
-		}
-	}
-}
+                return match;
+            }
+            catch (Exception ex)
+            {
+                throw new Exception(String.Format("An error occured trying to determine if {0} is blacklisted", url),
+                                    ex.InnerException);
+            }
+        }
+
+        public BlacklistUpdateState UpdateBlacklist()
+        {
+            return BlacklistUpdateState.None;
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/RobotDefinition.cs
===================================================================

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Dasblogce-cvs] SF.net SVN: dasblogce: [795] branches/refactoring_architecture/source

From: <sfcaus@us...> - 2008-01-12 12:20

Revision: 795
          http://dasblogce.svn.sourceforge.net/dasblogce/?rev=795&view=rev
Author:   sfcaus
Date:     2008-01-12 04:20:36 -0800 (Sat, 12 Jan 2008)

Log Message:
-----------
- XHTML fixes (<br/> to <br />)

Modified Paths:
--------------
    branches/refactoring_architecture/source/DasBlog.sln
    branches/refactoring_architecture/source/WebControlCaptcha/CaptchaControl.vb
    branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/BlogDataService.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/EventMessageTemplates.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ClickThroughsBox.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/CommentViewBox.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditConfigBox.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditContentFiltersBox.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/MonthViewBox.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/MonthViewBox.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/SingleCommentView.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/SingleCommentView.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/SiteConfig/disclaimer.format.html
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/SiteConfig/opml.xslt
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/SiteConfig/setuperror.html
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/UserClickThroughsBox.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ftb/ftb.insertcode.aspx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/Mono/homeTemplate.blogtemplate
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/Portal/homeTemplate.blogtemplate
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/Tricoleur/homeTemplate.blogtemplate
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/Tricoleur/itemTemplate.blogtemplate
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/candidBlue/homeTemplate.blogtemplate
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/dasBlog/homeTemplate.blogtemplate
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/discreetBlogBlue/homeTemplate.blogtemplate
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/discreetBlogBlue/itemTemplate.blogtemplate
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/essence/homeTemplate.blogtemplate
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/justhtml/homeTemplate.blogtemplate
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/mobile/itemTemplate.blogtemplate
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/movableRadioBlue/dayTemplate.blogtemplate
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/movableRadioBlue/homeTemplate.blogtemplate
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/movableRadioBlue/itemTemplate.blogtemplate
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/movableRadioHeat/homeTemplate.blogtemplate
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/movableRadioHeat/itemTemplate.blogtemplate
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/orangeCream/homeTemplate.blogtemplate
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/orangeCream/itemTemplate.blogtemplate
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/project84/admin/homeTemplate.blogtemplate
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/project84/homeTemplate.blogtemplate
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/project84/itemTemplate.blogtemplate
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/project84Grass/admin/homeTemplate.blogtemplate
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/project84Grass/homeTemplate.blogtemplate
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/project84Grass/itemTemplate.blogtemplate
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/slate/homeTemplate.blogtemplate
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/soundWaves/dayTemplate.blogtemplate
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/soundWaves/homeTemplate.blogtemplate
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/soundWaves/itemTemplate.blogtemplate
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/useit/homeTemplate.blogtemplate
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/BookControl.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Macros.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/SharedBasePage.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/WebControls/ShadowBox.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/newtelligence.DasBlog.Web.Core.csproj
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/MailToWeblog.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/ReportMailer.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/SyndicationServiceBase.cs

Modified: branches/refactoring_architecture/source/DasBlog.sln
===================================================================
--- branches/refactoring_architecture/source/DasBlog.sln	2008-01-11 18:05:01 UTC (rev 794)
+++ branches/refactoring_architecture/source/DasBlog.sln	2008-01-12 12:20:36 UTC (rev 795)
@@ -4,7 +4,6 @@
 	ProjectSection(WebsiteProperties) = preProject
 		Debug.AspNetCompiler.Debug = "True"
 		Release.AspNetCompiler.Debug = "False"
-		VWDPort = "6662"
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "newtelligence.DasBlog.Runtime", "newtelligence.DasBlog.Runtime\newtelligence.DasBlog.Runtime.csproj", "{2B6D1F60-C5D8-4CB9-89D6-A4AF42275852}"
@@ -85,6 +84,12 @@
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DasBlog.Web.Rendering", "DasBlog.Web.Rendering\DasBlog.Web.Rendering.csproj", "{BDEC56AA-4F4B-4D4C-8BEA-18E44FD1C67F}"
+	ProjectSection(WebsiteProperties) = preProject
+		Debug.AspNetCompiler.Debug = "True"
+		Release.AspNetCompiler.Debug = "False"
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|.NET = Debug|.NET
@@ -95,6 +100,16 @@
 		Release|Mixed Platforms = Release|Mixed Platforms
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{F33CF374-8610-434F-B4FB-915AE7CD17DA}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{F33CF374-8610-434F-B4FB-915AE7CD17DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F33CF374-8610-434F-B4FB-915AE7CD17DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F33CF374-8610-434F-B4FB-915AE7CD17DA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F33CF374-8610-434F-B4FB-915AE7CD17DA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F33CF374-8610-434F-B4FB-915AE7CD17DA}.Release|.NET.ActiveCfg = Release|Any CPU
+		{F33CF374-8610-434F-B4FB-915AE7CD17DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F33CF374-8610-434F-B4FB-915AE7CD17DA}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F33CF374-8610-434F-B4FB-915AE7CD17DA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{F33CF374-8610-434F-B4FB-915AE7CD17DA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{2B6D1F60-C5D8-4CB9-89D6-A4AF42275852}.Debug|.NET.ActiveCfg = Debug|Any CPU
 		{2B6D1F60-C5D8-4CB9-89D6-A4AF42275852}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{2B6D1F60-C5D8-4CB9-89D6-A4AF42275852}.Debug|Any CPU.Build.0 = Debug|Any CPU
@@ -225,16 +240,16 @@
 		{FF7F1D68-352E-4FEA-A7B4-EB6C25140316}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FF7F1D68-352E-4FEA-A7B4-EB6C25140316}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{FF7F1D68-352E-4FEA-A7B4-EB6C25140316}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{F33CF374-8610-434F-B4FB-915AE7CD17DA}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{F33CF374-8610-434F-B4FB-915AE7CD17DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F33CF374-8610-434F-B4FB-915AE7CD17DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F33CF374-8610-434F-B4FB-915AE7CD17DA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{F33CF374-8610-434F-B4FB-915AE7CD17DA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{F33CF374-8610-434F-B4FB-915AE7CD17DA}.Release|.NET.ActiveCfg = Release|Any CPU
-		{F33CF374-8610-434F-B4FB-915AE7CD17DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F33CF374-8610-434F-B4FB-915AE7CD17DA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F33CF374-8610-434F-B4FB-915AE7CD17DA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{F33CF374-8610-434F-B4FB-915AE7CD17DA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{BDEC56AA-4F4B-4D4C-8BEA-18E44FD1C67F}.Debug|.NET.ActiveCfg = Debug|Any CPU
+		{BDEC56AA-4F4B-4D4C-8BEA-18E44FD1C67F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BDEC56AA-4F4B-4D4C-8BEA-18E44FD1C67F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BDEC56AA-4F4B-4D4C-8BEA-18E44FD1C67F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{BDEC56AA-4F4B-4D4C-8BEA-18E44FD1C67F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{BDEC56AA-4F4B-4D4C-8BEA-18E44FD1C67F}.Release|.NET.ActiveCfg = Release|Any CPU
+		{BDEC56AA-4F4B-4D4C-8BEA-18E44FD1C67F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BDEC56AA-4F4B-4D4C-8BEA-18E44FD1C67F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BDEC56AA-4F4B-4D4C-8BEA-18E44FD1C67F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{BDEC56AA-4F4B-4D4C-8BEA-18E44FD1C67F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Modified: branches/refactoring_architecture/source/WebControlCaptcha/CaptchaControl.vb
===================================================================
--- branches/refactoring_architecture/source/WebControlCaptcha/CaptchaControl.vb	2008-01-11 18:05:01 UTC (rev 794)
+++ branches/refactoring_architecture/source/WebControlCaptcha/CaptchaControl.vb	2008-01-12 12:20:36 UTC (rev 795)
@@ -387,7 +387,7 @@
             End If
             If _strText.Length > 0 Then
                 .Write(_strText)
-                .Write("<br/>")
+                .Write("<br />")
             End If
             .Write("<input name=" & UniqueID & " type=text size=")
             .Write(_captcha.TextLength.ToString)

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/BlogDataService.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/BlogDataService.cs	2008-01-11 18:05:01 UTC (rev 794)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/BlogDataService.cs	2008-01-12 12:20:36 UTC (rev 795)
@@ -426,7 +426,7 @@
                     {
                         loggingService.AddEvent(
                             new EventDataItem(EventCodes.Error,
-                            e.ToString().Replace("\n", "<br/>"),
+                            e.ToString().Replace("\n", "<br />"),
                             "PingWeblogsWorker, pinging " + pingService.Name));
                     }
                 }
@@ -482,7 +482,7 @@
                 {
                     loggingService.AddEvent(
                         new EventDataItem(EventCodes.PingbackServerError,
-                        e.ToString().Replace("\n", "<br/>"),
+                        e.ToString().Replace("\n", "<br />"),
                         sourceUri + "," + pingbackTarget));
                 }
             }
@@ -569,7 +569,7 @@
                             {
                                 loggingService.AddEvent(
                                     new EventDataItem(EventCodes.Error,
-                                    e.ToString().Replace("\n", "<br/>"),
+                                    e.ToString().Replace("\n", "<br />"),
                                     "PingbackWorker, auto-discovery of: " + url));
                             }
                         }
@@ -667,7 +667,7 @@
                     loggingService.AddEvent(
                         new EventDataItem(
                         EventCodes.TrackbackServerError,
-                        e.ToString().Replace("\n", "<br/>"),
+                        e.ToString().Replace("\n", "<br />"),
                         job.info.SourceUrl,
                         job.info.TargetUrl,
                         job.entry.Title));
@@ -758,7 +758,7 @@
                         {
                             loggingService.AddEvent(
                                 new EventDataItem(EventCodes.Error,
-                                e.ToString().Replace("\n", "<br/>"),
+                                e.ToString().Replace("\n", "<br />"),
                                 String.Format("Updating cross-post entry {0} on {1}", ci.TargetEntryId, ci.Site.ProfileName)));
                         }
                     }
@@ -820,7 +820,7 @@
                         {
                             loggingService.AddEvent(
                                 new EventDataItem(EventCodes.Error,
-                                e.ToString().Replace("\n", "<br/>"),
+                                e.ToString().Replace("\n", "<br />"),
                                 String.Format("Adding cross-post entry to {0}", ci.Site.ProfileName)));
                         }
                     }
@@ -833,7 +833,7 @@
                 {
                     loggingService.AddEvent(
                         new EventDataItem(EventCodes.Error,
-                        e.ToString().Replace("\n", "<br/>"),
+                        e.ToString().Replace("\n", "<br />"),
                         String.Format("HandleCrosspost to {0}", ci.Site.ProfileName)));
                 }
             }
@@ -867,7 +867,7 @@
                 {
                     loggingService.AddEvent(
                         new EventDataItem(EventCodes.Error,
-                        e.ToString().Replace("\n", "<br/>"),
+                        e.ToString().Replace("\n", "<br />"),
                         "CrosspostWorker"));
                 }
             }
@@ -1195,7 +1195,7 @@
                                     {
                                         loggingService.AddEvent(
                                             new EventDataItem(EventCodes.Error,
-                                            e.ToString().Replace("\n", "<br/>"),
+                                            e.ToString().Replace("\n", "<br />"),
                                             String.Format("Deleting cross-post entry {0} from {1}", cp.TargetEntryId, cp.ProfileName)));
                                     }
                                 }
@@ -1503,7 +1503,7 @@
                         {
                             loggingService.AddEvent(
                                 new EventDataItem(EventCodes.Error,
-                                ex.ToString().Replace("\n", "<br/>"),
+                                ex.ToString().Replace("\n", "<br />"),
                                 "Dequeue from TrackingHandler"));
                         }
                     }
@@ -1513,7 +1513,7 @@
                         {
                             loggingService.AddEvent(
                                 new EventDataItem(EventCodes.Error,
-                                ex.ToString().Replace("\n", "<br/>"),
+                                ex.ToString().Replace("\n", "<br />"),
                                 "Unhandled Exception from TrackingHandler"));
                         }
                     }
@@ -1542,7 +1542,7 @@
                         inner = inner.InnerException;
                     }
 
-                    loggingService.AddEvent(new EventDataItem(EventCodes.SmtpError, exMessage.Replace("\n", "<br/>"), "InternalSendMail"));
+                    loggingService.AddEvent(new EventDataItem(EventCodes.SmtpError, exMessage.Replace("\n", "<br />"), "InternalSendMail"));
                 }
             }
         }
@@ -1580,7 +1580,7 @@
                         {
                             loggingService.AddEvent(
                                 new EventDataItem(EventCodes.Error,
-                                e.ToString().Replace("\n", "<br/>"),
+                                e.ToString().Replace("\n", "<br />"),
                                 "InternalSendMail from SendMailHandler"));
                         }
                     }

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/EventMessageTemplates.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/EventMessageTemplates.cs	2008-01-11 18:05:01 UTC (rev 794)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Runtime/EventMessageTemplates.cs	2008-01-12 12:20:36 UTC (rev 795)
@@ -48,51 +48,51 @@
 
         static EventMessageTemplates()
 		{
-			string errorTemplate = "<span>{0}:<br/>{1}<br/> while processing {2}.</span>";
+			string errorTemplate = "<span>{0}:<br />{1}<br /> while processing {2}.</span>";
             messages = new Dictionary<EventCodes, string>();
 			messages.Add(EventCodes.Error,errorTemplate);
 			messages.Add(EventCodes.StorageError,errorTemplate);
 			messages.Add(EventCodes.SmtpError,errorTemplate);
-			messages.Add(EventCodes.EntryAdded,"<span>Info {0}:<br/>Entry '{1}' added. <a href=\"{2}\">Permalink</a></span>");
-			messages.Add(EventCodes.EntryChanged,"<span>Info {0}:<br/>Entry '{1}' changed. <a href=\"{2}\">Permalink</a></span>");
-			messages.Add(EventCodes.EntryDeleted,"<span>Info {0}:<br/>Entry '{1}' deleted. <a href=\"{2}\">Invalid permalink</a></span>");
-			messages.Add(EventCodes.CommentAdded,"<span>Info {0}:<br/>Comment '{1}' added. <a href=\"{2}\">Comment view</a></span>");
-			messages.Add(EventCodes.CommentChanged,"<span>Info {0}:<br/>Comment '{1}' changed. <a href=\"{2}\">Comment view</a></span>");
-			messages.Add(EventCodes.CommentDeleted,"<span>Info {0}:<br/>Comment '{1}' deleted.");
-			messages.Add( EventCodes.CommentApproved, "<span>Info {0}:<br/>Comment '{1}' approved.");
-			messages.Add(EventCodes.CommentBlocked, "<span>Info {0}:<br/>{1} on {2}.");
-			messages.Add(EventCodes.TrackbackSent,"<span>Info {0}:<br/>Trackback sent for <a href=\"{2}\">{1}</a> to <a href=\"{3}\">target</a></span>");
-			messages.Add(EventCodes.TrackbackReceived,"<span>Info {0}:<br/>Trackback received for <a href=\"{2}\">{1}</a> from target <a href=\"{3}\">{4}</a></span>");
-			messages.Add(EventCodes.TrackbackBlocked,"<span>Info {0}:<br/>Trackback blocked for <a href=\"{2}\">{5}</a> from <a href=\"{3}\">{4}</a> originating at IP Address {1}</span>");
+			messages.Add(EventCodes.EntryAdded,"<span>Info {0}:<br />Entry '{1}' added. <a href=\"{2}\">Permalink</a></span>");
+			messages.Add(EventCodes.EntryChanged,"<span>Info {0}:<br />Entry '{1}' changed. <a href=\"{2}\">Permalink</a></span>");
+			messages.Add(EventCodes.EntryDeleted,"<span>Info {0}:<br />Entry '{1}' deleted. <a href=\"{2}\">Invalid permalink</a></span>");
+			messages.Add(EventCodes.CommentAdded,"<span>Info {0}:<br />Comment '{1}' added. <a href=\"{2}\">Comment view</a></span>");
+			messages.Add(EventCodes.CommentChanged,"<span>Info {0}:<br />Comment '{1}' changed. <a href=\"{2}\">Comment view</a></span>");
+			messages.Add(EventCodes.CommentDeleted,"<span>Info {0}:<br />Comment '{1}' deleted.");
+			messages.Add( EventCodes.CommentApproved, "<span>Info {0}:<br />Comment '{1}' approved.");
+			messages.Add(EventCodes.CommentBlocked, "<span>Info {0}:<br />{1} on {2}.");
+			messages.Add(EventCodes.TrackbackSent,"<span>Info {0}:<br />Trackback sent for <a href=\"{2}\">{1}</a> to <a href=\"{3}\">target</a></span>");
+			messages.Add(EventCodes.TrackbackReceived,"<span>Info {0}:<br />Trackback received for <a href=\"{2}\">{1}</a> from target <a href=\"{3}\">{4}</a></span>");
+			messages.Add(EventCodes.TrackbackBlocked,"<span>Info {0}:<br />Trackback blocked for <a href=\"{2}\">{5}</a> from <a href=\"{3}\">{4}</a> originating at IP Address {1}</span>");
 			messages.Add(EventCodes.TrackbackServerError,errorTemplate);
-			messages.Add(EventCodes.PingbackSent,"<span>Info {0}:<br/>Pingback sent for <a href=\"{2}\">{1}</a> to <a href=\"{3}\">target</a></span>");
-			messages.Add(EventCodes.PingbackReceived,"<span>Info {0}:<br/>Pingback received for <a href=\"{2}\">{1}</a> from target <a href=\"{3}\">{4}</a></span>");
-			messages.Add(EventCodes.PingbackBlocked,"<span>Info {0}:<br/>{1} For entry {2}</span>");
+			messages.Add(EventCodes.PingbackSent,"<span>Info {0}:<br />Pingback sent for <a href=\"{2}\">{1}</a> to <a href=\"{3}\">target</a></span>");
+			messages.Add(EventCodes.PingbackReceived,"<span>Info {0}:<br />Pingback received for <a href=\"{2}\">{1}</a> from target <a href=\"{3}\">{4}</a></span>");
+			messages.Add(EventCodes.PingbackBlocked,"<span>Info {0}:<br />{1} For entry {2}</span>");
 			messages.Add(EventCodes.PingbackServerError,errorTemplate);
-			messages.Add(EventCodes.ReferralReceived,"<span>Info {0}:<br/>Referral received from target <a href=\"{3}\">{4}</a> originating at IP Address {1} </span>");
-			messages.Add(EventCodes.ItemReferralReceived,"<span>Info {0}:<br/>Item referral received for <a href=\"{2}\">{5}</a> from target <a href=\"{3}\">{4}</a> originating at IP Address {1} </span>");
-			messages.Add(EventCodes.ItemReferralDeleted,"<span>Info {0}:<br/>Referral '{1}' deleted.");
-			messages.Add(EventCodes.Pop3EntryReceived,"<span>Info {0}:<br/>Pop3 message received from <a href=\"mailto:{3}\">{3}</a> with subject '{1}'</span>");
-			messages.Add(EventCodes.Pop3EntryIgnored,"<span>Info {0}:<br/>Pop3 message ignored from <a href=\"mailto:{3}\">{3}</a> with subject '{1}'</span>");
-			messages.Add(EventCodes.Pop3EntryDiscarded,"<span>Info {0}:<br/>Pop3 message discarded from <a href=\"mailto:{3}\">{3}</a> with subject '{1}'</span>");
+			messages.Add(EventCodes.ReferralReceived,"<span>Info {0}:<br />Referral received from target <a href=\"{3}\">{4}</a> originating at IP Address {1} </span>");
+			messages.Add(EventCodes.ItemReferralReceived,"<span>Info {0}:<br />Item referral received for <a href=\"{2}\">{5}</a> from target <a href=\"{3}\">{4}</a> originating at IP Address {1} </span>");
+			messages.Add(EventCodes.ItemReferralDeleted,"<span>Info {0}:<br />Referral '{1}' deleted.");
+			messages.Add(EventCodes.Pop3EntryReceived,"<span>Info {0}:<br />Pop3 message received from <a href=\"mailto:{3}\">{3}</a> with subject '{1}'</span>");
+			messages.Add(EventCodes.Pop3EntryIgnored,"<span>Info {0}:<br />Pop3 message ignored from <a href=\"mailto:{3}\">{3}</a> with subject '{1}'</span>");
+			messages.Add(EventCodes.Pop3EntryDiscarded,"<span>Info {0}:<br />Pop3 message discarded from <a href=\"mailto:{3}\">{3}</a> with subject '{1}'</span>");
 			messages.Add(EventCodes.Pop3ServiceStart,"<span>Mail-To-Weblog service started</span>");
 			messages.Add(EventCodes.Pop3ServiceShutdown,"<span>Mail-To-Weblog service shut down</span>");
 			messages.Add(EventCodes.Pop3ServerError,errorTemplate);
-			messages.Add(EventCodes.XSSUpstreamSuccess,"<span>Info {0}:<br/>Upstreamed '{2}' to {3}</span>");
+			messages.Add(EventCodes.XSSUpstreamSuccess,"<span>Info {0}:<br />Upstreamed '{2}' to {3}</span>");
 			messages.Add(EventCodes.XSSUpstreamError,errorTemplate);
 			messages.Add(EventCodes.XSSServiceStart,"<span>XmlStorageSystem Upstream service started</span>");
 			messages.Add(EventCodes.XSSServiceShutdown,"<span>XmlStorageSystem Upstream service shut down</span>");
 			messages.Add(EventCodes.ApplicationStartup,"<span>Application started</span>");
 			messages.Add(EventCodes.PingWeblogsError,"<span>Pinging {5} failed: {1} at {3}.");
 			messages.Add(EventCodes.Search,"<span>Search for: {1} from: {2}");
-			messages.Add(EventCodes.CrosspostAdded,"<span>Info {0}:<br/>Crosspost Added on {1}");
-			messages.Add(EventCodes.CrosspostChanged,"<span>Info {0}:<br/>Crosspost Changed on {1}");
-			messages.Add(EventCodes.CrosspostDeleted,"<span>Info {0}:<br/>Crosspost Deleted for Entry {1} on {2}");
-			messages.Add(EventCodes.ReferralBlocked,"<span>Info {0}:<br/>Referral blocked from target <a href=\"{3}\">{4}</a> originating at IP Address {1}</span>");
-			messages.Add(EventCodes.ItemReferralBlocked,"<span>Info {0}:<br/>Item Referral blocked for <a href=\"{2}\">{5}</a> from <a href=\"{3}\">{4}</a> originating at IP Address {1}</span>");
+			messages.Add(EventCodes.CrosspostAdded,"<span>Info {0}:<br />Crosspost Added on {1}");
+			messages.Add(EventCodes.CrosspostChanged,"<span>Info {0}:<br />Crosspost Changed on {1}");
+			messages.Add(EventCodes.CrosspostDeleted,"<span>Info {0}:<br />Crosspost Deleted for Entry {1} on {2}");
+			messages.Add(EventCodes.ReferralBlocked,"<span>Info {0}:<br />Referral blocked from target <a href=\"{3}\">{4}</a> originating at IP Address {1}</span>");
+			messages.Add(EventCodes.ItemReferralBlocked,"<span>Info {0}:<br />Item Referral blocked for <a href=\"{2}\">{5}</a> from <a href=\"{3}\">{4}</a> originating at IP Address {1}</span>");
 			messages.Add(EventCodes.SecuritySuccess,"<span>Audit: {0} Login with username {1} from {2}</span>");
 			messages.Add(EventCodes.SecurityFailure,"<span>Audit: {0} Login with username {1} from {2}</span>");
-			messages.Add(EventCodes.CommentEmail,"<span>Comment Email From : {2}<br/> {1}</span>");
+			messages.Add(EventCodes.CommentEmail,"<span>Comment Email From : {2}<br /> {1}</span>");
 			messages.Add(EventCodes.ReportMailerServiceError,errorTemplate);
 			messages.Add(EventCodes.ReportMailerServiceStart,"<span>Report-Mailer Service Started</span>");
 			messages.Add(EventCodes.ReportMailerServiceShutdown,"<span>Report-Mailer Service Shutdown</span>");

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ClickThroughsBox.ascx.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ClickThroughsBox.ascx.cs	2008-01-11 18:05:01 UTC (rev 794)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ClickThroughsBox.ascx.cs	2008-01-12 12:20:36 UTC (rev 795)
@@ -123,7 +123,7 @@
 			hlLocal.Text = text;
 
 			row.Cells[0].Controls.Add(link);
-			row.Cells[0].Controls.Add(new LiteralControl("<br/>from:"));
+			row.Cells[0].Controls.Add(new LiteralControl("<br />from:"));
 			row.Cells[0].Controls.Add(hlLocal);
 			row.Cells[1].Text = item.count.ToString();
 		}

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/CommentViewBox.ascx
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/CommentViewBox.ascx	2008-01-11 18:05:01 UTC (rev 794)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/CommentViewBox.ascx	2008-01-12 12:20:36 UTC (rev 795)
@@ -28,7 +28,7 @@
 					<asp:TextBox MaxLength="40" id="email" runat="server" Columns="60" CssClass="commentViewControlStyle"
 						Width="99%"></asp:TextBox>
 					<span id="commentsGravatarEnabled" class="gravatarLabel" runat="server">
-						<br/>
+						<br />
 						<asp:Label ID="labelGravatarEnabled" Runat="server" CssClass="commentViewLabelStyle" Text='<%# resmgr.GetString("text_comment_gravatarable") %>' >
 						</asp:Label>
 					</span>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditConfigBox.ascx
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditConfigBox.ascx	2008-01-11 18:05:01 UTC (rev 794)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditConfigBox.ascx	2008-01-12 12:20:36 UTC (rev 795)
@@ -614,7 +614,7 @@
 			<tr>
 				<td class="configLabelColumnStyle" nowrap colspan="2">
 					<asp:CheckBox ID="checkEnableRSSItemFooter" runat="server" Text='<%# resmgr.GetString("text_config_enable_rss_footer") %>' CssClass="configControlStyle">
-					</asp:CheckBox><br/>
+					</asp:CheckBox><br />
 					<asp:TextBox ID="textRSSItemFooter" runat="server" CssClass="configControlStyle" Columns="60"
 						TextMode="MultiLine" Rows="5" ReadOnly="false"></asp:TextBox></td>
 			</tr>
@@ -831,7 +831,7 @@
 					<asp:RadioButtonList ID="optionSpamHandling" Runat="server"></asp:RadioButtonList></td>
 				<td>
 					<asp:Label ID="Label7" runat="server" Text='<%# resmgr.GetString("text_config_spamblockingapikey") %>' CssClass="configLabelStyle">
-					</asp:Label><br/>
+					</asp:Label><br />
 					<asp:TextBox ID="textSpamBlockingApiKey" runat="server" CssClass="configControlStyle" MaxLength="2048"
 						Columns="40"></asp:TextBox></td>
 			</tr>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditContentFiltersBox.ascx.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditContentFiltersBox.ascx.cs	2008-01-11 18:05:01 UTC (rev 794)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditContentFiltersBox.ascx.cs	2008-01-12 12:20:36 UTC (rev 795)
@@ -239,7 +239,7 @@
                     }
                     catch( Exception e )
                     {
-                        content += String.Format("<br/><br/>Error in filter {0}<br/>{1}", HttpUtility.HtmlEncode(filter.Expression),HttpUtility.HtmlEncode(e.Message));
+                        content += String.Format("<br /><br />Error in filter {0}<br />{1}", HttpUtility.HtmlEncode(filter.Expression),HttpUtility.HtmlEncode(e.Message));
                         break;
                     }
                 }

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/MonthViewBox.ascx
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/MonthViewBox.ascx	2008-01-11 18:05:01 UTC (rev 794)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/MonthViewBox.ascx	2008-01-12 12:20:36 UTC (rev 795)
@@ -1,6 +1,6 @@
 <%@ Control language="c#" Codebehind="MonthViewBox.ascx.cs" AutoEventWireup="True" Inherits="newtelligence.DasBlog.Web.MonthViewBox" targetSchema="http://schemas.microsoft.com/intellisense/ie5" %>
 <%@ OutputCache Duration="900" VaryByParam="*" %>
 <div class="bodyContentStyle">
-	<% Response.Write("Rendered: " + System.DateTime.Now); %><br/>
+	<% Response.Write("Rendered: " + System.DateTime.Now); %><br />
 	<asp:placeholder id="contentPlaceHolder" runat="server"></asp:placeholder>
 </div>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/MonthViewBox.ascx.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/MonthViewBox.ascx.cs	2008-01-11 18:05:01 UTC (rev 794)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/MonthViewBox.ascx.cs	2008-01-12 12:20:36 UTC (rev 795)
@@ -136,7 +136,7 @@
            	}
 	
 			Literal l2 = new Literal();
-			l2.Text = "<br/><br/>";
+			l2.Text = "<br /><br />";
 			contentPlaceHolder.Controls.Add(l2);
 			#endregion
 

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/SingleCommentView.ascx
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/SingleCommentView.ascx	2008-01-11 18:05:01 UTC (rev 794)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/SingleCommentView.ascx	2008-01-12 12:20:36 UTC (rev 795)
@@ -1,2 +1 @@
-<%@ Import namespace="newtelligence.DasBlog.Web"%>
-<%@ Control Language="c#" AutoEventWireup="True" Codebehind="SingleCommentView.ascx.cs" Inherits="SingleCommentView" TargetSchema="http://schemas.microsoft.com/intellisense/ie5"%>
+<%@ Control Language="c#" AutoEventWireup="True" Codebehind="SingleCommentView.ascx.cs" Inherits="SingleCommentView" TargetSchema="http://schemas.microsoft.com/intellisense/ie5" %>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/SingleCommentView.ascx.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/SingleCommentView.ascx.cs	2008-01-11 18:05:01 UTC (rev 794)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/SingleCommentView.ascx.cs	2008-01-12 12:20:36 UTC (rev 795)
@@ -1,16 +1,5 @@
-using System;
-using System.Net;
-using System.Resources;
-using System.Security.Cryptography;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Web.UI;
-using System.Web.UI.HtmlControls;
-using System.Web.UI.WebControls;
-using newtelligence.DasBlog.Runtime;
-using newtelligence.DasBlog.Web.Core;
+#region Copyright (c) 2003, newtelligence AG. All rights reserved.
 
-#region Copyright (c) 2003, newtelligence AG. All rights reserved.
 /*
 // Copyright (c) 2003, newtelligence AG. (http://www.newtelligence.com)
 // Original BlogX Source Code: Copyright (c) 2003, Chris Anderson (http://simplegeek.com)
@@ -47,65 +36,49 @@
 // or following this notice. 
 //
 */
+
 #endregion
 
+using System;
+using System.Net;
+using System.Security.Cryptography;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Web.UI;
+using System.Web.UI.HtmlControls;
+using System.Web.UI.WebControls;
+using newtelligence.DasBlog.Runtime;
+using newtelligence.DasBlog.Web.Core;
+using System.Resources;
 
 namespace newtelligence.DasBlog.Web
 {
-    /// <summary>
-    ///		Summary description for EntryView.
-    /// </summary>
-    public partial  class SingleCommentView : UserControl
+    public partial class SingleCommentView : UserControl
     {
-        
-        Comment comment;
-        bool obfuscateEmail = true;
+        private Comment comment;
+        private bool obfuscateEmail = true;
 
-        public bool ObfuscateEmail { get { return obfuscateEmail; } set { obfuscateEmail = value; } }
-
-        public Comment Comment 
+        public bool ObfuscateEmail
         {
-            get
-            {
-                return comment;
-            }
-            set
-            {
-                comment = value;
-            }
+            get { return obfuscateEmail; }
+            set { obfuscateEmail = value; }
         }
 
-        
-        protected void Page_Load(object sender, EventArgs e)
+        public Comment Comment
         {
-            
-            // Put user code to initialize the page here
+            get { return comment; }
+            set { comment = value; }
         }
 
-		#region Web Form Designer generated code
-        override protected void OnInit(EventArgs e)
+        protected void Page_Load(object sender, EventArgs e)
         {
-            //
-            // CODEGEN: This call is required by the ASP.NET Web Form Designer.
-            //
-            InitializeComponent();
-            base.OnInit(e);
         }
-		
-        ///		Required method for Designer support - do not modify
-        ///		the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
 
-        }
-		#endregion
-
-        private string FixUrl( string url )
+        private static string FixUrl(string url)
         {
-            if ( url != null && url.Length > 0 )
+            if (url != null && url.Length > 0)
             {
-                if ( url.ToLower().StartsWith("http://"))
+                if (url.ToLower().StartsWith("http://"))
                 {
                     return url;
                 }
@@ -123,150 +96,162 @@
         protected void Page_PreRender(object sender, EventArgs e)
         {
             SharedBasePage requestPage = Page as SharedBasePage;
-
             Control root = this;
             HtmlGenericControl entry = new HtmlGenericControl("div");
-			if(SiteSecurity.GetUserByEmail(comment.AuthorEmail) == null)
-			{
-				entry.Attributes["class"] = "commentBoxStyle";
-			}
-			else
-			{
-				entry.Attributes["class"] = "commentBoxStyle commentBoxAuthorStyle";
-			}
+
+            if (SiteSecurity.GetUserByEmail(comment.AuthorEmail) == null)
+            {
+                entry.Attributes["class"] = "commentBoxStyle";
+            }
+            else
+            {
+                entry.Attributes["class"] = "commentBoxStyle commentBoxAuthorStyle";
+            }
+
             root.Controls.Add(entry);
-
             HtmlGenericControl entryTitle = new HtmlGenericControl("div");
             entryTitle.Attributes["class"] = "commentDateStyle";
-            
-			//Add the unique anchor for each comment
-			HtmlAnchor anchor = new HtmlAnchor();
-			anchor.Name = comment.EntryId;
-			entryTitle.Controls.Add(anchor);
 
-			if ( requestPage.SiteConfig.AdjustDisplayTimeZone )
+            //Add the unique anchor for each comment
+            HtmlAnchor anchor = new HtmlAnchor();
+            anchor.Name = comment.EntryId;
+            entryTitle.Controls.Add(anchor);
+
+            if (requestPage.SiteConfig.AdjustDisplayTimeZone)
             {
-                entryTitle.Controls.Add(new LiteralControl( requestPage.SiteConfig.GetConfiguredTimeZone().FormatAdjustedUniversalTime(comment.CreatedUtc) ));
+                entryTitle.Controls.Add(
+                    new LiteralControl(
+                        requestPage.SiteConfig.GetConfiguredTimeZone().FormatAdjustedUniversalTime(comment.CreatedUtc)));
             }
             else
             {
-                entryTitle.Controls.Add(new LiteralControl(comment.CreatedUtc.ToString("U")+" UTC"));
+                entryTitle.Controls.Add(new LiteralControl(comment.CreatedUtc.ToString("U") + " UTC"));
             }
+
             entry.Controls.Add(entryTitle);
+            HtmlGenericControl entryBody = new HtmlGenericControl("div");
 
+            if (SiteSecurity.GetUserByEmail(comment.AuthorEmail) == null)
+            {
+                entryBody.Attributes["class"] = "commentBodyStyle";
+            }
+            else
+            {
+                entryBody.Attributes["class"] = "commentBodyStyle commentBodyAuthorStyle";
+            }
 
-            HtmlGenericControl entryBody = new HtmlGenericControl("div");
-			if(SiteSecurity.GetUserByEmail(comment.AuthorEmail) == null)
-			{
-				entryBody.Attributes["class"] = "commentBodyStyle";
-			}
-			else
-			{
-				entryBody.Attributes["class"] = "commentBodyStyle commentBodyAuthorStyle";
-			}
+            if (comment.Content != null)
+            {
+                entryBody.Controls.Add(new LiteralControl(Regex.Replace(comment.Content, "\n", "<br />")));
+            }
 
-			if (comment.Content != null)
-			{
-				entryBody.Controls.Add(new LiteralControl(Regex.Replace(comment.Content, "\n", "<br />")));
-			}
-			if ( !requestPage.HideAdminTools && SiteSecurity.IsInRole("admin") )
-			{
-				HtmlGenericControl spamStatus = new HtmlGenericControl("div");
-				spamStatus.Attributes["class"] = "commentSpamStateStyle";
-				spamStatus.InnerText = ApplicationResourceTable.GetSpamStateDescription(comment.SpamState);
-				entryBody.Controls.Add( spamStatus );
-			}
+            if (!requestPage.HideAdminTools && SiteSecurity.IsInRole("admin"))
+            {
+                HtmlGenericControl spamStatus = new HtmlGenericControl("div");
+                spamStatus.Attributes["class"] = "commentSpamStateStyle";
+                spamStatus.InnerText = ApplicationResourceTable.GetSpamStateDescription(comment.SpamState);
+                entryBody.Controls.Add(spamStatus);
+            }
 
-
             entry.Controls.Add(entryBody);
-
             HtmlGenericControl footer = new HtmlGenericControl("div");
             footer.Attributes["class"] = "commentBoxFooterStyle";
             entry.Controls.Add(footer);
 
+            if (requestPage.SiteConfig.CommentsAllowGravatar)
+            {
+                string hash = "";
+                byte[] data;
 
-			if ( requestPage.SiteConfig.CommentsAllowGravatar )
-			{
-				string hash = ""; 
-				byte[] data, enc; 
+                data = Encoding.Default.GetBytes(comment.AuthorEmail);
+                MD5 md5 = new MD5CryptoServiceProvider();
+                md5.TransformFinalBlock(data, 0, data.Length);
 
-				data = Encoding.Default.GetBytes(comment.AuthorEmail); 
-				MD5 md5 = new MD5CryptoServiceProvider(); 
-				enc = md5.TransformFinalBlock(data, 0, data.Length); 
-				foreach(byte b in md5.Hash) 
-					hash += Convert.ToString(b, 16).ToLower().PadLeft(2, '0');
-				md5.Clear(); 
+                foreach (byte b in md5.Hash)
+                {
+                    hash += Convert.ToString(b, 16).ToLower().PadLeft(2, '0');
+                }
 
-				string nogravpath = "";
-				if(requestPage.SiteConfig.CommentsGravatarNoImgPath != null) 
-				{
-					if (requestPage.SiteConfig.CommentsGravatarNoImgPath != "")
-					{
-						if(requestPage.SiteConfig.CommentsGravatarNoImgPath.Substring(0,4) == "http") 
-						{
-							nogravpath =  "&default=" + Server.UrlEncode(requestPage.SiteConfig.CommentsGravatarNoImgPath);
-						}
-						else 
-						{
-							nogravpath =  "&default=" + Server.UrlEncode(requestPage.SiteConfig.Root + requestPage.SiteConfig.CommentsGravatarNoImgPath);
-						}
-					}
-				} 
+                md5.Clear();
+                string nogravpath = "";
 
-				string gravborder = "";
-				if(requestPage.SiteConfig.CommentsGravatarBorder != null)
-				{
-					if (requestPage.SiteConfig.CommentsGravatarBorder != "")
-					{
-						gravborder =  "&border=" + requestPage.SiteConfig.CommentsGravatarBorder;
-					}
-				} 
+                if (requestPage.SiteConfig.CommentsGravatarNoImgPath != null)
+                {
+                    if (requestPage.SiteConfig.CommentsGravatarNoImgPath != "")
+                    {
+                        if (requestPage.SiteConfig.CommentsGravatarNoImgPath.Substring(0, 4) == "http")
+                        {
+                            nogravpath = "&amp;default=" +
+                                         Server.UrlEncode(requestPage.SiteConfig.CommentsGravatarNoImgPath);
+                        }
+                        else
+                        {
+                            nogravpath = "&amp;default=" +
+                                         Server.UrlEncode(requestPage.SiteConfig.Root +
+                                                          requestPage.SiteConfig.CommentsGravatarNoImgPath);
+                        }
+                    }
+                }
 
-				string gravsize = "";
-				if(requestPage.SiteConfig.CommentsGravatarSize != null)
-				{
-					if (requestPage.SiteConfig.CommentsGravatarSize != "")
-					{
-						gravsize =  "&size=" + requestPage.SiteConfig.CommentsGravatarSize;
-					}
-				}
+                string gravborder = "";
 
-				string gravrating = "";
-				if(requestPage.SiteConfig.CommentsGravatarRating != null)
-				{
-					if (requestPage.SiteConfig.CommentsGravatarRating != "")
-					{
-						gravrating =  "&rating=" + requestPage.SiteConfig.CommentsGravatarRating;
-					}
-				}
+                if (requestPage.SiteConfig.CommentsGravatarBorder != null)
+                {
+                    if (requestPage.SiteConfig.CommentsGravatarBorder != "")
+                    {
+                        gravborder = "&amp;border=" + requestPage.SiteConfig.CommentsGravatarBorder;
+                    }
+                }
 
-				
+                string gravsize = "";
 
-				HtmlGenericControl entryGRAVATAR = new HtmlGenericControl("span");
-				entryGRAVATAR.Attributes["class"] = "commentGravatarBlock";
-				entryGRAVATAR.InnerHtml = "<img class=\"commentGravatar\" src=\"http://www.gravatar.com/avatar.php?gravatar_id=" + hash + gravrating + gravsize + nogravpath  + gravborder + "\"/>";
-				footer.Controls.Add(entryGRAVATAR);
-			}
+                if (requestPage.SiteConfig.CommentsGravatarSize != null)
+                {
+                    if (requestPage.SiteConfig.CommentsGravatarSize != "")
+                    {
+                        gravsize = "&amp;size=" + requestPage.SiteConfig.CommentsGravatarSize;
+                    }
+                }
 
+                string gravrating = "";
+
+                if (requestPage.SiteConfig.CommentsGravatarRating != null)
+                {
+                    if (requestPage.SiteConfig.CommentsGravatarRating != "")
+                    {
+                        gravrating = "&amp;rating=" + requestPage.SiteConfig.CommentsGravatarRating;
+                    }
+                }
+
+                HtmlGenericControl entryGRAVATAR = new HtmlGenericControl("span");
+                entryGRAVATAR.Attributes["class"] = "commentGravatarBlock";
+                entryGRAVATAR.InnerHtml =
+                    "<img class=\"commentGravatar\" src=\"http://www.gravatar.com/avatar.php?gravatar_id=" + hash +
+                    gravrating + gravsize + nogravpath + gravborder + "\"/>";
+                footer.Controls.Add(entryGRAVATAR);
+            }
+
             string authorLink = null;
+
             if (comment.AuthorHomepage != null && comment.AuthorHomepage.Length > 0)
             {
                 authorLink = FixUrl(comment.AuthorHomepage);
             }
-             else if (comment.AuthorEmail != null && comment.AuthorEmail.Length > 0)
+            else if (comment.AuthorEmail != null && comment.AuthorEmail.Length > 0)
             {
-				if ( !requestPage.SiteConfig.SupressEmailAddressDisplay ) 
-				{
-					authorLink = "mailto:" + SiteUtilities.SpamBlocker(comment.AuthorEmail);
-				}
-            } 
+                if (!requestPage.SiteConfig.SupressEmailAddressDisplay)
+                {
+                    authorLink = "mailto:" + SiteUtilities.SpamBlocker(comment.AuthorEmail);
+                }
+            }
+
             if (authorLink != null)
             {
                 HyperLink link = new HyperLink();
                 link.Attributes["class"] = "commentPermalinkStyle";
                 link.NavigateUrl = authorLink;
                 link.Text = comment.Author;
-				link.Attributes.Add("rel", "nofollow");
+                link.Attributes.Add("rel", "nofollow");
                 footer.Controls.Add(link);
             }
             else
@@ -277,129 +262,169 @@
                 footer.Controls.Add(l);
             }
 
-			if ( !requestPage.SiteConfig.SupressEmailAddressDisplay ) {
-				if (comment.AuthorEmail != null && comment.AuthorEmail.Length > 0)
-				{
-					footer.Controls.Add(new LiteralControl(" | "));
+            if (!requestPage.SiteConfig.SupressEmailAddressDisplay)
+            {
+                if (comment.AuthorEmail != null && comment.AuthorEmail.Length > 0)
+                {
+                    footer.Controls.Add(new LiteralControl(" | "));
 
-					HtmlGenericControl mailto = new HtmlGenericControl("span");
-					footer.Controls.Add(mailto);
+                    HtmlGenericControl mailto = new HtmlGenericControl("span");
+                    footer.Controls.Add(mailto);
 
-					HyperLink link = new HyperLink();
-					link.CssClass = "commentMailToStyle";
-					link.NavigateUrl = "mailto:" + SiteUtilities.SpamBlocker(comment.AuthorEmail);
-					link.Text = SiteUtilities.SpamBlocker(comment.AuthorEmail);
-					mailto.Controls.Add(link);
-				}
-			}
+                    HyperLink link = new HyperLink();
+                    link.CssClass = "commentMailToStyle";
+                    link.NavigateUrl = "mailto:" + SiteUtilities.SpamBlocker(comment.AuthorEmail);
+                    link.Text = SiteUtilities.SpamBlocker(comment.AuthorEmail);
+                    mailto.Controls.Add(link);
+                }
+            }
 
-            if ( !requestPage.HideAdminTools && SiteSecurity.IsInRole("admin") )
+            if (!requestPage.HideAdminTools && SiteSecurity.IsInRole("admin"))
             {
-				if (comment.AuthorIPAddress != null && comment.AuthorIPAddress.Length > 0)
-				{
-					try
-					{
-						IPHostEntry hostInfo = Dns.GetHostEntry(comment.AuthorIPAddress);
-						footer.Controls.Add(new LiteralControl(" (" + comment.AuthorIPAddress + " " + hostInfo.HostName + ") "));
-					}
-					catch
-					{
-						footer.Controls.Add(new LiteralControl(" (" + comment.AuthorIPAddress + ") "));
-					}
-				}
+                if (comment.AuthorIPAddress != null && comment.AuthorIPAddress.Length > 0)
+                {
+                    try
+                    {
+                        IPHostEntry hostInfo = Dns.GetHostEntry(comment.AuthorIPAddress);
+                        footer.Controls.Add(
+                            new LiteralControl(" (" + comment.AuthorIPAddress + " " + hostInfo.HostName + ") "));
+                    }
+                    catch
+                    {
+                        footer.Controls.Add(new LiteralControl(" (" + comment.AuthorIPAddress + ") "));
+                    }
+                }
 
                 footer.Controls.Add(new LiteralControl(" "));
 
-				// create delete hyperlink
+                // create delete hyperlink
                 HyperLink deleteHl = new HyperLink();
                 deleteHl.CssClass = "deleteLinkStyle";
                 Image img = new Image();
                 img.CssClass = "deleteLinkImageStyle";
-                img.ImageUrl = new Uri(new Uri(SiteUtilities.GetBaseUrl(requestPage.SiteConfig)),requestPage.GetThemedImageUrl("deletebutton")).ToString();
-                img.BorderWidth=0;
+                img.ImageUrl =
+                    new Uri(new Uri(SiteUtilities.GetBaseUrl(requestPage.SiteConfig)),
+                            requestPage.GetThemedImageUrl("deletebutton")).ToString();
+                img.BorderWidth = 0;
                 deleteHl.Controls.Add(img);
-				deleteHl.NavigateUrl = String.Format("javascript:deleteComment(\"{0}\", \"{1}\", \"{2}\")", Comment.TargetEntryId, Comment.EntryId, Comment.Author.Replace("\"", "\\\""));
+                deleteHl.NavigateUrl =
+                    String.Format("javascript:deleteComment(\"{0}\", \"{1}\", \"{2}\")", Comment.TargetEntryId,
+                                  Comment.EntryId, Comment.Author.Replace("\"", "\\\""));
+                
+                ResourceManager resmgr = ApplicationResourceTable.Get();
 
-				ResourceManager resmgr = resmgr = ApplicationResourceTable.Get();
+                if (!Page.ClientScript.IsClientScriptBlockRegistered(GetType(), "deleteCommentScript"))
+                {
+                    // add the javascript to allow deletion of the comment
+                    string scriptString = "<script type=\"text/javascript\">\n";
+                    scriptString += "function deleteComment(entryId, commentId, commentFrom)\n";
+                    scriptString += "{\n";
+                    scriptString +=
+                        String.Format("	if(confirm(\"{0} \\n\\n\" + commentFrom))\n",
+                                      resmgr.GetString("text_delete_confirm"));
+                    scriptString += "	{\n";
+                    scriptString +=
+                        "		location.href=\"deleteItem.ashx?entryid=\" +  entryId + \"&commentId=\" + commentId\n";
+                    scriptString += "	}\n";
+                    scriptString += "}\n";
+                    scriptString += "</script>";
 
-				if(!Page.ClientScript.IsClientScriptBlockRegistered(this.GetType(),"deleteCommentScript"))
-				{
-				    // add the javascript to allow deletion of the comment
-				    string scriptString = "<script type=\"text/javascript\">\n";
-				    scriptString += "function deleteComment(entryId, commentId, commentFrom)\n";
-				    scriptString += "{\n";
-				    scriptString += String.Format("	if(confirm(\"{0} \\n\\n\" + commentFrom))\n", resmgr.GetString("text_delete_confirm"));
-				    scriptString += "	{\n";
-				    scriptString += "		location.href=\"deleteItem.ashx?entryid=\" +  entryId + \"&commentId=\" + commentId\n";
-				    scriptString += "	}\n";
-				    scriptString += "}\n";
-				    scriptString += "</script>";
+                    Page.ClientScript.RegisterClientScriptBlock(GetType(), "deleteCommentScript", scriptString);
+                }
 
-					Page.ClientScript.RegisterClientScriptBlock(this.GetType(),"deleteCommentScript", scriptString);
-				}
+                footer.Controls.Add(deleteHl);
 
-				
-				footer.Controls.Add(deleteHl);
+                // create approve hyperlink, when a comment is not public or if its marked as spam
+                if ((!Comment.IsPublic) || (Comment.SpamState == SpamState.Spam))
+                {
+                    HyperLink approveHl = new HyperLink();
+                    approveHl.CssClass = "approveLinkStyle";
+                    Image okImg = new Image();
+                    okImg.CssClass = "approveImageStyle";
+                    okImg.ImageUrl =
+                        new Uri(new Uri(SiteUtilities.GetBaseUrl(requestPage.SiteConfig)),
+                                requestPage.GetThemedImageUrl("okbutton-list")).ToString();
+                    okImg.BorderWidth = 0;
+                    approveHl.Controls.Add(okImg);
+                    approveHl.NavigateUrl =
+                        String.Format("javascript:approveComment(\"{0}\", \"{1}\")", Comment.TargetEntryId,
+                                      Comment.EntryId);
 
-				// create approve hyperlink, when a comment is not public or if its marked as spam
-				if( (!Comment.IsPublic) || (Comment.SpamState == SpamState.Spam) ) 
-				{
-				  
-					HyperLink approveHl = new HyperLink();
-					approveHl.CssClass = "approveLinkStyle";
-					Image okImg = new Image();
-					okImg.CssClass = "approveImageStyle";
-					okImg.ImageUrl = new Uri(new Uri(SiteUtilities.GetBaseUrl(requestPage.SiteConfig)),requestPage.GetThemedImageUrl("okbutton-list")).ToString();
-					okImg.BorderWidth = 0;
-					approveHl.Controls.Add( okImg );
-					approveHl.NavigateUrl = String.Format( "javascript:approveComment(\"{0}\", \"{1}\")", Comment.TargetEntryId, Comment.EntryId);
+                    if (!Page.ClientScript.IsClientScriptBlockRegistered(GetType(), "approveCommentScript"))
+                    {
+                        string approveScript = "<script type=\"text/javascript\">\n";
+                        approveScript += "function approveComment(entryId, commentId)\n";
+                        approveScript += "{\n";
+                        approveScript +=
+                            "	location.href=\"approveItem.ashx?entryid=\" +  entryId + \"&commentId=\" + commentId\n";
+                        approveScript += "}\n";
+                        approveScript += "</script>";
 
-                    if (!Page.ClientScript.IsClientScriptBlockRegistered(this.GetType(), "approveCommentScript")) 
-					{
-						
-					    string approveScript = "<script type=\"text/javascript\">\n";
-					    approveScript += "function approveComment(entryId, commentId)\n";
-					    approveScript += "{\n";
-					    approveScript += "	location.href=\"approveItem.ashx?entryid=\" +  entryId + \"&commentId=\" + commentId\n";
-					    approveScript += "}\n";
-					    approveScript += "</script>";
+                        Page.ClientScript.RegisterClientScriptBlock(GetType(), "approveCommentScript", approveScript);
+                    }
 
-                        Page.ClientScript.RegisterClientScriptBlock(this.GetType(), "approveCommentScript", approveScript );
-					}
+                    footer.Controls.Add(approveHl);
+                }
 
-					footer.Controls.Add( approveHl );
-				}
-				ISpamBlockingService spamBlockingService = requestPage.SiteConfig.SpamBlockingService;
-				if ( (spamBlockingService != null) && (comment.SpamState != SpamState.Spam) )
-				{
-					HyperLink reportSpamLink = new HyperLink();
-					reportSpamLink.CssClass = "approveLinkStyle";
-					Image spamImg = new Image();
-					spamImg.CssClass = "approveImageStyle";
-					spamImg.ImageUrl = new Uri(new Uri(SiteUtilities.GetBaseUrl(requestPage.SiteConfig)),requestPage.GetThemedImageUrl("reportspambutton")).ToString();
-					spamImg.BorderWidth = 0;
-					reportSpamLink.Controls.Add( spamImg );
-					reportSpamLink.NavigateUrl = String.Format("javascript:reportComment(\"{0}\", \"{1}\", \"{2}\")", Comment.TargetEntryId, Comment.EntryId, Comment.Author.Replace("\"", "\\\""));
+                ISpamBlockingService spamBlockingService = requestPage.SiteConfig.SpamBlockingService;
 
-					string reportScript = "<script type=\"text/javascript\">\n";
-					reportScript += "function reportComment(entryId, commentId, commentFrom)\n";
-					reportScript += "{\n";
-					reportScript += String.Format("	if(confirm(\"{0} \\n\\n\" + commentFrom))\n", resmgr.GetString("text_reportspam_confirm"));
-					reportScript += "	{\n";
-					reportScript += "		location.href=\"deleteItem.ashx?report=true&entryid=\" +  entryId + \"&commentId=\" + commentId\n";
-					reportScript += "	}\n";
-					reportScript += "}\n";
-					reportScript += "</script>";
+                if ((spamBlockingService != null) && (comment.SpamState != SpamState.Spam))
+                {
+                    HyperLink reportSpamLink = new HyperLink();
+                    reportSpamLink.CssClass = "approveLinkStyle";
+                    Image spamImg = new Image();
+                    spamImg.CssClass = "approveImageStyle";
+                    spamImg.ImageUrl =
+                        new Uri(new Uri(SiteUtilities.GetBaseUrl(requestPage.SiteConfig)),
+                                requestPage.GetThemedImageUrl("reportspambutton")).ToString();
+                    spamImg.BorderWidth = 0;
+                    reportSpamLink.Controls.Add(spamImg);
+                    reportSpamLink.NavigateUrl =
+                        String.Format("javascript:reportComment(\"{0}\", \"{1}\", \"{2}\")", Comment.TargetEntryId,
+                                      Comment.EntryId, Comment.Author.Replace("\"", "\\\""));
 
-					if( !Page.ClientScript.IsClientScriptBlockRegistered(this.GetType(), "reportCommentScript" ) ) 
-					{
-						Page.ClientScript.RegisterClientScriptBlock(this.GetType(), "reportCommentScript", reportScript );
-					}
+                    string reportScript = "<script type=\"text/javascript\">\n";
+                    reportScript += "function reportComment(entryId, commentId, commentFrom)\n";
+                    reportScript += "{\n";
+                    reportScript +=
+                        String.Format("	if(confirm(\"{0} \\n\\n\" + commentFrom))\n",
+                                      resmgr.GetString("text_reportspam_confirm"));
+                    reportScript += "	{\n";
+                    reportScript +=
+                        "		location.href=\"deleteItem.ashx?report=true&entryid=\" +  entryId + \"&commentId=\" + commentId\n";
+                    reportScript += "	}\n";
+                    reportScript += "}\n";
+                    reportScript += "</script>";
 
-					footer.Controls.Add( reportSpamLink );
-				}
+                    if (!Page.ClientScript.IsClientScriptBlockRegistered(GetType(), "reportCommentScript"))
+                    {
+                        Page.ClientScript.RegisterClientScriptBlock(GetType(), "reportCommentScript", reportScript);
+                    }
 
+                    footer.Controls.Add(reportSpamLink);
+                }
             }
         }
+
+        #region Web Form Designer generated code
+
+        protected override void OnInit(EventArgs e)
+        {
+            //
+            // CODEGEN: This call is required by the ASP.NET Web Form Designer.
+            //
+            InitializeComponent();
+            base.OnInit(e);
+        }
+
+        /// <summary>
+        ///	Required method for Designer support - do not modify
+        ///	the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+        }
+
+        #endregion
     }
-}
+}
\ No newline at end of file

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/SiteConfig/disclaimer.format.html
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/SiteConfig/disclaimer.format.html	2008-01-11 18:05:01 UTC (rev 794)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/SiteConfig/disclaimer.format.html	2008-01-12 12:20:36 UTC (rev 795)
@@ -1,3 +1,3 @@
-<p><strong>Disclaimer</strong><br/>
+<p><strong>Disclaimer</strong><br />
 The opinions expressed herein are my own personal opinions and do not represent
 my employer's view in any way.</p>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/SiteConfig/opml.xslt
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/SiteConfig/opml.xslt	2008-01-11 18:05:01 UTC (rev 794)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/SiteConfig/opml.xslt	2008-01-12 12:20:36 UTC (rev 795)
@@ -5,7 +5,7 @@
         <xsl:for-each select="opml/body/outline">
             <a href="{@xmlUrl}"><img src="images/rssButton.gif" height="9" width="19" border="0" alt="RSS Feed"/></a>
             <xsl:text disable-output-escaping="yes">   </xsl:text>
-            <a href="{@htmlUrl}"><xsl:value-of select="@title"/></a><BR/>
+            <a href="{@htmlUrl}"><xsl:value-of select="@title"/></a><br />
         </xsl:for-each>
     </xsl:template>  
 </xsl:stylesheet>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/SiteConfig/setuperror.html
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/SiteConfig/setuperror.html	2008-01-11 18:05:01 UTC (rev 794)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/SiteConfig/setuperror.html	2008-01-12 12:20:36 UTC (rev 795)
@@ -61,7 +61,7 @@
         <ul>
             <li><font face="Courier New">&lt;path to dasblog&gt;/SiteConfig/</font></li>
             <li><font face="Courier New">&lt;path to dasblog&gt;/content/</font></li>
-            <li><font face="Courier New">&lt;path to dasblog&gt;/logs/</font><br/>
+            <li><font face="Courier New">&lt;path to dasblog&gt;/logs/</font><br />
                 &nbsp;</li>
         </ul>
     </blockquote>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/UserClickThroughsBox.ascx.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/UserClickThroughsBox.ascx.cs	2008-01-11 18:05:01 UTC (rev 794)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/UserClickThroughsBox.ascx.cs	2008-01-12 12:20:36 UTC (rev 795)
@@ -136,7 +136,7 @@
 			hlLocal.Text = text;
 
 			row.Cells[0].Controls.Add(link);
-			row.Cells[0].Controls.Add(new LiteralControl("<br/>from: "));
+			row.Cells[0].Controls.Add(new LiteralControl("<br />from: "));
 			row.Cells[0].Controls.Add(hlLocal);
 			row.Cells[1].Text = item.count.ToString();
 		}

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ftb/ftb.insertcode.aspx
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ftb/ftb.insertcode.aspx	2008-01-11 18:05:01 UTC (rev 794)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ftb/ftb.insertcode.aspx	2008-01-12 12:20:36 UTC (rev 795)
@@ -29,9 +29,9 @@
 				<asp:listitem value="T-SQL">T-SQL</asp:listitem>
 				<asp:listitem value="JScript">JScript</asp:listitem>
 			</asp:dropdownlist>
-			<br/>
+			<br />
 			<asp:textbox id="sourceTextBox" textmode="multiline" columns="60" rows="10" runat="server" Width="100%" />
-			<br/>
+			<br />
 			<asp:button id="parseButton" onclick="parseButton_Click" text="Parse Code" runat="server" />
 			<INPUT id="Button1" type="button" onclick="returnCode()" value="Insert Code" name="Button1"
 				runat="server">&nbsp;

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/Mono/homeTemplate.blogtemplate
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/Mono/homeTemplate.blogtemplate	2008-01-11 18:05:01 UTC (rev 794)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/Mono/homeTemplate.blogtemplate	2008-01-12 12:20:36 UTC (rev 795)
@@ -86,7 +86,7 @@
 </div>
 </div>
 <div id="footer" class="footer"><p>&copy; Copyright <%year%>, <%authorName%></p>
-            <br/><%newtelligence.aspnetcontrol("themecombo.ascx")%>		
+            <br /><%newtelligence.aspnetcontrol("themecombo.ascx")%>		
 </div>
 <!-- END #content-->
 </body>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/Portal/homeTemplate.blogtemplate
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/Portal/homeTemplate.blogtemplate	2008-01-11 18:05:01 UTC (rev 794)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/Portal/homeTemplate.blogtemplate	2008-01-12 12:20:36 UTC (rev 795)
@@ -270,7 +270,7 @@
 												<tr>
 													<td><img height="1" alt="" src="<%radio.macros.imageurl ("blank.gif")%>" width="9"/></td>
 													<td>
-														<%radio.macros.mailTo()%> Email Me<br/>
+														<%radio.macros.mailTo()%> Email Me<br />
 														<%newtelligence.disclaimer()%>
 														<%newtelligence.loginbox()%>
 													</td>
@@ -302,10 +302,10 @@
 						</tr>
 						<tr> <!-- footer row -->
 							<td valign=bottom class="mainbodyfooter">
-								Copyright&nbsp;&copy;&nbsp;<%year%>&nbsp;<%authorName%>.  All rights reserved.<br/>
+								Copyright&nbsp;&copy;&nbsp;<%year%>&nbsp;<%authorName%>.  All rights reserved.<br />
 								DasBlog '<a href="http://johnnynine.com/blog/PermaLink,guid,990e80f0-7d04-44dd-81eb-6da988e4d691.aspx">Portal</a>' theme by <a href="http://johnnynine.com/blog/">Johnny Hughes</a>.
 									
-                                <br/><%newtelligence.aspnetcontrol("themecombo.ascx")%>
+                                <br /><%newtelligence.aspnetcontrol("themecombo.ascx")%>
 							</td>
 						</tr>
 					</table>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/Tricoleur/homeTemplate.blogtemplate
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/Tricoleur/homeTemplate.blogtemplate	2008-01-11 18:05:01 UTC (rev 794)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/Tricoleur/homeTemplate.blogtemplate	2008-01-12 12:20:36 UTC (rev 795)
@@ -25,7 +25,7 @@
 			<div class="column">
 				<%bodytext%>
 				<p class="footer">
-					<%localString("Page rendered at|DE:Seite aufbereitet um|AR: &#1578;&#1605; &#1593;&#1585;&#1590; &#1607;&#1584;&#1607; &#1575;&#1604;&#1589;&#1601;&#1581;&#1577; &#1601;&#1610;")%>&nbsp;<%now%><br clear="right"><br/>
+					<%localString("Page rendered at|DE:Seite aufbereitet um|AR: &#1578;&#1605; &#1593;&#1585;&#1590; &#1607;&#1584;&#1607; &#1575;&#1604;&#1589;&#1601;&#1581;&#1577; &#1601;&#1610;")%>&nbsp;<%now%><br clear="right"><br />
 				</p>
 			</div>
 		</div>
@@ -33,8 +33,8 @@
 			<div class="column">
 				<div class="sidebar">
 					<div class="sidehead">Navigation</div>
-					<div class="sidecontent"><%navigatorLinks%><br/>
-					<%feedLink%> | <%radio.macros.mailTo()%><br/><br/>
+					<div class="sidecontent"><%navigatorLinks%><br />
+					<%feedLink%> | <%radio.macros.mailTo()%><br /><br />
 				</div>
 				</div>
 				<div class="sidebar">
@@ -44,9 +44,9 @@
 				<div class="sidebar">
 					<div class="sidehead">Archive</div>
 					<div class="sidecontent">
-					<%radio.weblog.drawcalendar ()%> <br/>
-					<%newtelligence.search()%>       <br/>
-					<%newtelligence.drawArchiveMonths()%> <br/>
+					<%radio.weblog.drawcalendar ()%> <br />
+					<%newtelligence.search()%>       <br />
+					<%newtelligence.drawArchiveMonths()%> <br />
 					<a href="monthview.aspx">Month View</a>
 					</div>
 				</div>
@@ -81,12 +81,12 @@
 				<div class="sidebar">
 					<div class="sidecontent">
 						<%newtelligence.disclaimer()%>
-						&copy; Copyright&nbsp;<%year%>&nbsp;<%authorName%><br/><br/>
+						&copy; Copyright&nbsp;<%year%>&nbsp;<%authorName%><br /><br />
 						<%localString("Theme design by|DE:Design von|AR:&#1578;&#1589;&#1605;&#1610;&#1605; &#1571;&#1587;&#1604;&#1608;&#1576; &#1575;&#1604;&#1593;&#1585;&#1590; &#1576;&#1585;&#1575;&#1610;&#1575;&#1606; &#1576;&#1604; ")%> <a href="http://www.jamessnape.me.uk">James Snape</a>
-						with <%radioBadge%><br/>
-						<%newtelligence.aspnetcontrol("themecombo.ascx")%><br/>
-						<%newtelligence.loginbox()%><br/>
-					    <%radio.macros.xmlCoffeeMug ()%><br/>
+						with <%radioBadge%><br />
+						<%newtelligence.aspnetcontrol("themecombo.ascx")%><br />
+						<%newtelligence.loginbox()%><br />
+					    <%radio.macros.xmlCoffeeMug ()%><br />
 					</div>
 				</div>
 			</div>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/Tricoleur/itemTemplate.blogtemplate
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/Tricoleur/itemTemplate.blogtemplate	2008-01-11 18:05:01 UTC (rev 794)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/Tricoleur/itemTemplate.blogtemplate	2008-01-12 12:20:36 UTC (rev 795)
@@ -8,7 +8,7 @@
             <%permalink%>&nbsp;
             <%editButton%>&nbsp;
             <%commentLink%>
-            <%trackbackLink%><br/>
+            <%trackbackLink%><br />
 			<%RelatedPostList%>
             <%trackbackList%>
 			<%ReferralList%>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/candidBlue/homeTemplate.blogtemplate
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/candidBlue/homeTemplate.blogtemplate	2008-01-11 18:05:01 UTC (rev 794)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/candidBlue/homeTemplate.blogtemplate	2008-01-12 12:20:36 UTC (rev 795)
@@ -586,7 +586,7 @@
 		<div id="content">
 			<div class="blogbody">
 				<div id="banner">
-					<a href="<%radio.macros.weblogUrl ()%>" style="color:#07398D; line-height: 1em; font-size:22px; text-decoration:none;font-style: normal;font-weight:Bold;"><%siteName%></a><br/>
+					<a href="<%radio.macros.weblogUrl ()%>" style="color:#07398D; line-height: 1em; font-size:22px; text-decoration:none;font-style: normal;font-weight:Bold;"><%siteName%></a><br />
 					<span class="description">
 						<%description%>
 						</span>
@@ -601,10 +601,10 @@
 								</td>
 							</tr>
 						</table>
-					&copy; Copyright&nbsp;<%year%>&nbsp;<%authorName%><br/>
-					<%localString("Theme design by|DE:Design von|AR:&#1578;&#1589;&#1605;&#1610;&#1605; &#1571;&#1587;&#1604;&#1608;&#1576; &#1575;&#1604;&#1593;&#1585;&#1590; &#1576;&#1585;&#1575;&#1610;&#1575;&#1606; &#1576;&#1604; ")%> <a href="http://www.bryanbell.com">Bryan Bell</a><br/>
-					<br/>   
-					<%radioBadge%><br/><%feedLink%>&nbsp;&nbsp;<%radio.macros.mailTo ()%>&nbsp;|&nbsp;<%localString("Page rendered at|DE:Seite aufbereitet um|AR: &#1578;&#1605; &#1593;&#1585;&#1590; &#1607;&#1584;&#1607; &#1575;&#1604;&#1589;&#1601;&#1581;&#1577; &#1601;&#1610;")%>&nbsp;<%now%><br clear="right"><br/>
+					&copy; Copyright&nbsp;<%year%>&nbsp;<%authorName%><br />
+					<%localString("Theme design by|DE:Design von|AR:&#1578;&#1589;&#1605;&#1610;&#1605; &#1571;&#1587;&#1604;&#1608;&#1576; &#1575;&#1604;&#1593;&#1585;&#1590; &#1576;&#1585;&#1575;&#1610;&#1575;&#1606; &#1576;&#1604; ")%> <a href="http://www.bryanbell.com">Bryan Bell</a><br />
+					<br />   
+					<%radioBadge%><br /><%feedLink%>&nbsp;&nbsp;<%radio.macros.mailTo ()%>&nbsp;|&nbsp;<%localString("Page rendered at|DE:Seite aufbereitet um|AR: &#1578;&#1605; &#1593;&#1585;&#1590; &#1607;&#1584;&#1607; &#1575;&#1604;&#1589;&#1601;&#1581;&#1577; &#1601;&#1610;")%>&nbsp;<%now%><br clear="right"><br />
 					<%newtelligence.aspnetcontrol("themecombo.ascx")%>
 				</p>
 			</div>
@@ -617,7 +617,7 @@
 		        </div>
 		    <hr> 
 			<div style="margin-left:40px;">
-				<%radio.weblog.drawcalendar ()%><br/>
+				<%radio.weblog.drawcalendar ()%><br />
 			</div>
 			<div class="sidetitle">
 				Search</div>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/dasBlog/homeTemplate.blogtemplate
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/dasBlog/homeTemplate.blogtemplate	2008-01-11 18:05:01 UTC (rev 794)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/dasBlog/homeTemplate.blogtemplate	2008-01-12 12:20:36 UTC (rev 795)
@@ -62,7 +62,7 @@
 				<p><%radio.macros.mailTo ()%> E-mail</p>
 			</div>
             <%newtelligence.aspnetcontrol("themecombo.ascx")%>	
-            <br/><br/><%newtelligence.loginbox ()%>
+            <br /><br /><%newtelligence.loginbox ()%>
 		</div>
 	</div>
 	<!-- END #right -->

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/discreetBlogBlue/homeTemplate.blogtemplate
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/discreetBlogBlue/homeTemplate.blogtemplate	2008-01-11 18:05:01 UTC (rev 794)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/discreetBlogBlue/homeTemplate.blogtemplate	2008-01-12 12:20:36 UTC (rev 795)
@@ -346,11 +346,11 @@
 				&nbsp;
 				</div>
 			  <div class="blogbody">
-				<%radio.macros.editorsOnlyMenu ()%><br/>
+				<%radio.macros.editorsOnlyMenu ()%><br />
 				<div class="title"><%subtitle%></div>
 				<div class="navigation">
 				<table><tr><td align="center">
-					<%radio.weblog.drawcalendar ()%><br/><hr>
+					<%radio.weblog.drawcalendar ()%><br /><hr>
 					<div class="sidetitle">
 						Search</div>
 					<div class="side">
@@ -377,10 +377,10 @@
 				<%bodytext%>
 				<%radio.macros.editThisPageButton ()%>
 				<p class="footer">
-					&copy; Copyright&nbsp;<%year%>&nbsp;<%authorName%><br/>
-					Theme Design by <a href="http://www.bryanbell.com">Bryan Bell</a><br/>
-					<br/>   
-					<%radioBadge%><br/><%radio.macros.xmlCoffeeMug ()%>&nbsp;&nbsp;&nbsp;<%feedLink%>&nbsp;&nbsp;<%radio.macros.mailTo ()%>&nbsp;|&nbsp;<%localString("Page rendered at|DE:Seite aufbereitet um|AR: &#1578;&#1605; &#1593;&#1585;&#1590; &#1607;&#1584;&#1607; &#1575;&#1604;&#1589;&#1601;&#1581;&#1577; &#1601;&#1610;")%>&nbsp;<%now%><br clear="right"><br/>
+					&copy; Copyright&nbsp;<%year%>&nbsp;<%authorName%><br />
+					Theme Design by <a href="http://www.bryanbell.com">Bryan Bell</a><br />
+					<br />   
+					<%radioBadge%><br /><%radio.macros.xmlCoffeeMug ()%>&nbsp;&nbsp;&nbsp;<%feedLink%>&nbsp;&nbsp;<%radio.macros.mailTo ()%>&nbsp;|&nbsp;<%localString("Page rendered at|DE:Seite aufbereitet um|AR: &#1578;&#1605; &#1593;&#1585;&#1590; &#1607;&#1584;&#1607; &#1575;&#1604;&#1589;&#1601;&#1581;&#1577; &#1601;&#1610;")%>&nbsp;<%now%><br clear="right"><br />
 					<%newtelligence.aspnetcontrol("themecombo.ascx")%>
 				</p>
 			  </div>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/discreetBlogBlue/itemTemplate.blogtemplate
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/discreetBlogBlue/itemTemplate.blogtemplate	2008-01-11 18:05:01 UTC (rev 794)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/discreetBlogBlue/itemTemplate.blogtemplate	2008-01-12 12:20:36 UTC (rev 795)
@@ -1,5 +1,5 @@
-<b><%ItemTitle%></b><br/>
-<%ItemText%><br/>
+<b><%ItemTitle%></b><br />
+<%ItemText%><br />
       <font class="small" size="-1" color="gray"><%when%>&nbsp;&nbsp;<%permalink%>&nbsp;&nbsp;<%editButton%>&nbsp;&nbsp;<%commentLink%>&nbsp;&nbsp;<%categoryLinks%><%trackbackList%></font>
      
       <%enclosure%><br /><br />

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/essence/homeTemplate.blogtemplate
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/essence/homeTemplate.blogtemplate	2008-01-11 18:05:01 UTC (rev 794)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/essence/homeTemplate.blogtemplate	2008-01-12 12:20:36 UTC (rev 795)
@@ -70,7 +70,7 @@
 				not represent my employer&#39;s view in any way.</p>
 				<p><%radio.macros.mailTo ()%> E-mail</p>
 				<p>Theme design by <a href="http://jelle.druyts.net">Jelle Druyts</a></p>
-                <br/><%newtelligence.aspnetcontrol("themecombo.ascx")%>		
+                <br /><%newtelligence.aspnetcontrol("themecombo.ascx")%>		
 			</div>
 		</div>
 		<!-- END #metaColumn -->

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/justhtml/homeTemplate.blogtemplate
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/justhtml/homeTemplate.blogtemplate	2008-01-11 18:05:01 UTC (rev 794)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/justhtml/homeTemplate.blogtemplate	2008-01-12 12:20:36 UTC (rev 795)
@@ -8,7 +8,7 @@
 
 <body>
 <div id="header">
-	<span class="siteName"><%siteNameLink%></span><br/>
+	<span class="siteName"><%siteNameLink%></span><br />
 	<span class="description"><%description%></span> 
 </div>
 <%newtelligence.adminBar()%>
@@ -30,7 +30,7 @@
 			<div class="side">
 				<%titleList()%> </div>
 			<div class="side" align="center">
-				<%radio.weblog.drawcalendar ()%><br/>
+				<%radio.weblog.drawcalendar ()%><br />
 			</div>
 			<div class="sidetitle">
 				Navigation </div>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/mobile/itemTemplate.blogtemplate
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/mobile/itemTemplate.blogtemplate	2008-01-11 18:05:01 UTC (rev 794)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/mobile/itemTemplate.blogtemplate	2008-01-12 12:20:36 UTC (rev 795)
@@ -1,4 +1,4 @@
-<%PreviousLink("&laquo;&nbsp;",25)%><%MainPageentryLink("Main", "|")%><%NextLink("&nbsp;&raquo;",25)%><br/>
+<%PreviousLink("&laquo;&nbsp;",25)%><%MainPageentryLink("Main", "|")%><%NextLink("&nbsp;&raquo;",25)%><br />
 <div class="itemBoxStyle">
 	<div class="itemTitleStyle">
 		<%ItemTitle%>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/movableRadioBlue/dayTemplate.blogtemplate
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/movableRadioBlue/dayTemplate.blogtemplate	2008-01-11 18:05:01 UTC (rev 794)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/movableRadioBlue/dayTemplate.blogtemplate	2008-01-12 12:20:36 UTC (rev 795)
@@ -12,4 +12,4 @@
       </tr><tr><td colspan="2"><hr size="1"></td></tr>
    </table>
 <%Items%>
-<br/>
\ No newline at end of file
+<br />
\ No newline at end of file

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/movableRadioBlue/homeTemplate.blogtemplate
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/movableRadioBlue/homeTemplate.blogtemplate	2008-01-11 18:05:01 UTC (rev 794)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/movableRadioBlue/homeTemplate.blogtemplate	2008-01-12 12:20:36 UTC (rev 795)
@@ -293,15 +293,15 @@
 		<div id="content">
 			<div class="blogbody">
 					<%bodytext%>
-					<br/>
+					<br />
 						<%radio.macros.editThisPageButton ()%>
-						<div class="footer">&copy; Copyright&nbsp;<%year%>&nbsp;<%authorName%><br/>
+						<div class="footer">&copy; Copyright&nbsp;<%year%>&nbsp;<%authorName%><br />
 								<%radioBadge%>
-								<br/>
+								<br />
 									<a href="http://jigsaw.w3.org/css-validator/">
 										<img style="border:0;width:88px;height:31px" src="http://jigsaw.w3.org/css-validator/images/vcss"
-											alt="Valid CSS!"><%feedLink%>&nbsp;&nbsp;&nbsp;&nbsp;<%radio.macros.mailTo ()%>&nbsp;|&nbsp;Page rendered at <%now%><br/>
-												<br/>
+											alt="Valid CSS!"><%feedLink%>&nbsp;&nbsp;&nbsp;&nbsp;<%radio.macros.mailTo ()%>&nbsp;|&nbsp;Page rendered at <%now%><br />
+												<br />
 													<%newtelligence.aspnetcontrol("themecombo.ascx")%>
 									</a></p></div>
 			</div>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/movableRadioBlue/itemTemplate.blogtemplate
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/movableRadioBlue/itemTemplate.blogtemplate	2008-01-11 18:05:01 UTC (rev 794)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/movableRadioBlue/itemTemplate.blogtemplate	2008-01-12 12:20:36 UTC (rev 795)
@@ -1,8 +1,8 @@
 <table width="100%" cellpadding="1">
   <tr>
     <td valign="top">
-	<%ItemTitle%><br/>
-      <br/><%ItemText%><br/><%categoryLinks%><br/>
+	<%ItemTitle%><br />
+      <br /><%ItemText%><br /><%categoryLinks%><br />
       <font class="small" size="-1" color="gray"><%when%>&nbsp;&nbsp;<%permalink%>&nbsp;&nbsp;<%editButton%><%commentLink%>&nbsp;<%trackbackList%></font>
       </td>
     <td valign="top" align="right" nowrap>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/movableRadioHeat/homeTemplate.blogtemplate
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/movableRadioHeat/homeTemplate.blogtemplate	2008-01-11 18:05:01 UTC (rev 794)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/movableRadioHeat/homeTemplate.blogtemplate	2008-01-12 12:20:36 UTC (rev 795)
@@ -349,17 +349,17 @@
 			<%radio.macros.editorsOnlyMenu ()%>
 			<div class="blogbody">
 					<%bodytext%>
-					<br/>
+					<br />
 						<%radio.macros.editThisPageButton ()%>
-						<div class="footer">&copy; Copyright&nbsp;<%year%>&nbsp;<%authorName%><br/>
+						<div class="footer">&copy; Copyright&nbsp;<%year%>&nbsp;<%authorName%><br />
 								<%radioBadge%>
-								<br/><a href="http://jigsaw.w3.org/css-validator/">
+								<br /><a href="http://jigsaw.w3.org/css-validator/">
 										<img style="border:0;width:88px;height:31px" src="http://jigsaw.w3.org/css-validator/images/vcss"
 											alt="Valid CSS!">
 									</a>
-									&nbsp;&nbsp;&nbsp;<%feedLink%>&nbsp;&nbsp;&nbsp;&nbsp;<%radio.macros.mailTo ()%>&nbsp;|&nbsp;Page rendered at <%now%><br/>
-										<br/>
-											<%newtelligence.aspnetcontrol("themecombo.ascx")%><br/>
+									&nbsp;&nbsp;&nbsp;<%feedLink%>&nbsp;&nbsp;&nbsp;&nbsp;<%radio.macros.mailTo ()%>&nbsp;|&nbsp;Page rendered at <%now%><br />
+										<br />
+											<%newtelligence.aspnetcontrol("themecombo.ascx")%><br />
                        </div>
 			</div>
 		</div>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/movableRadioHeat/itemTemplate.blogtemplate
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/movableRadioHeat/itemTemplate.blogtemplate	2008-01-11 18:05:01 UTC (rev 794)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/movableRadioHeat/itemTemplate.blogtemplate	2008-01-12 12:20:36 UTC (rev 795)
@@ -1,7 +1,7 @@
 <table width="100%" cellpadding="1">
   <tr>
     <td valign="top">
-      <br/><b><%ItemTitle%></b><br/><%ItemText%><br/><%categoryLinks%><br/>
+      <br /><b><%ItemTitle%></b><br /><%ItemText%><br /><%categoryLinks%><br />
       <font class="small" size="-1" color="gray"><%when%>&nbsp;&nbsp;<%permalink%>&nbsp;&nbsp;<%editButton%><%commentLink%>&nbsp;<%trackbackList%></font>
       </td>
     <td valign="top" align="right" nowrap>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/orangeCream/homeTemplate.blogtemplate
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/orangeCream/homeTemplate.blogtemplate	2008-01-11 18:05:01 UTC (rev 794)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/orangeCream/homeTemplate.blogtemplate	2008-01-12 12:20:36 UTC (rev 795)
@@ -97,7 +97,7 @@
 				</div>
 		
 			<div id="desc">
-               	       		 // display opinion here <br/>
+               	       		 // display opinion here <br />
    				&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; weblog.write &nbsp;mind.output("thoughts" + now() ); 
   			</div>
 		</div>
@@ -113,7 +113,7 @@
 				<tr>
 					<td align="center">
 						<%radio.weblog.drawcalendar ()%>
-						<br/>
+						<br />
 						<%feedLink%>
 					</td>
 				</tr>
@@ -145,9 +145,9 @@
 			<div align="center" class="side">
 				<div align="center">
 				<a href="http://www.blo.gs/" target="_blank"><img src="<%radio.macros.imageurl ("blogs.PNG")%>" border="0" width="80" height="15" alt="Blo.gs - blog directory"></a> 
-				 <br/>
+				 <br />
 				<a href="http://weblogs.com/" target="_blank"><img src="<%radio.macros.imageurl ("weblogs.PNG")%>" border="0" width="80" height="15" alt="weblogs.com"></a> 
-				 <br/>
+				 <br />
 				</div>
 			</div>
                         
@@ -160,7 +160,7 @@
 			<div align="center" class="side">
 				<div align="center">
 				<a href="mailto:nameATgmailDOTcom"><img src="<%radio.macros.imageurl ("gmailme.gif")%>"  border="0" alt="Mail Me"></a>
-				<br/>	
+				<br />	
 				</div>
 			</div>			
                                         
@@ -168,9 +168,9 @@
 				<div align="center" class="side">
 					<%newtelligence.loginbox ()%>
 				</div>
-		<br/>
-		<br/>
-		<br/>
+		<br />
+		<br />
+		<br />
 		</div>
 
 		<div id="content">
@@ -178,12 +178,12 @@
 			<%radio.macros.editorsOnlyMenu ()%>
 			<div class="blogbody">
 					<%bodytext%>
-					<br/>
+					<br />
 						<%radio.macros.editThisPageButton ()%>
 
 			</div>
 			<div id="footer" align="center">
-				<br/>
+				<br />
 				<div id="copyrights" align="Center">
 					<table border="0" cellpadding="0" cellspacing="0">
 					<tr>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/orangeCream/itemTemplate.blogtemplate
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/orangeCream/itemTemplate.blogtemplate	2008-01-11 18:05:01 UTC (rev 794)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/orangeCream/itemTemplate.blogtemplate	2008-01-12 12:20:36 UTC (rev 795)
@@ -1,9 +1,9 @@
 <table id="blogentry" width="100%" cellpadding="1">
   <tr>
     <td valign="top">
-     <b><%itemTitle%></b><br/><%itemText%><br/><%categoryLinks%><br/>
+     <b><%itemTitle%></b><br /><%itemText%><br /><%categoryLinks%><br />
       <div class="small"><%when%>&nbsp;&nbsp;<%permalink%>&nbsp;&nbsp;<%editButton%><%commentLink%>&nbsp;<%trackbackLink%>
-	<br/>
+	<br />
       <%trackbackList%></div>
       </td>
     <td valign="top" align="right" nowrap>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/project84/admin/homeTemplate.blogtemplate
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/project84/admin/homeTemplate.blogtemplate	2008-01-11 18:05:01 UTC (rev 794)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/project84/admin/homeTemplate.blogtemplate	2008-01-12 12:20:36 UTC (rev 795)
@@ -26,8 +26,8 @@
     <div id="right">
     		<div class="sidebar">
     			<div class="sidehead">Navigation</div>
-    			<div class="sidecontent"><%navigatorLinks%><br/>
-    			&nbsp;<%rssLink%> | <%atomLink%> | <%CdfLink%> | <%radio.macros.mailTo()%><br/><br/>
+    			<div class="sidecontent"><%navigatorLinks%><br />
+    			&nbsp;<%rssLink%> | <%atomLink%> | <%CdfLink%> | <%radio.macros.mailTo()%><br /><br />
     		</div>
     		</div>
     		<div class="sidebar">
@@ -37,9 +37,9 @@
     		<div class="sidebar">
     			<div class="sidehead">Archive</div>
     			<div class="sidecontent">
-    			<%radio.weblog.drawcalendar ()%> <br/>
-    			<%newtelligence.search()%>       <br/>
-    			<%newtelligence.drawArchiveMonths()%> <br/>
+    			<%radio.weblog.drawcalendar ()%> <br />
+    			<%newtelligence.search()%>       <br />
+    			<%newtelligence.drawArchiveMonths()%> <br />
     			<a href="monthview.aspx">Month View</a>
     			</div>
     		</div>
@@ -74,11 +74,11 @@
     		<div class="sidebar">
     			<div class="sidecontent">
     				<%newtelligence.disclaimer()%>
-    				&copy; Copyright&nbsp;<%year%>&nbsp;<%authorName%><br/><br/>
+    				&copy; Copyright&nbsp;<%year%>&nbsp;<%authorName%><br /><br />
     				<%localString("Theme design by|DE:Design von|AR:&#1578;&#1589;&#1605;&#1610;&#1605; &#1571;&#1587;&#1604;&#1608;&#1576; &#1575;&#1604;&#1593;&#1585;&#1590; &#1576;&#1585;&#1575;&#1610;&#1575;&#1606; &#1576;&#1604; ")%> Jacob Hodges base on a theme by <a href="http://www.jamessnape.me.uk">James Snape</a>
-    				with <%radioBadge%><br/>
-    				<%newtelligence.loginbox()%><br/>
-    			    <br/>
+    				with <%radioBadge%><br />
+    				<%newtelligence.loginbox()%><br />
+    			    <br />
     			</div>
     		</div>
     

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/project84/homeTemplate.blogtemplate
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/project84/homeTemplate.blogtemplate	2008-01-11 18:05:01 UTC (rev 794)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/project84/homeTemplate.blogtemplate	2008-01-12 12:20:36 UTC (rev 795)
@@ -24,15 +24,15 @@
 	<div id="content">
 		<%bodytext%>
 		<p class="footer">
-			<%localString("Page rendered at|DE:Seite aufbereitet um|AR: &#1578;&#1605; &#1593;&#1585;&#1590; &#1607;&#1584;&#1607; &#1575;&#1604;&#1589;&#1601;&#1581;&#1577; &#1601;&#1610;")%>&nbsp;<%now%><br clear="right"><br/>
+			<%localString("Page rendered at|DE:Seite aufbereitet um|AR: &#1578;&#1605; &#1593;&#1585;&#1590; &#1607;&#1584;&#1607; &#1575;&#1604;&#1589;&#1601;&#1581;&#1577; &#1601;&#1610;")%>&nbsp;<%now%><br clear="right"><br />
 		</p>
 	</div>
 	
 	<div id="right">
 		<div class="sidebar">
 			<div class="sidehead">Navigation</div>
-			<div class="sidecontent"><%navigatorLinks%><br/>
-			&nbsp;<%feedLink%> | <%radio.macros.mailTo()%><br/><br/>
+			<div class="sidecontent"><%navigatorLinks%><br />
+			&nbsp;<%feedLink%> | <%radio.macros.mailTo()%><br /><br />
 		</div>
 		</div>
 		<div class="sidebar">
@@ -42,9 +42,9 @@
 		<div class="sidebar">
 			<div class="sidehead">Archive</div>
 			<div class="sidecontent">
-			<%radio.weblog.drawcalendar ()%> <br/>
-			<%newtelligence.search()%>       <br/>
-			<%newtelligence.drawArchiveMonths()%> <br/>
+			<%radio.weblog.drawcalendar ()%> <br />
+			<%newtelligence.search()%>       <br />
+			<%newtelligence.drawArchiveMonths()%> <br />
 			<a href="monthview.aspx">Month View</a>
 			</div>
 		</div>
@@ -79,13 +79,13 @@
 		<div class="sidebar">
 			<div class="sidecontent">
 				<%newtelligence.disclaimer()%>
-				&copy; Copyright&nbsp;<%year%>&nbsp;<%authorName%><br/><br/>
+				&copy; Copyright&nbsp;<%year%>&nbsp;<%authorName%><br /><br />
 				<%localString("Theme design by|DE:Design von|AR:&#1578;&#1589;&#1605;&#1610;&#1605; &#1571;&#1587;&#1604;&#1608;&#1576; &#1575;&#1604;&#1593;&#1585;&#1590; &#1576;&#1585;&#1575;&#1610;&#1575;&#1606; &#1576;&#1604; ")%> <a href="http://www.project84.net">Jacob Hodges</a>
-				with <%radioBadge%><br/>
-				<%newtelligence.aspnetcontrol("themecombo.ascx")%><br/>
-				<%newtelligence.loginbox()%><br/>
-			    <%radio.macros.xmlCoffeeMug ()%><br/>
-			    <br/>
+				with <%radioBadge%><br />
+				<%newtelligence.aspnetcontrol("themecombo.ascx")%><br />
+				<%newtelligence.loginbox()%><br />
+			    <%radio.macros.xmlCoffeeMug ()%><br />
+			    <br />
 			</div>
 		</div>
 

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/project84/itemTemplate.blogtemplate
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/project84/itemTemplate.blogtemplate	2008-01-11 18:05:01 UTC (rev 794)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/project84/itemTemplate.blogtemplate	2008-01-12 12:20:36 UTC (rev 795)
@@ -8,7 +8,7 @@
             <%permalink%>&nbsp;
             <%editButton%>&nbsp;
             <%commentLink%>
-            <%trackbackLink%><br/>
+            <%trackbackLink%><br />
 			<%RelatedPostList%>
             <%trackbackList%>
 			<%ReferralList%>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/project84Grass/admin/homeTemplate.blogtemplate
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/project84Grass/admin/homeTemplate.blogtemplate	2008-01-11 18:05:01 UTC (rev 794)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/project84Grass/admin/homeTemplate.blogtemplate	2008-01-12 12:20:36 UTC (rev 795)
@@ -25,7 +25,7 @@
 	<!-- Left hand menu -->	
 	<div class="sidebar">
 		<div class="sidehead">Navigation</div>
-		<div class="sidecontent"><%navigatorLinks%><br/>&nbsp;<%rssLink%> | <%atomLink%> | <%CdfLink%> | <%radio.macros.mailTo()%><br/><br/></div>
+		<div class="sidecontent"><%navigatorLinks%><br />&nbsp;<%rssLink%> | <%atomLink%> | <%CdfLink%> | <%radio.macros.mailTo()%><br /><br /></div>
 	</div>
 	<div class="sidebar">
 		<div class="sidehead"><%localString("Categories|DE:Kategorien|AR:&#1571;&#1589;&#1606;&#1575;&#1601;")%></div>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/project84Grass/homeTemplate.blogtemplate
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/project84Grass/homeTemplate.blogtemplate	2008-01-11 18:05:01 UTC (rev 794)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/project84Grass/homeTemplate.blogtemplate	2008-01-12 12:20:36 UTC (rev 795)
@@ -26,8 +26,8 @@
 	<!-- Left hand menu -->
 	<div class="sidebar">
 		<div class="sidehead">Navigation</div>
-		<div class="sidecontent"><%navigatorLinks%><br/>
-		&nbsp;<%rssLink%> | <%radio.macros.mailTo()%><br/><br/></div>
+		<div class="sidecontent"><%navigatorLinks%><br />
+		&nbsp;<%rssLink%> | <%radio.macros.mailTo()%><br /><br /></div>
 	</div>
 		<div class="sidebar">
 		<div class="sidehead"><%localString("Categories|DE:Kategorien|AR:&#1571;&#1589;&#1606;&#1575;&#1601;")%></div>
@@ -40,22 +40,22 @@
 	<div class="sidebar">
 		<div class="sidehead">Archive</div>
 		<div class="sidecontent">
-		<%radio.weblog.drawcalendar ()%> <br/>
-		<%newtelligence.search()%>       <br/>
-		<%newtelligence.drawArchiveMonths()%> <br/>
+		<%radio.weblog.drawcalendar ()%> <br />
+		<%newtelligence.search()%>       <br />
+		<%newtelligence.drawArchiveMonths()%> <br />
 		<a href="monthview.aspx">Month View</a>
 		</div>
 	</div>
 	<div class="sidebar">
 		<div class="sidecontent">
 			<%newtelligence.disclaimer()%>
-			&copy; Copyright&nbsp;<%year%>&nbsp;<%authorName%><br/><br/>
+			&copy; Copyright&nbsp;<%year%>&nbsp;<%authorName%><br /><br />
 			<%localString("Theme design by|DE:Design von|AR:&#1578;&#1589;&#1605;&#1610;&#1605; &#1571;&#1587;&#1604;&#1608;&#1576; &#1575;&#1604;&#1593;&#1585;&#1590; &#1576;&#1585;&#1575;&#1610;&#1575;&#1606; &#1576;&#1604; ")%> <a href="http://www.project84.net">Jacob Hodges</a>
-			with <%radioBadge%><br/>
+			with <%radioBadge%><br />
 			<a href='http://www.colorcombos.com/combotester.html?color0=EFEFEF&color1=0191C8&color2=0E4F93&color3=92C729&color4=75B22F&color5=DDDDDD&color6=C83900&show_text=N'><img border=0 src='http://www.colorcombos.com/combo_image.php?color0=EFEFEF&color1=0191C8&color2=0E4F93&color3=92C729&color4=75B22F&color5=DDDDDD&color6=C83900&show_text=N&p_b=2&p_w=2&p_s=10'></a><br />
-			<%newtelligence.loginbox()%><br/>
+			<%newtelligence.loginbox()%><br />
 			<%newtelligence.aspnetcontrol("themecombo.ascx")%>
-			<br/>
+			<br />
 		</div>
 	</div>
 	<!-- end menu stuff -->

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/project84Grass/itemTemplate.blogtemplate
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/project84Grass/itemTemplate.blogtemplate	2008-01-11 18:05:01 UTC (rev 794)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/project84Grass/itemTemplate.blogtemplate	2008-01-12 12:20:36 UTC (rev 795)
@@ -8,7 +8,7 @@
             <%permalink%>&nbsp;
             <%editButton%>&nbsp;
             <%commentLink%>
-            <%trackbackLink%><br/>
+            <%trackbackLink%><br />
 			<%RelatedPostList%>
             <%trackbackList%>
 			<%ReferralList%>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/slate/homeTemplate.blogtemplate
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/slate/homeTemplate.blogtemplate	2008-01-11 18:05:01 UTC (rev 794)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/slate/homeTemplate.blogtemplate	2008-01-12 12:20:36 UTC (rev 795)
@@ -61,7 +61,7 @@
 				<p><%radio.macros.mailTo ()%> E-mail</p>
 			</div>
 			<%newtelligence.loginbox ()%>
-            <br/><%newtelligence.aspnetcontrol("themecombo.ascx")%>
+            <br /><%newtelligence.aspnetcontrol("themecombo.ascx")%>
 		</div>
 	</div>
 	<!-- END #right -->

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/soundWaves/dayTemplate.blogtemplate
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/soundWaves/dayTemplate.blogtemplate	2008-01-11 18:05:01 UTC (rev 794)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/soundWaves/dayTemplate.blogtemplate	2008-01-12 12:20:36 UTC (rev 795)
@@ -20,4 +20,4 @@
     </td>
   </tr>
 </table>
-<br/>
+<br />

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/soundWaves/homeTemplate.blogtemplate
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/soundWaves/homeTemplate.blogtemplate	2008-01-11 18:05:01 UTC (rev 794)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/soundWaves/homeTemplate.blogtemplate	2008-01-12 12:20:36 UTC (rev 795)
@@ -145,7 +145,7 @@
 										</tr>
 										<tr> 
 											<td valign="top"><font size="+1" color="#000000"><b> 
-												<a href="<%radio.macros.weblogUrl ()%>" style="color:Black; text-decoration:none"><%siteName%></a> </b></font><br/>
+												<a href="<%radio.macros.weblogUrl ()%>" style="color:Black; text-decoration:none"><%siteName%></a> </b></font><br />
 												<font color="#ffffff"><i><%description%></i></font>
 												</td>
 										</tr>
@@ -182,11 +182,11 @@
 					<%newtelligence.drawCategories()%>
 					</div>
 									<hr size="1">
-									<br/>
+									<br />
 									<%radio.macros.xmlCoffeeMug ()%>
-									<br/><br/>
+									<br /><br />
 									<%feedLink%>
-									<br/><br/>
+									<br /><br />
 									<%radio.macros.mailto ()%>
 								</td>
 								<td width="10">&nbsp;</td>
@@ -197,7 +197,7 @@
 				<tr> 
 					<td><img src=<%radio.macros.imageurl ("images/shim.gif")%>  width="224", height="1"></img></tr>
 			</table>
-			<br/>
+			<br />
 		</td>
 		<td width="100%" bgcolor="#FFFFFF" valign="top"> 
 			<table width="100%" border="0" cellspacing="0" cellpadding="2">
@@ -226,12 +226,12 @@
 								<td width="1"> 
 									</td>
 								<td width="100%">
-								&copy; Copyright&nbsp;<%year%>&nbsp;<%authorName%><br/>
+								&copy; Copyright&nbsp;<%year%>&nbsp;<%authorName%><br />
 									This theme is based on the <a href="http://theme31.weblogger.com/">SoundWaves 
-									(blue)</a> Manila theme.</font><br/>
-									<%radioBadge%><br/>
+									(blue)</a> Manila theme.</font><br />
+									<%radioBadge%><br />
 									
-									<br/><%newtelligence.aspnetcontrol("themecombo.ascx")%></td>
+									<br /><%newtelligence.aspnetcontrol("themecombo.ascx")%></td>
 								</tr>
 							</table>
 						
@@ -239,7 +239,7 @@
 					<td valign="top" width="250" align="center"> 
 					    
 						<%radio.weblog.drawcalendar ()%>
-						<br/>
+						<br />
 						<hr>
 			
 		    <div class="sidetitle">Blogroll</div>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/soundWaves/itemTemplate.blogtemplate
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/soundWaves/itemTemplate.blogtemplate	2008-01-11 18:05:01 UTC (rev 794)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/soundWaves/itemTemplate.blogtemplate	2008-01-12 12:20:36 UTC (rev 795)
@@ -1,7 +1,7 @@
 <table width="100%" cellpadding="1">
   <tr>
     <td valign="top">
-      <br/><div class="itemTitle"><b><%ItemTitle%></b></div><%ItemText%><br/><%categoryLinks%><br/>
+      <br /><div class="itemTitle"><b><%ItemTitle%></b></div><%ItemText%><br /><%categoryLinks%><br />
       <font class="small" size="-1" color="gray"><%when%>&nbsp;&nbsp;<%permalink%>&nbsp;<%editButton%>&nbsp;<%commentLink%>&nbsp;<%trackbackList%></font>
       </td>
     <td valign="top" align="right" nowrap>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/useit/homeTemplate.blogtemplate
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/useit/homeTemplate.blogtemplate	2008-01-11 18:05:01 UTC (rev 794)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/themes/useit/homeTemplate.blogtemplate	2008-01-12 12:20:36 UTC (rev 795)
@@ -56,12 +56,12 @@
 <table width="100%">
 <tr>
 <td width="50%">
-Powered by: <%radioBadge%> | <%rssLink%> | <%atomLink%> | <%cdfLink%><br/>
-Contact: <%radio.macros.mailTo ()%> <%authorName%><br/>
+Powered by: <%radioBadge%> | <%rssLink%> | <%atomLink%> | <%cdfLink%><br />
+Contact: <%radio.macros.mailTo ()%> <%authorName%><br />
 </td>
 <td width="50%" align="right">
-<%newtelligence.loginbox()%><br/>
-This theme is based on Jakob Nielson's <a href="http://www.useit.com">useit.com</a> website.<br/>
+<%newtelligence.loginbox()%><br />
+This theme is based on Jakob Nielson's <a href="http://www.useit.com">useit.com</a> website.<br />
 <%newtelligence.aspnetcontrol("themecombo.ascx")%>
 </td>
 </tr>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/BookControl.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/BookControl.cs	2008-01-11 18:05:01 UTC (rev 794)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/BookControl.cs	2008-01-12 12:20:36 UTC (rev 795)
@@ -110,7 +110,7 @@
             tr.Width = 120;
             tr.Height = 150;
             TableCell td = new TableCell();
-            td.Text = string.Format("<strong>ScottWater</strong><br/>Book Control<br/>{0}", bc.ID);
+            td.Text = string.Format("<strong>ScottWater</strong><br />Book Control<br />{0}", bc.ID);
             td.VerticalAlign = VerticalAlign.Middle;
             td.HorizontalAlign = HorizontalAlign.Center;
             tr.Cells.Add(td);

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Macros.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Macros.cs	2008-01-11 18:05:01 UTC (rev 794)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Macros.cs	2008-01-12 12:20:36 UTC (rev 795)
@@ -313,7 +313,7 @@
         /// <param name="url">Absolute URL to the outline or relative local path</param>
         /// <returns></returns>
         /// <remarks>
-        /// Renders a complex control with the following CSS styles:<br/>
+        /// Renders a complex control with the following CSS styles:<br />
         /// <table>
         ///    <tr><td>Outermost container (&lt;div&gt;)<td></td>blogRollContainerStyle</td></tr>
         ///    <tr><td>Contained table (&lt;table&gt;)<td></td>blogRollTableStyle</td></tr>
@@ -2927,7 +2927,7 @@
                                 }
 
                                 trkSpan.Controls.Add(
-                                    new LiteralControl("&nbsp;[" + trk.TrackingType + "]<br/>"));
+                                    new LiteralControl("&nbsp;[" + trk.TrackingType + "]<br />"));
                             }
                         }
 
@@ -3032,7 +3032,7 @@
                             }
 

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Dasblogce-cvs] SF.net SVN: dasblogce: [797] branches/refactoring_architecture/source

From: <sfcaus@us...> - 2008-01-12 18:18

Revision: 797
          http://dasblogce.svn.sourceforge.net/dasblogce/?rev=797&view=rev
Author:   sfcaus
Date:     2008-01-12 10:18:51 -0800 (Sat, 12 Jan 2008)

Log Message:
-----------
- ASP.NET 2.0 migration fixes

Modified Paths:
--------------
    branches/refactoring_architecture/source/DasBlog.sln
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Activity.aspx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Activity.aspx.designer.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ActivityBox.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ActivityBox.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AdminNavBar.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AdminNavBar.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AggBugs.aspx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AggBugs.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AggBugs.aspx.designer.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AggBugsBox.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AggBugsBox.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AggBugsBox.ascx.designer.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ApplicationResourceTable.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Archives.aspx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Archives.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Archives.aspx.designer.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ArchivesControl.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ArchivesControl.ascx.designer.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/BlogRollControl.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/BlogRollControl.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/BlogRollControl.ascx.designer.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Blogroll.aspx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Blogroll.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Blogroll.aspx.designer.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/CategoryView.aspx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/CategoryView.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/CategoryView.aspx.designer.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ClickThroughs.aspx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ClickThroughs.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ClickThroughs.aspx.designer.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ClickThroughsBox.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ClickThroughsBox.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ClickThroughsBox.ascx.designer.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/CommentView.aspx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/CommentView.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/CommentView.aspx.designer.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/CommentViewBox.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/CommentViewBox.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ConfigEditingService.asmx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ConfigEditingService.asmx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/CrosspostReferrers.aspx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/CrosspostReferrers.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/CrosspostReferrers.aspx.designer.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/CrosspostReferrersBox.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/CrosspostReferrersBox.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/CrosspostReferrersBox.ascx.designer.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditBlogRoll.aspx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditBlogRoll.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditBlogRoll.aspx.designer.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditBlogRollBox.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditBlogRollBox.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditBlogRollEditItem.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditBlogRollEditItem.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditBlogRollItem.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditBlogRollItem.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditConfig.aspx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditConfig.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditConfig.aspx.designer.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditConfigBox.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditConfigBox.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditContentFilters.aspx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditContentFilters.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditContentFilters.aspx.designer.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditContentFiltersBox.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditContentFiltersBox.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditControlProvider.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditCrosspostSites.aspx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditCrosspostSites.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditCrosspostSites.aspx.designer.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditCrosspostSitesBox.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditCrosspostSitesBox.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditEntry.aspx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditEntry.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditEntry.aspx.designer.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditEntryBox.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditEntryBox.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditNavigatorLinks.aspx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditNavigatorLinks.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditNavigatorLinks.aspx.designer.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditNavigatorLinksBox.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditNavigatorLinksBox.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditService.asmx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditService.asmx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditUser.aspx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditUser.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditUser.aspx.designer.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditUserBox.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditUserBox.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Email.aspx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Email.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Email.aspx.designer.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EmailBox.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EmailBox.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Eventlog.aspx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Eventlog.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Eventlog.aspx.designer.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EventlogBox.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EventlogBox.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EventlogBox.ascx.designer.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/FormatControl.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/FormatControl.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/FormatControl.ascx.designer.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/FormatPage.aspx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/FormatPage.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/FormatPage.aspx.designer.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/FreeTextBoxAdapter.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Global.asax
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Global.asax.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/LogDateBar.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/LogDateBar.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Login.aspx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Login.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Login.aspx.designer.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/LoginBox.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/LoginBox.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/LoginBox.ascx.designer.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Logout.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Logout.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/MonthView.aspx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/MonthView.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/MonthView.aspx.designer.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/MonthViewBox.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/MonthViewBox.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/PermaLink.aspx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/PermaLink.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/PermaLink.aspx.designer.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Profile.aspx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Profile.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Profile.aspx.designer.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ProfileCombo.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ProfileCombo.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ProfileCombo.ascx.designer.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Referrers.aspx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Referrers.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Referrers.aspx.designer.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ReferrersBox.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ReferrersBox.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ReferrersBox.ascx.designer.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Search.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Search.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/SearchView.aspx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/SearchView.aspx.designer.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/SearchViewBox.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/SearchViewBox.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/SearchViewBox.ascx.designer.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/SingleCommentView.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/StatisticsListBase.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/SyndicationService.asmx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/SyndicationService.asmx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/SyndicationServiceExperimental.asmx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/SyndicationServiceExperimental.asmx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/TextBoxAdapter.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ThemeBar.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ThemeBar.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ThemeBar.ascx.designer.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ThemeCombo.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ThemeCombo.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ThemeCombo.ascx.designer.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/TimeLine.aspx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/TimeLine.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/TimeLine.aspx.designer.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/TimeLineControl.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/TimeLineControl.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/TimeLineControl.ascx.designer.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/UserClickThroughs.aspx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/UserClickThroughs.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/UserClickThroughs.aspx.designer.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/UserClickThroughsBox.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/UserClickThroughsBox.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/UserClickThroughsBox.ascx.designer.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/UserView.aspx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/UserView.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/UserView.aspx.designer.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/default.aspx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/default.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/default.aspx.designer.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ftb/ftb.colorpicker.aspx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ftb/ftb.insertcode.aspx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ftb/ftb.inserttable.aspx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/SideBarOpmlList.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/newtelligence.DasBlog.Web.Core.csproj

Modified: branches/refactoring_architecture/source/DasBlog.sln
===================================================================
--- branches/refactoring_architecture/source/DasBlog.sln	2008-01-12 15:43:20 UTC (rev 796)
+++ branches/refactoring_architecture/source/DasBlog.sln	2008-01-12 18:18:51 UTC (rev 797)
@@ -84,12 +84,6 @@
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DasBlog.Web.Rendering", "DasBlog.Web.Rendering\DasBlog.Web.Rendering.csproj", "{BDEC56AA-4F4B-4D4C-8BEA-18E44FD1C67F}"
-	ProjectSection(WebsiteProperties) = preProject
-		Debug.AspNetCompiler.Debug = "True"
-		Release.AspNetCompiler.Debug = "False"
-	EndProjectSection
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|.NET = Debug|.NET
@@ -240,16 +234,6 @@
 		{FF7F1D68-352E-4FEA-A7B4-EB6C25140316}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FF7F1D68-352E-4FEA-A7B4-EB6C25140316}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{FF7F1D68-352E-4FEA-A7B4-EB6C25140316}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{BDEC56AA-4F4B-4D4C-8BEA-18E44FD1C67F}.Debug|.NET.ActiveCfg = Debug|Any CPU
-		{BDEC56AA-4F4B-4D4C-8BEA-18E44FD1C67F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BDEC56AA-4F4B-4D4C-8BEA-18E44FD1C67F}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BDEC56AA-4F4B-4D4C-8BEA-18E44FD1C67F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{BDEC56AA-4F4B-4D4C-8BEA-18E44FD1C67F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{BDEC56AA-4F4B-4D4C-8BEA-18E44FD1C67F}.Release|.NET.ActiveCfg = Release|Any CPU
-		{BDEC56AA-4F4B-4D4C-8BEA-18E44FD1C67F}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BDEC56AA-4F4B-4D4C-8BEA-18E44FD1C67F}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BDEC56AA-4F4B-4D4C-8BEA-18E44FD1C67F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{BDEC56AA-4F4B-4D4C-8BEA-18E44FD1C67F}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Activity.aspx
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Activity.aspx	2008-01-12 15:43:20 UTC (rev 796)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Activity.aspx	2008-01-12 18:18:51 UTC (rev 797)
@@ -1,2 +1,3 @@
-<%@ Page language="c#" validateRequest="true" Codebehind="Activity.aspx.cs" AutoEventWireup="False" Inherits="newtelligence.DasBlog.Web.Activity" %>
+<%@ Page Language="C#" ValidateRequest="true" AutoEventWireup="False" Inherits="newtelligence.DasBlog.Web.Activity" CodeFile="Activity.aspx.cs" %>
+
 <asp:placeholder id="contentPlaceHolder" runat="server"></asp:placeholder>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Activity.aspx.designer.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Activity.aspx.designer.cs	2008-01-12 15:43:20 UTC (rev 796)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Activity.aspx.designer.cs	2008-01-12 18:18:51 UTC (rev 797)
@@ -1,10 +1,10 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:2.0.50727.1318
+//     Dieser Code wurde von einem Tool generiert.
+//     Laufzeitversion:2.0.50727.312
 //
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     \xC4nderungen an dieser Datei k\xF6nnen falsches Verhalten verursachen und gehen verloren, wenn
+//     der Code erneut generiert wird.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
@@ -12,19 +12,19 @@
     
     
     /// <summary>
-    /// Activity class.
+    /// Activity-Klasse.
     /// </summary>
     /// <remarks>
-    /// Auto-generated class.
+    /// Automatisch generierte Klasse.
     /// </remarks>
     public partial class Activity {
         
         /// <summary>
-        /// contentPlaceHolder control.
+        /// contentPlaceHolder-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.PlaceHolder contentPlaceHolder;
     }

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ActivityBox.ascx
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ActivityBox.ascx	2008-01-12 15:43:20 UTC (rev 796)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ActivityBox.ascx	2008-01-12 18:18:51 UTC (rev 797)
@@ -1,20 +1,32 @@
-<%@ Control language="c#" Codebehind="ActivityBox.ascx.cs" AutoEventWireup="True" Inherits="newtelligence.DasBlog.Web.ActivityBox" targetSchema="http://schemas.microsoft.com/intellisense/ie5"%>
+<%@ Control Language="C#" AutoEventWireup="True" Inherits="newtelligence.DasBlog.Web.ActivityBox" CodeFile="ActivityBox.ascx.cs" %>
 <div class="adminNavbarStyle" id="DIV1" runat="server">
-	<ul>
-		<li class="first" id="eventlog" runat="server">
-			<asp:HyperLink id=hyperLinkEventlog Text='<%# resmgr.GetString("text_admin_events")%>' runat="server" NavigateUrl="Eventlog.aspx">
-			</asp:HyperLink></li><li id="referrers" runat="server">
-			<asp:HyperLink id=hyperLinkReferrers Text='<%# resmgr.GetString("text_admin_referrers")%>' runat="server" NavigateUrl="Referrers.aspx">
-			</asp:HyperLink></li><%if (siteConfig.EnableAggregatorBugging){%><li id="aggbugs" runat="server">
-			<asp:HyperLink id=hyperlinkAggBugs Text='<%# resmgr.GetString("text_admin_aggbugs")%>' runat="server" NavigateUrl="AggBugs.aspx">
-			</asp:HyperLink></li><%}%><%if (siteConfig.EnableClickThrough) {%><li id="clickthrough" runat="server">
-			<asp:HyperLink id=hyperlinkClickThroughs Text='<%# resmgr.GetString("text_admin_clickthrough")%>' runat="server" NavigateUrl="ClickThroughs.aspx">
-			</asp:HyperLink></li><li id="userclickthrough" runat="server">
-			<asp:HyperLink id="hyperlinkUserClickThroughs" Text='<%# resmgr.GetString("text_admin_userclickthrough")%>' runat="server" NavigateUrl="UserClickThroughs.aspx">
-			</asp:HyperLink></li><%}%><%if (siteConfig.EnableCrossposts) {%><li id="crosspost" runat="server">
-			<asp:HyperLink id=hyperlinkCrosspostReferrers Text='<%# resmgr.GetString("text_admin_crosspost")%>' runat="server" NavigateUrl="CrosspostReferrers.aspx">
-			</asp:HyperLink></li>
-			<%}%>
-		
-	</ul>
+    <ul>
+        <li class="first" id="eventlog" runat="server">
+            <asp:HyperLink ID="hyperLinkEventlog" Text='<%# resmgr.GetString("text_admin_events")%>' runat="server" NavigateUrl="Eventlog.aspx">
+            </asp:HyperLink></li>
+        <li id="referrers" runat="server">
+            <asp:HyperLink ID="hyperLinkReferrers" Text='<%# resmgr.GetString("text_admin_referrers")%>' runat="server" NavigateUrl="Referrers.aspx">
+            </asp:HyperLink></li>
+        <%if (siteConfig.EnableAggregatorBugging)
+          {%>
+        <li id="aggbugs" runat="server">
+            <asp:HyperLink ID="hyperlinkAggBugs" Text='<%# resmgr.GetString("text_admin_aggbugs")%>' runat="server" NavigateUrl="AggBugs.aspx">
+            </asp:HyperLink></li>
+        <%}%>
+        <%if (siteConfig.EnableClickThrough)
+          {%>
+        <li id="clickthrough" runat="server">
+            <asp:HyperLink ID="hyperlinkClickThroughs" Text='<%# resmgr.GetString("text_admin_clickthrough")%>' runat="server" NavigateUrl="ClickThroughs.aspx">
+            </asp:HyperLink></li>
+        <li id="userclickthrough" runat="server">
+            <asp:HyperLink ID="hyperlinkUserClickThroughs" Text='<%# resmgr.GetString("text_admin_userclickthrough")%>' runat="server" NavigateUrl="UserClickThroughs.aspx">
+            </asp:HyperLink></li>
+        <%}%>
+        <%if (siteConfig.EnableCrossposts)
+          {%>
+        <li id="crosspost" runat="server">
+            <asp:HyperLink ID="hyperlinkCrosspostReferrers" Text='<%# resmgr.GetString("text_admin_crosspost")%>' runat="server" NavigateUrl="CrosspostReferrers.aspx">
+            </asp:HyperLink></li>
+        <%}%>
+    </ul>
 </div>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ActivityBox.ascx.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ActivityBox.ascx.cs	2008-01-12 15:43:20 UTC (rev 796)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ActivityBox.ascx.cs	2008-01-12 18:18:51 UTC (rev 797)
@@ -1,4 +1,5 @@
 #region Copyright (c) 2003, newtelligence AG. All rights reserved.
+
 /*
 // Copyright (c) 2003, newtelligence AG. (http://www.newtelligence.com)
 // Original BlogX Source Code: Copyright (c) 2003, Chris Anderson (http://simplegeek.com)
@@ -35,6 +36,7 @@
 // or following this notice. 
 //
 */
+
 #endregion
 
 using System;
@@ -46,108 +48,98 @@
 
 namespace newtelligence.DasBlog.Web
 {
-    /// <summary>
-	/// Summary description for WebForm1.
-	/// </summary>
-	public partial class ActivityBox : UserControl
-	{
-		protected Label labelTitle;
-        protected HtmlGenericControl editNavigatorLinks;
+    public partial class ActivityBox : UserControl
+    {
         protected HtmlGenericControl editCrossPostSites;
-		protected ResourceManager resmgr;
+        protected HtmlGenericControl editNavigatorLinks;
+        protected Label labelTitle;
+        protected ResourceManager resmgr;
         protected SiteConfig siteConfig;
-    
-		protected void Page_Load(object sender, EventArgs e)
-		{
-			if (SiteSecurity.IsInRole("admin") == false) 
-			{
-				Response.Redirect("~/FormatPage.aspx?path=SiteConfig/accessdenied.format.html");
-			}
-			
+
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            if (SiteSecurity.IsInRole("admin") == false)
+            {
+                Response.Redirect("~/FormatPage.aspx?path=SiteConfig/accessdenied.format.html");
+            }
+
             //set the current page <li> tag to here
-            string filePath = this.Request.FilePath;
-			
+            string filePath = Request.FilePath;
+
             if (filePath.EndsWith("CrosspostReferrers.aspx", StringComparison.InvariantCultureIgnoreCase))
             {
-                crosspost.Attributes["class"]="here";
-                hyperlinkCrosspostReferrers.NavigateUrl= "";
+                crosspost.Attributes["class"] = "here";
+                hyperlinkCrosspostReferrers.NavigateUrl = "";
             }
             else if (filePath.EndsWith("UserClickThroughs.aspx", StringComparison.InvariantCultureIgnoreCase))
-			{
-				userclickthrough.Attributes["class"]="here";
-				hyperlinkUserClickThroughs.NavigateUrl= "";
-			}
+            {
+                userclickthrough.Attributes["class"] = "here";
+                hyperlinkUserClickThroughs.NavigateUrl = "";
+            }
             else if (filePath.EndsWith("ClickThroughs.aspx", StringComparison.InvariantCultureIgnoreCase))
             {
-                clickthrough.Attributes["class"]="here";
-                hyperlinkClickThroughs.NavigateUrl= "";
+                clickthrough.Attributes["class"] = "here";
+                hyperlinkClickThroughs.NavigateUrl = "";
             }
             else if (filePath.EndsWith("AggBugs.aspx", StringComparison.InvariantCultureIgnoreCase))
             {
-                aggbugs.Attributes["class"]="here";
-                hyperlinkAggBugs.NavigateUrl= "";
+                aggbugs.Attributes["class"] = "here";
+                hyperlinkAggBugs.NavigateUrl = "";
             }
             else if (filePath.EndsWith("Referrers.aspx", StringComparison.InvariantCultureIgnoreCase))
             {
-                referrers.Attributes["class"]="here";
-                hyperLinkReferrers.NavigateUrl= "";
+                referrers.Attributes["class"] = "here";
+                hyperLinkReferrers.NavigateUrl = "";
             }
             else if (filePath.EndsWith("Eventlog.aspx", StringComparison.InvariantCultureIgnoreCase))
             {
-                eventlog.Attributes["class"]="firstHere";
-                hyperLinkEventlog.NavigateUrl= "";
+                eventlog.Attributes["class"] = "firstHere";
+                hyperLinkEventlog.NavigateUrl = "";
             }
 
-			if (this.Request.QueryString["date"] != null)
-			{
-				AddDateQueryString(hyperLinkEventlog);
-				AddDateQueryString(hyperLinkReferrers);
-				AddDateQueryString(hyperlinkAggBugs);
-				AddDateQueryString(hyperlinkClickThroughs);
-				AddDateQueryString(hyperlinkUserClickThroughs);
-				AddDateQueryString(hyperlinkCrosspostReferrers);
-			}
-		}
+            if (Request.QueryString["date"] != null)
+            {
+                AddDateQueryString(hyperLinkEventlog);
+                AddDateQueryString(hyperLinkReferrers);
+                AddDateQueryString(hyperlinkAggBugs);
+                AddDateQueryString(hyperlinkClickThroughs);
+                AddDateQueryString(hyperlinkUserClickThroughs);
+                AddDateQueryString(hyperlinkCrosspostReferrers);
+            }
+        }
 
-		private void AddDateQueryString(HyperLink hyperLink)
-		{
-			if (hyperLink.NavigateUrl != String.Empty)
-			{
-				hyperLink.NavigateUrl = String.Format("{0}?date={1}",
-					hyperLink.NavigateUrl,
-					this.Request.QueryString["date"]);
-			}
-		}
+        private void AddDateQueryString(HyperLink hyperLink)
+        {
+            if (hyperLink.NavigateUrl != String.Empty)
+            {
+                hyperLink.NavigateUrl = String.Format("{0}?date={1}",
+                                                      hyperLink.NavigateUrl,
+                                                      Request.QueryString["date"]);
+            }
+        }
 
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e)
-		{
-            resmgr = ((System.Resources.ResourceManager)ApplicationResourceTable.Get());
+        protected void ActivityBox_PreRender(object sender, EventArgs e)
+        {
+            DataBind();
+        }
+
+        #region Web Form Designer generated code
+
+        protected override void OnInit(EventArgs e)
+        {
+            resmgr = ((System.Resources.ResourceManager) ApplicationResourceTable.Get());
             SharedBasePage requestPage = Page as SharedBasePage;
             siteConfig = requestPage.SiteConfig;
 
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{    
-			this.PreRender += new System.EventHandler(this.ActivityBox_PreRender);
+            InitializeComponent();
+            base.OnInit(e);
+        }
 
-		}
-		#endregion
-
-        protected void ActivityBox_PreRender(object sender, EventArgs e)
+        private void InitializeComponent()
         {
-            DataBind();
+            this.PreRender += new System.EventHandler(this.ActivityBox_PreRender);
         }
 
-	}
-}
+        #endregion
+    }
+}
\ No newline at end of file

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AdminNavBar.ascx
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AdminNavBar.ascx	2008-01-12 15:43:20 UTC (rev 796)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AdminNavBar.ascx	2008-01-12 18:18:51 UTC (rev 797)
@@ -1,39 +1,40 @@
-<%@ Control Language="c#" AutoEventWireup="True" Codebehind="AdminNavBar.ascx.cs" Inherits="newtelligence.DasBlog.Web.AdminNavBar" TargetSchema="http://schemas.microsoft.com/intellisense/ie5" %>
+<%@ Control Language="c#" AutoEventWireup="True" Inherits="newtelligence.DasBlog.Web.AdminNavBar" CodeFile="AdminNavBar.ascx.cs" %>
 <div class="adminNavbarStyle" id="DIV1" runat="server">
-	<ul>		
-		<li id="editEntry" class="first" runat="server">
-			<asp:HyperLink runat="server" NavigateUrl="EditEntry.aspx" id="hyperLinkEditEntry" Text='<%# resmgr.GetString("text_admin_add_entry")%>'>
-			</asp:HyperLink>
-		</li>
-		<li id="editUser"  runat="server">
-			<asp:HyperLink runat="server" NavigateUrl="EditUser.aspx" id="hyperLinkEditUser" Text='<%# resmgr.GetString("text_admin_edit_user")%>'>
-			</asp:HyperLink>
-		</li>
-		<li id="activity" runat="server">
-			<asp:HyperLink runat="server" NavigateUrl="Referrers.aspx" id="hyperLinkActivity" Text='<%# resmgr.GetString("text_admin_activity")%>'>
-			</asp:HyperLink>
-		</li>
-		<li id="editConfig" runat="server">
-			<asp:HyperLink runat="server" NavigateUrl="EditConfig.aspx" id="hyperLinkEditConfig" Text='<%# resmgr.GetString("text_admin_config")%>'>
-			</asp:HyperLink>
-		</li>
-		<li id="editContentFilters" runat="server">
-			<asp:HyperLink runat="server" NavigateUrl="EditContentFilters.aspx" id="hyperLinkEditContentFilters" Text='<%# resmgr.GetString("text_admin_content_filters")%>' >
-			</asp:HyperLink>
-		</li>
-		<li id="editBlogRoll" runat="server">
-			<asp:HyperLink runat="server" NavigateUrl="EditBlogRoll.aspx" id="hyperLinkEditBlogRoll" Text='<%# resmgr.GetString("text_admin_blogroll")%>'>
-			</asp:HyperLink>
-		</li>
-		<li id="editNavigatorLinks" runat="server">
-			<asp:HyperLink runat="server" NavigateUrl="EditNavigatorLinks.aspx" id="hyperLinkEditNavigatorLinks" Text='<%# resmgr.GetString("text_admin_navlinks")%>'>
-			</asp:HyperLink>
-		</li>
-		<%if (siteConfig.EnableCrossposts) {%>
-		<li id="editCrossPostSites" runat="server">
-			<asp:HyperLink runat="server" NavigateUrl="EditCrosspostSites.aspx" id="hyperLinkEditCrossPostSites" Text='<%# resmgr.GetString("text_admin_crosspostsites")%>'>
-			</asp:HyperLink>			
-		</li>
-		<%}%>
-	</ul>
+    <ul>
+        <li id="editEntry" class="first" runat="server">
+            <asp:HyperLink runat="server" NavigateUrl="EditEntry.aspx" ID="hyperLinkEditEntry" Text='<%# resmgr.GetString("text_admin_add_entry")%>'>
+            </asp:HyperLink>
+        </li>
+        <li id="editUser" runat="server">
+            <asp:HyperLink runat="server" NavigateUrl="EditUser.aspx" ID="hyperLinkEditUser" Text='<%# resmgr.GetString("text_admin_edit_user")%>'>
+            </asp:HyperLink>
+        </li>
+        <li id="activity" runat="server">
+            <asp:HyperLink runat="server" NavigateUrl="Referrers.aspx" ID="hyperLinkActivity" Text='<%# resmgr.GetString("text_admin_activity")%>'>
+            </asp:HyperLink>
+        </li>
+        <li id="editConfig" runat="server">
+            <asp:HyperLink runat="server" NavigateUrl="EditConfig.aspx" ID="hyperLinkEditConfig" Text='<%# resmgr.GetString("text_admin_config")%>'>
+            </asp:HyperLink>
+        </li>
+        <li id="editContentFilters" runat="server">
+            <asp:HyperLink runat="server" NavigateUrl="EditContentFilters.aspx" ID="hyperLinkEditContentFilters" Text='<%# resmgr.GetString("text_admin_content_filters")%>'>
+            </asp:HyperLink>
+        </li>
+        <li id="editBlogRoll" runat="server">
+            <asp:HyperLink runat="server" NavigateUrl="EditBlogRoll.aspx" ID="hyperLinkEditBlogRoll" Text='<%# resmgr.GetString("text_admin_blogroll")%>'>
+            </asp:HyperLink>
+        </li>
+        <li id="editNavigatorLinks" runat="server">
+            <asp:HyperLink runat="server" NavigateUrl="EditNavigatorLinks.aspx" ID="hyperLinkEditNavigatorLinks" Text='<%# resmgr.GetString("text_admin_navlinks")%>'>
+            </asp:HyperLink>
+        </li>
+        <%if (siteConfig.EnableCrossposts)
+          {%>
+        <li id="editCrossPostSites" runat="server">
+            <asp:HyperLink runat="server" NavigateUrl="EditCrosspostSites.aspx" ID="hyperLinkEditCrossPostSites" Text='<%# resmgr.GetString("text_admin_crosspostsites")%>'>
+            </asp:HyperLink>
+        </li>
+        <%}%>
+    </ul>
 </div>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AdminNavBar.ascx.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AdminNavBar.ascx.cs	2008-01-12 15:43:20 UTC (rev 796)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AdminNavBar.ascx.cs	2008-01-12 18:18:51 UTC (rev 797)
@@ -1,4 +1,5 @@
 #region Copyright (c) 2003, newtelligence AG. All rights reserved.
+
 /*
 // Copyright (c) 2003, newtelligence AG. (http://www.newtelligence.com)
 // Original BlogX Source Code: Copyright (c) 2003, Chris Anderson (http://simplegeek.com)
@@ -35,6 +36,7 @@
 // or following this notice. 
 //
 */
+
 #endregion
 
 using System;
@@ -43,100 +45,90 @@
 
 namespace newtelligence.DasBlog.Web
 {
-    /// <summary>
-	///		Summary description for AdminNavBar.
-	/// </summary>
-	public partial  class AdminNavBar : UserControl
-	{
-		protected ResourceManager resmgr;
-		protected SiteConfig siteConfig;
+    public partial class AdminNavBar : UserControl
+    {
+        protected ResourceManager resmgr;
+        protected SiteConfig siteConfig;
 
-		
-				
-		protected void Page_Load(object sender, EventArgs e)
-		{
-			siteConfig = SiteConfig.GetSiteConfig();
-			
-			resmgr = ((ResourceManager)ApplicationResourceTable.Get());
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            siteConfig = SiteConfig.GetSiteConfig();
 
-			//set the current page <li> tag to here
-            string filePath = this.Request.FilePath;
+            resmgr = ApplicationResourceTable.Get();
 
+            //set the current page <li> tag to here
+            string filePath = Request.FilePath;
+
             if (filePath.EndsWith("EditCrossPostSites.aspx", StringComparison.InvariantCultureIgnoreCase))
-			{
-				editCrossPostSites.Attributes["class"]="here";
-				hyperLinkEditCrossPostSites.NavigateUrl= "";
-			}
+            {
+                editCrossPostSites.Attributes["class"] = "here";
+                hyperLinkEditCrossPostSites.NavigateUrl = "";
+            }
             else if (filePath.EndsWith("EditNavigatorLinks.aspx", StringComparison.InvariantCultureIgnoreCase))
-			{
-				editNavigatorLinks.Attributes["class"]="here";
-				hyperLinkEditNavigatorLinks.NavigateUrl= "";
-			}
-			else if (filePath.EndsWith("EditBlogRoll.aspx", StringComparison.InvariantCultureIgnoreCase))
-			{
-				editBlogRoll.Attributes["class"]="here";
-				hyperLinkEditBlogRoll.NavigateUrl= "";
-			}
-			else if (filePath.EndsWith("EditContentFilters.aspx", StringComparison.InvariantCultureIgnoreCase))
-			{
-				editContentFilters.Attributes["class"]="here";
-				hyperLinkEditContentFilters.NavigateUrl= "";
-			}
-			else if (filePath.EndsWith("EditConfig.aspx", StringComparison.InvariantCultureIgnoreCase))
-			{
-				editConfig.Attributes["class"]="here";
-				hyperLinkEditConfig.NavigateUrl= "";
-			}
-			else if (filePath.EndsWith("Referrers.aspx", StringComparison.InvariantCultureIgnoreCase)||
-                     filePath.EndsWith("Eventlog.aspx", StringComparison.InvariantCultureIgnoreCase)||
-                     filePath.EndsWith("AggBugs.aspx", StringComparison.InvariantCultureIgnoreCase)||
+            {
+                editNavigatorLinks.Attributes["class"] = "here";
+                hyperLinkEditNavigatorLinks.NavigateUrl = "";
+            }
+            else if (filePath.EndsWith("EditBlogRoll.aspx", StringComparison.InvariantCultureIgnoreCase))
+            {
+                editBlogRoll.Attributes["class"] = "here";
+                hyperLinkEditBlogRoll.NavigateUrl = "";
+            }
+            else if (filePath.EndsWith("EditContentFilters.aspx", StringComparison.InvariantCultureIgnoreCase))
+            {
+                editContentFilters.Attributes["class"] = "here";
+                hyperLinkEditContentFilters.NavigateUrl = "";
+            }
+            else if (filePath.EndsWith("EditConfig.aspx", StringComparison.InvariantCultureIgnoreCase))
+            {
+                editConfig.Attributes["class"] = "here";
+                hyperLinkEditConfig.NavigateUrl = "";
+            }
+            else if (filePath.EndsWith("Referrers.aspx", StringComparison.InvariantCultureIgnoreCase) ||
+                     filePath.EndsWith("Eventlog.aspx", StringComparison.InvariantCultureIgnoreCase) ||
+                     filePath.EndsWith("AggBugs.aspx", StringComparison.InvariantCultureIgnoreCase) ||
                      filePath.EndsWith("ClickThroughs.aspx", StringComparison.InvariantCultureIgnoreCase))
-			{
-				activity.Attributes["class"]="here";
-				hyperLinkActivity.NavigateUrl= "";
-			}
-			else if (filePath.EndsWith("EditEntry.aspx", StringComparison.InvariantCultureIgnoreCase))
-			{
-				editEntry.Attributes["class"]="firstHere";
-				hyperLinkEditEntry.NavigateUrl= "";
-			}				
-			else if (filePath.EndsWith("EditUser.aspx", StringComparison.InvariantCultureIgnoreCase))
-			{
-				editUser.Attributes["class"]="here";
-				hyperLinkEditUser.NavigateUrl= "";
-			}
-			
-			// The only tab that should be visible for a contributor is the
-			// "Add Entry" and "User Settings" tab
-			if (SiteSecurity.IsInRole("contributor"))
-			{
-				this.editConfig.Visible = false;
-				this.editCrossPostSites.Visible = false;
-				this.editContentFilters.Visible = false;
-				this.editBlogRoll.Visible = false;
-				this.editNavigatorLinks.Visible = false;
-				this.activity.Visible = false;
-			}
-			DataBind();
-		}
+            {
+                activity.Attributes["class"] = "here";
+                hyperLinkActivity.NavigateUrl = "";
+            }
+            else if (filePath.EndsWith("EditEntry.aspx", StringComparison.InvariantCultureIgnoreCase))
+            {
+                editEntry.Attributes["class"] = "firstHere";
+                hyperLinkEditEntry.NavigateUrl = "";
+            }
+            else if (filePath.EndsWith("EditUser.aspx", StringComparison.InvariantCultureIgnoreCase))
+            {
+                editUser.Attributes["class"] = "here";
+                hyperLinkEditUser.NavigateUrl = "";
+            }
 
-		#region Web Form Designer generated code
-		override protected void OnInit(EventArgs e)
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		///		Required method for Designer support - do not modify
-		///		the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
+            // The only tab that should be visible for a contributor is the
+            // "Add Entry" and "User Settings" tab
+            if (SiteSecurity.IsInRole("contributor"))
+            {
+                editConfig.Visible = false;
+                editCrossPostSites.Visible = false;
+                editContentFilters.Visible = false;
+                editBlogRoll.Visible = false;
+                editNavigatorLinks.Visible = false;
+                activity.Visible = false;
+            }
+            DataBind();
+        }
 
-		}
-		#endregion
-	}
-}
+        #region Web Form Designer generated code
+
+        protected override void OnInit(EventArgs e)
+        {
+            InitializeComponent();
+            base.OnInit(e);
+        }
+
+        private void InitializeComponent()
+        {
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AggBugs.aspx
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AggBugs.aspx	2008-01-12 15:43:20 UTC (rev 796)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AggBugs.aspx	2008-01-12 18:18:51 UTC (rev 797)
@@ -1,2 +1,3 @@
-<%@ Page language="c#" validateRequest="true" Codebehind="AggBugs.aspx.cs" AutoEventWireup="False" Inherits="newtelligence.DasBlog.Web.AggBugs" %>
-<asp:placeholder id="contentPlaceHolder" runat="server"></asp:placeholder>
\ No newline at end of file
+<%@ Page Language="C#" ValidateRequest="true" AutoEventWireup="False" Inherits="newtelligence.DasBlog.Web.AggBugs" CodeFile="AggBugs.aspx.cs" %>
+
+<asp:placeholder id="contentPlaceHolder" runat="server"></asp:placeholder>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AggBugs.aspx.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AggBugs.aspx.cs	2008-01-12 15:43:20 UTC (rev 796)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AggBugs.aspx.cs	2008-01-12 18:18:51 UTC (rev 797)
@@ -1,4 +1,5 @@
 #region Copyright (c) 2003, newtelligence AG. All rights reserved.
+
 /*
 // Copyright (c) 2003, newtelligence AG. (http://www.newtelligence.com)
 // Original BlogX Source Code: Copyright (c) 2003, Chris Anderson (http://simplegeek.com)
@@ -35,6 +36,7 @@
 // or following this notice. 
 //
 */
+
 #endregion
 
 using System;
@@ -45,56 +47,50 @@
 
 namespace newtelligence.DasBlog.Web
 {
-    /// <summary>
-    /// Summary description for WebForm1.
-    /// </summary>
-    public partial class AggBugs : SharedBasePage, IPageFormatInfo 
+    public partial class AggBugs : SharedBasePage, IPageFormatInfo
     {
+        protected override PlaceHolder ContentPlaceHolder
+        {
+            get { return contentPlaceHolder; }
+        }
 
-        
-                
-        override protected void OnInit(EventArgs e)
+        #region IPageFormatInfo Members
+
+        Control IPageFormatInfo.Bodytext
         {
+            get
+            {
+                AggBugsBox AggBugsBox = LoadControl("AggBugsBox.ascx") as AggBugsBox;
+                return AggBugsBox;
+            }
+        }
+
+        #endregion
+
+        protected override void OnInit(EventArgs e)
+        {
             InitializeComponent();
             base.OnInit(e);
         }
-		
-        private void InitializeComponent()
-        {    
-            this.Load += new EventHandler(this.AggBugs_Load);
 
+        private void InitializeComponent()
+        {
+            Load += AggBugs_Load;
         }
 
         protected void AggBugs_Load(object sender, EventArgs e)
         {
-			this.CategoryName = "admin";
+            CategoryName = "admin";
 
-            if (SiteSecurity.IsInRole("admin") == false) 
+            if (SiteSecurity.IsInRole("admin") == false)
             {
                 Response.Redirect("~/FormatPage.aspx?path=SiteConfig/accessdenied.format.html");
             }
         }
-       
-        protected override PlaceHolder ContentPlaceHolder
-        {
-            get
-            {
-                return contentPlaceHolder;
-            }
-        }
 
-		protected override EntryCollection LoadEntries()
-		{
-			return new EntryCollection();
-		}
-
-        Control IPageFormatInfo.Bodytext 
+        protected override EntryCollection LoadEntries()
         {
-            get
-            {
-                AggBugsBox AggBugsBox = LoadControl("AggBugsBox.ascx") as AggBugsBox;
-                return AggBugsBox;
-            }
+            return new EntryCollection();
         }
     }
-}
+}
\ No newline at end of file

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AggBugs.aspx.designer.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AggBugs.aspx.designer.cs	2008-01-12 15:43:20 UTC (rev 796)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AggBugs.aspx.designer.cs	2008-01-12 18:18:51 UTC (rev 797)
@@ -1,10 +1,10 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:2.0.50727.1318
+//     Dieser Code wurde von einem Tool generiert.
+//     Laufzeitversion:2.0.50727.312
 //
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     \xC4nderungen an dieser Datei k\xF6nnen falsches Verhalten verursachen und gehen verloren, wenn
+//     der Code erneut generiert wird.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
@@ -12,19 +12,19 @@
     
     
     /// <summary>
-    /// AggBugs class.
+    /// AggBugs-Klasse.
     /// </summary>
     /// <remarks>
-    /// Auto-generated class.
+    /// Automatisch generierte Klasse.
     /// </remarks>
     public partial class AggBugs {
         
         /// <summary>
-        /// contentPlaceHolder control.
+        /// contentPlaceHolder-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.PlaceHolder contentPlaceHolder;
     }

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AggBugsBox.ascx
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AggBugsBox.ascx	2008-01-12 15:43:20 UTC (rev 796)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AggBugsBox.ascx	2008-01-12 18:18:51 UTC (rev 797)
@@ -1,11 +1,13 @@
 <%@ Register TagPrefix="uc1" TagName="ActivityBox" Src="ActivityBox.ascx" %>
-<%@ Control language="c#" Codebehind="AggBugsBox.ascx.cs" AutoEventWireup="True" Inherits="newtelligence.DasBlog.Web.AggBugsBox" %>
+<%@ Control Language="C#" AutoEventWireup="True" Inherits="newtelligence.DasBlog.Web.AggBugsBox" CodeFile="AggBugsBox.ascx.cs" %>
 <%@ Register TagPrefix="uc1" TagName="LogDateBar" Src="LogDateBar.ascx" %>
-<uc1:ActivityBox id="ActivityBox1" runat="server"></uc1:ActivityBox>
+<uc1:ActivityBox id="ActivityBox1" runat="server">
+</uc1:ActivityBox>
 <div class="bodyContentStyle">
-	<div class="pageTopic">
-		<asp:Label id=Label1 runat="server" Text='<%# newtelligence.DasBlog.Web.ApplicationResourceTable.Get().GetString("text_aggbug_title") %>'>
-		</asp:Label>
-		<uc1:LogDateBar id="LogDateBar1" runat="server"></uc1:LogDateBar></div>
-	<asp:placeholder id="contentPlaceHolder" runat="server"></asp:placeholder>
+    <div class="pageTopic">
+        <asp:Label ID="Label1" runat="server" Text='<%# newtelligence.DasBlog.Web.ApplicationResourceTable.Get().GetString("text_aggbug_title") %>'>
+        </asp:Label>
+        <uc1:LogDateBar id="LogDateBar1" runat="server">
+        </uc1:LogDateBar></div>
+    <asp:PlaceHolder ID="contentPlaceHolder" runat="server"></asp:PlaceHolder>
 </div>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AggBugsBox.ascx.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AggBugsBox.ascx.cs	2008-01-12 15:43:20 UTC (rev 796)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AggBugsBox.ascx.cs	2008-01-12 18:18:51 UTC (rev 797)
@@ -1,14 +1,5 @@
-using System;
-using System.Collections;
-using System.Diagnostics;
-using System.Globalization;
-using System.Web.UI;
-using System.Web.UI.WebControls;
-using newtelligence.DasBlog.Runtime;
-using newtelligence.DasBlog.Util;
-using newtelligence.DasBlog.Web.Core;
+#region Copyright (c) 2003, newtelligence AG. All rights reserved.
 
-#region Copyright (c) 2003, newtelligence AG. All rights reserved.
 /*
 // Copyright (c) 2003, newtelligence AG. (http://www.newtelligence.com)
 // Original BlogX Source Code: Copyright (c) 2003, Chris Anderson (http://simplegeek.com)
@@ -45,181 +36,208 @@
 // or following this notice. 
 //
 */
+
 #endregion
 
+using System;
+using System.Collections;
+using System.Diagnostics;
+using System.Globalization;
+using System.Web.UI;
+using System.Web.UI.WebControls;
+using newtelligence.DasBlog.Runtime;
+using newtelligence.DasBlog.Util;
+using newtelligence.DasBlog.Web.Core;
+
 namespace newtelligence.DasBlog.Web
 {
-	/// <summary>
-	/// Summary description for WebForm1.
-	/// </summary>
-	public partial class AggBugsBox : StatisticsListBase
-	{
-
+    public partial class AggBugsBox : StatisticsListBase
+    {
         protected void Page_Load(object sender, EventArgs e)
         {
         }
 
-		#region Web Form Designer generated code
-		protected override void OnInit(EventArgs e)
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
+        private static void BuildAggBugsRow(TableRow row, StatisticsItem item, object objDataService)
+        {
+            IBlogDataService dataService = objDataService as IBlogDataService;
 
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
-			this.Load += new EventHandler(this.Page_Load);
-			this.PreRender += new EventHandler(this.AggBugsBox_PreRender);
+            HyperLink link = new HyperLink();
 
-		}
-		#endregion
+            string text = SiteUtilities.ClipString(item.identifier, 80);
 
-		private void BuildAggBugsRow(TableRow row, StatisticsItem item, object objDataService)
-		{
-			IBlogDataService dataService = objDataService as IBlogDataService;
+            if (item.identifier != null && item.identifier.Length > 0)
+            {
+                int idx;
+                string id;
 
-			HyperLink link = new HyperLink();
+                // urls in the log have been written using URL Rewriting
+                if (item.identifier.IndexOf("guid,") > -1)
+                {
+                    string guid = item.identifier.Substring(0, item.identifier.Length - 5);
+                    idx = guid.IndexOf("guid,");
+                    id = guid.Substring(idx + 5);
+                }
+                else
+                {
+                    idx = item.identifier.IndexOf("guid=");
+                    id = item.identifier.Substring(idx + 5);
+                }
+                Entry entry = dataService.GetEntry(id);
 
-			string text = SiteUtilities.ClipString(item.identifier, 80);
-			if (item.identifier != null && item.identifier.Length > 0)
-			{
-				int idx;
-				string id;
+                if (entry != null && entry.Title != null && entry.Title.Length > 0)
+                {
+                    text = SiteUtilities.ClipString(entry.Title, 80);
+                }
+            }
 
-				// urls in the log have been written using URL Rewriting
-				if (item.identifier.IndexOf("guid,") > -1)
-				{
-					string guid = item.identifier.Substring(0, item.identifier.Length - 5);
-					idx = guid.IndexOf("guid,");
-					id = guid.Substring(idx + 5);
-				}
-				else
-				{
-					idx = item.identifier.IndexOf("guid=");
-					id = item.identifier.Substring(idx + 5);
-				}
-				Entry entry = dataService.GetEntry(id);
-				if (entry != null && entry.Title != null && entry.Title.Length > 0)
-				{
-					text = SiteUtilities.ClipString(entry.Title, 80);
-				}
-			}
+            link.Text = text;
+            link.NavigateUrl = item.identifier.ToString();
+            row.Cells[0].Controls.Add(link);
+            row.Cells[1].Text = item.count.ToString();
+        }
 
-			link.Text = text;
-			link.NavigateUrl = item.identifier.ToString();
-			row.Cells[0].Controls.Add(link);
-			row.Cells[1].Text = item.count.ToString();
-		}
+        private void AggBugsBox_PreRender(object sender, EventArgs e)
+        {
+            Control root = contentPlaceHolder;
 
-		private void AggBugsBox_PreRender(object sender, EventArgs e)
-		{
-			Control root = contentPlaceHolder;
+            SiteConfig siteConfig = SiteConfig.GetSiteConfig();
+            ILoggingDataService logService =
+                LoggingDataServiceFactory.GetService(SiteConfig.GetLogPathFromCurrentContext());
+            IBlogDataService dataService =
+                BlogDataServiceFactory.GetService(SiteConfig.GetContentPathFromCurrentContext(), logService);
 
-			SiteConfig siteConfig = SiteConfig.GetSiteConfig();
-			ILoggingDataService logService = LoggingDataServiceFactory.GetService(SiteConfig.GetLogPathFromCurrentContext());
-			IBlogDataService dataService = BlogDataServiceFactory.GetService(SiteConfig.GetContentPathFromCurrentContext(), logService);
+            string siteRoot = siteConfig.Root.ToUpper();
 
-			string siteRoot = siteConfig.Root.ToUpper();
+            Hashtable aggBugUrls = new Hashtable();
+            Hashtable userAgents = new Hashtable();
+            Hashtable referrerUrls = new Hashtable();
+            Hashtable userDomains = new Hashtable();
 
-			Hashtable aggBugUrls = new Hashtable();
-			Hashtable userAgents = new Hashtable();
-			Hashtable referrerUrls = new Hashtable();
-			Hashtable userDomains = new Hashtable();
+            // get the user's local time
+            DateTime utcTime = DateTime.UtcNow;
+            DateTime localTime = siteConfig.GetConfiguredTimeZone().ToLocalTime(utcTime);
 
-			// get the user's local time
-			DateTime utcTime = DateTime.UtcNow;
-			DateTime localTime = siteConfig.GetConfiguredTimeZone().ToLocalTime(utcTime);
-			
-			if (Request.QueryString["date"] != null)
-			{
-				try
-				{
-					DateTime popUpTime = DateTime.ParseExact(Request.QueryString["date"], "yyyy-MM-dd", CultureInfo.InvariantCulture);
-					utcTime = new DateTime(popUpTime.Year, popUpTime.Month, popUpTime.Day, utcTime.Hour, utcTime.Minute, utcTime.Second);
-					localTime = new DateTime(popUpTime.Year, popUpTime.Month, popUpTime.Day, localTime.Hour, localTime.Minute, localTime.Second);
-				}
-				catch (FormatException ex)
-				{
-					ErrorTrace.Trace(TraceLevel.Error, ex);
-				}
-			}
+            if (Request.QueryString["date"] != null)
+            {
+                try
+                {
+                    DateTime popUpTime =
+                        DateTime.ParseExact(Request.QueryString["date"], "yyyy-MM-dd", CultureInfo.InvariantCulture);
+                    new DateTime(popUpTime.Year, popUpTime.Month, popUpTime.Day, utcTime.Hour, utcTime.Minute,
+                                 utcTime.Second);
+                    localTime =
+                        new DateTime(popUpTime.Year, popUpTime.Month, popUpTime.Day, localTime.Hour, localTime.Minute,
+                                     localTime.Second);
+                }
+                catch (FormatException ex)
+                {
+                    ErrorTrace.Trace(TraceLevel.Error, ex);
+                }
+            }
 
-			LogDataItemCollection logItems = new LogDataItemCollection();
-			logItems.AddRange(logService.GetAggregatorBugHitsForDay(localTime));
+            LogDataItemCollection logItems = new LogDataItemCollection();
+            logItems.AddRange(logService.GetAggregatorBugHitsForDay(localTime));
 
-			if (siteConfig.AdjustDisplayTimeZone)
-			{
-				WindowsTimeZone tz = siteConfig.GetConfiguredTimeZone();
-				TimeSpan ts = tz.GetUtcOffset(DateTime.UtcNow);
-				int offset = ts.Hours;
+            if (siteConfig.AdjustDisplayTimeZone)
+            {
+                WindowsTimeZone tz = siteConfig.GetConfiguredTimeZone();
+                TimeSpan ts = tz.GetUtcOffset(DateTime.UtcNow);
+                int offset = ts.Hours;
 
-				if (offset < 0)
-				{
-					logItems.AddRange(logService.GetAggregatorBugHitsForDay(localTime.AddDays(1)));
-				}
-				else
-				{
-					logItems.AddRange(logService.GetAggregatorBugHitsForDay(localTime.AddDays(-1)));
-				}
-			}
+                if (offset < 0)
+                {
+                    logItems.AddRange(logService.GetAggregatorBugHitsForDay(localTime.AddDays(1)));
+                }
+                else
+                {
+                    logItems.AddRange(logService.GetAggregatorBugHitsForDay(localTime.AddDays(-1)));
+                }
+            }
 
-			foreach (LogDataItem log in logItems)
-			{
-				bool exclude = false;
-				if (log.UrlReferrer != null)
-				{
-					exclude = log.UrlReferrer.ToUpper().StartsWith(siteRoot);
-				}
+            foreach (LogDataItem log in logItems)
+            {
+                bool exclude = false;
 
-				if (siteConfig.AdjustDisplayTimeZone)
-				{
-					if (siteConfig.GetConfiguredTimeZone().ToLocalTime(log.RequestedUtc).Date != localTime.Date)
-					{
-						exclude = true;
-					}
-				}
+                if (log.UrlReferrer != null)
+                {
+                    exclude = log.UrlReferrer.ToUpper().StartsWith(siteRoot);
+                }
 
-				if (!exclude)
-				{
-					if (!referrerUrls.Contains(log.UrlReferrer))
-					{
-						referrerUrls[log.UrlReferrer] = 0;
-					}
-					referrerUrls[log.UrlReferrer] = ((int) referrerUrls[log.UrlReferrer]) + 1;
+                if (siteConfig.AdjustDisplayTimeZone)
+                {
+                    if (siteConfig.GetConfiguredTimeZone().ToLocalTime(log.RequestedUtc).Date != localTime.Date)
+                    {
+                        exclude = true;
+                    }
+                }
 
-					if (!aggBugUrls.Contains(log.UrlRequested))
-					{
-						aggBugUrls[log.UrlRequested] = 0;
-					}
-					aggBugUrls[log.UrlRequested] = ((int) aggBugUrls[log.UrlRequested]) + 1;
+                if (!exclude)
+                {
+                    if (!referrerUrls.Contains(log.UrlReferrer))
+                    {
+                        referrerUrls[log.UrlReferrer] = 0;
+                    }
 
-					if (!userAgents.Contains(log.UserAgent))
-					{
-						userAgents[log.UserAgent] = 0;
-					}
-					userAgents[log.UserAgent] = ((int) userAgents[log.UserAgent]) + 1;
+                    referrerUrls[log.UrlReferrer] = ((int) referrerUrls[log.UrlReferrer]) + 1;
 
-					if(!userDomains.Contains(log.UserDomain))
-					{
-						userDomains[log.UserDomain] = 0;
-					}
-					userDomains[log.UserDomain] = ((int) userDomains[log.UserDomain]) + 1;
-				}
-			}
+                    if (!aggBugUrls.Contains(log.UrlRequested))
+                    {
+                        aggBugUrls[log.UrlRequested] = 0;
+                    }
 
-            root.Controls.Add(BuildStatisticsTable(GenerateSortedItemList(aggBugUrls), resmgr.GetString("text_activity_read_posts"), resmgr.GetString("text_activity_hits"), new StatisticsBuilderCallback(this.BuildAggBugsRow), dataService));
-            root.Controls.Add(BuildStatisticsTable(GenerateSortedItemList(referrerUrls), resmgr.GetString("text_activity_referrer_urls"), resmgr.GetString("text_activity_hits"), new StatisticsBuilderCallback(this.BuildReferrerRow), dataService));
-            root.Controls.Add(BuildStatisticsTable(GenerateSortedItemList(userDomains), resmgr.GetString("text_activity_user_domains"), resmgr.GetString("text_activity_hits"), new StatisticsBuilderCallback(this.BuildUserDomainRow), dataService));
-            root.Controls.Add(BuildStatisticsTable(GenerateSortedItemList(userAgents), resmgr.GetString("text_activity_user_agent"), resmgr.GetString("text_activity_hits"), new StatisticsBuilderCallback(this.BuildAgentsRow), dataService));
+                    aggBugUrls[log.UrlRequested] = ((int) aggBugUrls[log.UrlRequested]) + 1;
 
-			DataBind();
-		}
-	}
-}
+                    if (!userAgents.Contains(log.UserAgent))
+                    {
+                        userAgents[log.UserAgent] = 0;
+                    }
+
+                    userAgents[log.UserAgent] = ((int) userAgents[log.UserAgent]) + 1;
+
+                    if (!userDomains.Contains(log.UserDomain))
+                    {
+                        userDomains[log.UserDomain] = 0;
+                    }
+
+                    userDomains[log.UserDomain] = ((int) userDomains[log.UserDomain]) + 1;
+                }
+            }
+
+            root.Controls.Add(
+                BuildStatisticsTable(GenerateSortedItemList(aggBugUrls), resmgr.GetString("text_activity_read_posts"),
+                                     resmgr.GetString("text_activity_hits"),
+                                     BuildAggBugsRow, dataService));
+            root.Controls.Add(
+                BuildStatisticsTable(GenerateSortedItemList(referrerUrls),
+                                     resmgr.GetString("text_activity_referrer_urls"),
+                                     resmgr.GetString("text_activity_hits"),
+                                     BuildReferrerRow, dataService));
+            root.Controls.Add(
+                BuildStatisticsTable(GenerateSortedItemList(userDomains), resmgr.GetString("text_activity_user_domains"),
+                                     resmgr.GetString("text_activity_hits"),
+                                     BuildUserDomainRow, dataService));
+            root.Controls.Add(
+                BuildStatisticsTable(GenerateSortedItemList(userAgents), resmgr.GetString("text_activity_user_agent"),
+                                     resmgr.GetString("text_activity_hits"),
+                                     BuildAgentsRow, dataService));
+
+            DataBind();
+        }
+
+        #region Web Form Designer generated code
+
+        protected override void OnInit(EventArgs e)
+        {
+            InitializeComponent();
+            base.OnInit(e);
+        }
+
+        private void InitializeComponent()
+        {
+            this.Load += new EventHandler(this.Page_Load);
+            this.PreRender += new EventHandler(this.AggBugsBox_PreRender);
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AggBugsBox.ascx.designer.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AggBugsBox.ascx.designer.cs	2008-01-12 15:43:20 UTC (rev 796)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AggBugsBox.ascx.designer.cs	2008-01-12 18:18:51 UTC (rev 797)
@@ -1,10 +1,10 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:2.0.50727.1318
+//     Dieser Code wurde von einem Tool generiert.
+//     Laufzeitversion:2.0.50727.312
 //
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     \xC4nderungen an dieser Datei k\xF6nnen falsches Verhalten verursachen und gehen verloren, wenn
+//     der Code erneut generiert wird.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
@@ -12,46 +12,46 @@
     
     
     /// <summary>
-    /// AggBugsBox class.
+    /// AggBugsBox-Klasse.
     /// </summary>
     /// <remarks>
-    /// Auto-generated class.
+    /// Automatisch generierte Klasse.
     /// </remarks>
     public partial class AggBugsBox {
         
         /// <summary>
-        /// ActivityBox1 control.
+        /// ActivityBox1-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::newtelligence.DasBlog.Web.ActivityBox ActivityBox1;
         
         /// <summary>
-        /// Label1 control.
+        /// Label1-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label Label1;
         
         /// <summary>
-        /// LogDateBar1 control.
+        /// LogDateBar1-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::newtelligence.DasBlog.Web.LogDateBar LogDateBar1;
         
         /// <summary>
-        /// contentPlaceHolder control.
+        /// contentPlaceHolder-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.PlaceHolder contentPlaceHolder;
     }

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ApplicationResourceTable.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ApplicationResourceTable.cs	2008-01-12 15:43:20 UTC (rev 796)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ApplicationResourceTable.cs	2008-01-12 18:18:51 UTC (rev 797)
@@ -5,8 +5,7 @@
 namespace newtelligence.DasBlog.Web
 {
     /// <summary>
-    /// This class keeps a singleton reference to the application's
-    /// resource table
+    /// This class keeps a singleton reference to the application's resource table
     /// </summary>
     public class ApplicationResourceTable
     {
@@ -14,7 +13,7 @@
 
         static ApplicationResourceTable()
         {
-            rm = new ResourceManager("newtelligence.DasBlog.Web.StringTables.StringTables", typeof(Global).Assembly );
+            rm = new ResourceManager("newtelligence.DasBlog.Web.StringTables.StringTables", typeof (Global).Assembly);
         }
 
         public static ResourceManager Get()
@@ -22,21 +21,24 @@
             return rm;
         }
 
-		public static string GetSpamStateDescription(SpamState spamState)
-		{
-			if (spamState == SpamState.NotChecked)
-			{
-				return rm.GetString("text_spamstate_notchecked");
-			} 
-			if (spamState == SpamState.NotSpam)
-			{
-				return rm.GetString("text_spamstate_notspam");
-			}
-			if (spamState == SpamState.Spam)
-			{
-				return rm.GetString("text_spamstate_spam");
-			}
-			return String.Empty;
-		}
+        public static string GetSpamStateDescription(SpamState spamState)
+        {
+            if (spamState == SpamState.NotChecked)
+            {
+                return rm.GetString("text_spamstate_notchecked");
+            }
+
+            if (spamState == SpamState.NotSpam)
+            {
+                return rm.GetString("text_spamstate_notspam");
+            }
+
+            if (spamState == SpamState.Spam)
+            {
+                return rm.GetString("text_spamstate_spam");
+            }
+
+            return String.Empty;
+        }
     }
-}
+}
\ No newline at end of file

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Archives.aspx
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Archives.aspx	2008-01-12 15:43:20 UTC (rev 796)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Archives.aspx	2008-01-12 18:18:51 UTC (rev 797)
@@ -1,3 +1,4 @@
-<%@ Page language="c#" validateRequest="true" Codebehind="Archives.aspx.cs" AutoEventWireup="False" Inherits="newtelligence.DasBlog.Web.Archives" %>
+<%@ Page Language="C#" ValidateRequest="true" AutoEventWireup="False" Inherits="newtelligence.DasBlog.Web.Archives" CodeFile="Archives.aspx.cs" %>
+
 <%@ OutputCache Duration="1800" VaryByParam="*" VaryByHeader="Accept-Language" %>
 <asp:placeholder id="contentPlaceHolder" runat="server"></asp:placeholder>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Archives.aspx.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Archives.aspx.cs	2008-01-12 15:43:20 UTC (rev 796)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Archives.aspx.cs	2008-01-12 18:18:51 UTC (rev 797)
@@ -6,38 +6,36 @@
 
 namespace newtelligence.DasBlog.Web
 {
-	public partial class Archives : SharedBasePage, IPageFormatInfo
-	{
+    public partial class Archives : SharedBasePage, IPageFormatInfo
+    {
+        protected override PlaceHolder ContentPlaceHolder
+        {
+            get { return contentPlaceHolder; }
+        }
 
-		public Archives()
-		{
-			
-		}
+        #region IPageFormatInfo Members
 
-		protected override void OnInit(EventArgs e)
-		{
-			InitializeComponent();
-			base.OnInit(e);
-		}
+        public Control Bodytext
+        {
+            get { return LoadControl("ArchivesControl.ascx"); }
+        }
 
-		private void InitializeComponent()
-		{
-		}
+        #endregion
 
-		protected override PlaceHolder ContentPlaceHolder
-		{
-			get { return contentPlaceHolder; }
-		}
+        protected override void OnInit(EventArgs e)
+        {
+            InitializeComponent();
+            base.OnInit(e);
+        }
 
-		protected override EntryCollection LoadEntries()
-		{
-			base.TitleOverride = "Archives";
-			return new EntryCollection();
-		}
+        private void InitializeComponent()
+        {
+        }
 
-		public Control Bodytext
-		{
-			get { return LoadControl("ArchivesControl.ascx"); }
-		}
-	}
+        protected override EntryCollection LoadEntries()
+        {
+            TitleOverride = "Archives";
+            return new EntryCollection();
+        }
+    }
 }
\ No newline at end of file

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Archives.aspx.designer.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Archives.aspx.designer.cs	2008-01-12 15:43:20 UTC (rev 796)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Archives.aspx.designer.cs	2008-01-12 18:18:51 UTC (rev 797)
@@ -1,10 +1,10 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:2.0.50727.1318
+//     Dieser Code wurde von einem Tool generiert.
+//     Laufzeitversion:2.0.50727.312
 //
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     \xC4nderungen an dieser Datei k\xF6nnen falsches Verhalten verursachen und gehen verloren, wenn
+//     der Code erneut generiert wird.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
@@ -12,19 +12,19 @@
     
     
     /// <summary>
-    /// Archives class.
+    /// Archives-Klasse.
     /// </summary>
     /// <remarks>
-    /// Auto-generated class.
+    /// Automatisch generierte Klasse.
     /// </remarks>
     public partial class Archives {
         
         /// <summary>
-        /// contentPlaceHolder control.
+        /// contentPlaceHolder-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.PlaceHolder contentPlaceHolder;
     }

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ArchivesControl.ascx
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ArchivesControl.ascx	2008-01-12 15:43:20 UTC (rev 796)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ArchivesControl.ascx	2008-01-12 18:18:51 UTC (rev 797)
@@ -1,4 +1,5 @@
-<%@ Control Language="c#" AutoEventWireup="True" Codebehind="ArchivesControl.ascx.cs" Inherits="newtelligence.DasBlog.Web.ArchivesControl" TargetSchema="http://schemas.microsoft.com/intellisense/ie5" %>
+<%@ Control Language="c#" AutoEventWireup="True" Inherits="newtelligence.DasBlog.Web.ArchivesControl"
+    CodeFile="ArchivesControl.ascx.cs" %>
 <div class="bodyContentStyle">
-	<asp:PlaceHolder id="contentPlaceHolder" runat="server"></asp:PlaceHolder>
+    <asp:PlaceHolder ID="contentPlaceHolder" runat="server"></asp:PlaceHolder>
 </div>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ArchivesControl.ascx.designer.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ArchivesControl.ascx.designer.cs	2008-01-12 15:43:20 UTC (rev 796)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ArchivesControl.ascx.designer.cs	2008-01-12 18:18:51 UTC (rev 797)
@@ -1,10 +1,10 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:2.0.50727.1318
+//     Dieser Code wurde von einem Tool generiert.
+//     Laufzeitversion:2.0.50727.312
 //
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     \xC4nderungen an dieser Datei k\xF6nnen falsches Verhalten verursachen und gehen verloren, wenn
+//     der Code erneut generiert wird.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
@@ -12,19 +12,19 @@
     
     
     /// <summary>
-    /// ArchivesControl class.
+    /// ArchivesControl-Klasse.
     /// </summary>
     /// <remarks>
-    /// Auto-generated class.
+    /// Automatisch generierte Klasse.
     /// </remarks>
     public partial class ArchivesControl {
         
         /// <summary>
-        /// contentPlaceHolder control.
+        /// contentPlaceHolder-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.PlaceHolder contentPlaceHolder;
     }

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/BlogRollControl.ascx
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/BlogRollControl.ascx	2008-01-12 15:43:20 UTC (rev 796)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/BlogRollControl.ascx	2008-01-12 18:18:51 UTC (rev 797)
@@ -1,6 +1,6 @@
-<%@ Control Language="c#" AutoEventWireup="True" Codebehind="BlogRollControl.ascx.cs" Inherits="newtelligence.DasBlog.Web.BlogRollControl" TargetSchema="http://schemas.microsoft.com/intellisense/ie5" %>
+<%@ Control Language="c#" AutoEventWireup="True" Inherits="newtelligence.DasBlog.Web.BlogRollControl" CodeFile="BlogRollControl.ascx.cs" %>
 <div class="bodyContentStyle">
-	<div id="footer">
-		<asp:PlaceHolder id="contentPlaceHolder" runat="server"></asp:PlaceHolder>
-	</div>
+    <div id="footer">
+        <asp:PlaceHolder ID="contentPlaceHolder" runat="server"></asp:PlaceHolder>
+    </div>
 </div>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/BlogRollControl.ascx.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/BlogRollControl.ascx.cs	2008-01-12 15:43:20 UTC (rev 796)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/BlogRollControl.ascx.cs	2008-01-12 18:18:51 UTC (rev 797)
@@ -7,46 +7,42 @@
 
 namespace newtelligence.DasBlog.Web
 {
-	public partial class BlogRollControl : UserControl
-	{
+    public partial class BlogRollControl : UserControl
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            // Load up the OPML
 
-		public BlogRollControl()
-		{
-		}
-
-		protected void Page_Load(object sender, EventArgs e)
-		{
-			// Load up the OPML
-
-            //FIX: fix hardcoded paths
-			string opmlPath = SiteUtilities.MapPath("siteconfig\\blogroll.opml");
+            // TODO: fix hardcoded paths
+            string opmlPath = SiteUtilities.MapPath("siteconfig\\blogroll.opml");
             string xsltPath = SiteUtilities.MapPath("siteconfig\\opml.xslt");
 
-			XPathDocument xmlOpml = new XPathDocument(opmlPath);
+            XPathDocument xmlOpml = new XPathDocument(opmlPath);
             XslCompiledTransform xmlTransform = new XslCompiledTransform();
 
-			// Load up the files
-			xmlTransform.Load(xsltPath);
+            // Load up the files
+            xmlTransform.Load(xsltPath);
 
-			// Transform
-            using (StringWriter sw = new StringWriter()) {
+            // Transform
+            using (StringWriter sw = new StringWriter())
+            {
                 xmlTransform.Transform(xmlOpml, null, sw);
 
                 contentPlaceHolder.Controls.Add(new LiteralControl(sw.ToString()));
             }
 
-			DataBind();
-		}
+            DataBind();
+        }
 
-		protected override void OnInit(EventArgs e)
-		{
-			InitializeComponent();
-			base.OnInit(e);
-		}
+        protected override void OnInit(EventArgs e)
+        {
+            InitializeComponent();
+            base.OnInit(e);
+        }
 
-		private void InitializeComponent()
-		{
-			this.Load += new EventHandler(this.Page_Load);
-		}
-	}
-}
+        private void InitializeComponent()
+        {
+            Load += Page_Load;
+        }
+    }
+}
\ No newline at end of file

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/BlogRollControl.ascx.designer.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/BlogRollControl.ascx.designer.cs	2008-01-12 15:43:20 UTC (rev 796)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/BlogRollControl.ascx.designer.cs	2008-01-12 18:18:51 UTC (rev 797)
@@ -1,10 +1,10 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:2.0.50727.1318
+//     Dieser Code wurde von einem Tool generiert.
+//     Laufzeitversion:2.0.50727.312
 //
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     \xC4nderungen an dieser Datei k\xF6nnen falsches Verhalten verursachen und gehen verloren, wenn
+//     der Code erneut generiert wird.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
@@ -12,19 +12,19 @@
     
     
     /// <summary>
-    /// BlogRollControl class.
+    /// BlogRollControl-Klasse.
     /// </summary>
     /// <remarks>
-    /// Auto-generated class.
+    /// Automatisch generierte Klasse.
     /// </remarks>
     public partial class BlogRollControl {
         
         /// <summary>
-        /// contentPlaceHolder control.
+        /// contentPlaceHolder-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.PlaceHolder contentPlaceHolder;
     }

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Blogroll.aspx
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Blogroll.aspx	2008-01-12 15:43:20 UTC (rev 796)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Blogroll.aspx	2008-01-12 18:18:51 UTC (rev 797)
@@ -1,3 +1,4 @@
-<%@ Page language="c#" validateRequest="true" Codebehind="Blogroll.aspx.cs" AutoEventWireup="False" Inherits="newtelligence.DasBlog.Web.Blogroll" %>
+<%@ Page Language="C#" ValidateRequest="true" AutoEventWireup="False" Inherits="newtelligence.DasBlog.Web.Blogroll" CodeFile="Blogroll.aspx.cs" %>
+
 <%@ OutputCache Duration="1800" VaryByParam="*" VaryByHeader="Accept-Language" %>
-<asp:placeholder id="contentPlaceHolder" runat="server"></asp:placeholder>
\ No newline at end of file
+<asp:placeholder id="contentPlaceHolder" runat="server"></asp:placeholder>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Blogroll.aspx.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Blogroll.aspx.cs	2008-01-12 15:43:20 UTC (rev 796)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Blogroll.aspx.cs	2008-01-12 18:18:51 UTC (rev 797)
@@ -6,41 +6,41 @@
 
 namespace newtelligence.DasBlog.Web
 {
+    public partial class Blogroll : SharedBasePage, IPageFormatInfo
+    {
+        public Blogroll()
+        {
+            errorHandlingOff = true;
+        }
 
-	#region Blogroll.aspx
-	public partial class Blogroll : SharedBasePage, IPageFormatInfo
-	{
+        protected override PlaceHolder ContentPlaceHolder
+        {
+            get { return contentPlaceHolder; }
+        }
 
-		public Blogroll()
-		{
-			errorHandlingOff = true;
-		}
+        #region IPageFormatInfo Members
 
-		protected override void OnInit(EventArgs e)
-		{
-			InitializeComponent();
-			base.OnInit(e);
-		}
+        public Control Bodytext
+        {
+            get { return LoadControl("BlogRollControl.ascx"); }
+        }
 
-		private void InitializeComponent()
-		{
-		}
+        #endregion
 
-		protected override PlaceHolder ContentPlaceHolder
-		{
-			get { return contentPlaceHolder; }
-		}
+        protected override void OnInit(EventArgs e)
+        {
+            InitializeComponent();
+            base.OnInit(e);
+        }
 
-		protected override EntryCollection LoadEntries()
-		{
-			base.TitleOverride = "Blogroll";
-			return new EntryCollection();
-		}
+        private void InitializeComponent()
+        {
+        }
 
-		public Control Bodytext
-		{
-			get { return LoadControl("BlogRollControl.ascx"); }
-		}
-	}
-	#endregion
+        protected override EntryCollection LoadEntries()
+        {
+            TitleOverride = "Blogroll";
+            return new EntryCollection();
+        }
+    }
 }
\ No newline at end of file

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Blogroll.aspx.designer.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Blogroll.aspx.designer.cs	2008-01-12 15:43:20 UTC (rev 796)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Blogroll.aspx.designer.cs	2008-01-12 18:18:51 UTC (rev 797)
@@ -1,10 +1,10 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:2.0.50727.1318
+//     Dieser Code wurde von einem Tool generiert.
+//     Laufzeitversion:2.0.50727.312
 //
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     \xC4nderungen an dieser Datei k\xF6nnen falsches Verhalten verursachen und gehen verloren, wenn
+//     der Code erneut generiert wird.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
@@ -12,19 +12,19 @@
     
     
     /// <summary>
-    /// Blogroll class.
+    /// Blogroll-Klasse.
     /// </summary>
     /// <remarks>
-    /// Auto-generated class.
+    /// Automatisch generierte Klasse.
     /// </remarks>
     public partial class Blogroll {
         
         /// <summary>
-        /// contentPlaceHolder control.
+        /// contentPlaceHolder-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.PlaceHolder contentPlaceHolder;
     }

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/CategoryView.aspx
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/CategoryView.aspx	2008-01-12 15:43:20 UTC (rev 796)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/CategoryView.aspx	2008-01-12 18:18:51 UTC (rev 797)
@@ -1,3 +1,5 @@
-<%@ Page language="c#" validateRequest="true" Codebehind="CategoryView.aspx.cs" AutoEventWireup="False" Inherits="newtelligence.DasBlog.Web.CategoryView" %>
-<%@ OutputCache Duration="900" VaryByParam="*" VaryByHeader="Accept-Language"  %>
-<asp:placeholder id="contentPlaceHolder" runat="server"></asp:placeholder>
\ No newline at end of file
+<%@ Page Language="C#" ValidateRequest="true" AutoEventWireup="False" Inherits="newtelligence.DasBlog.Web.CategoryView"
+    CodeFile="CategoryView.aspx.cs" %>
+
+<%@ OutputCache Duration="900" VaryByParam="*" VaryByHeader="Accept-Language" %>
+<asp:placeholder id="contentPlaceHolder" runat="server"></asp:placeholder>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/CategoryView.aspx.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/CategoryView.aspx.cs	2008-01-12 15:43:20 UTC (rev 796)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/CategoryView.aspx.cs	2008-01-12 18:18:51 UTC (rev 797)
@@ -1,4 +1,5 @@
 #region Copyright (c) 2003, newtelligence AG. All rights reserved.
+
 /*
 // Copyright (c) 2003, newtelligence AG. (http://www.newtelligence.com)
 // Original BlogX Source Code: Copyright (c) 2003, Chris Anderson (http://simplegeek.com)
@@ -35,6 +36,7 @@
 // or following this notice. 
 //
 */
+
 #endregion
 
 using System;
@@ -45,71 +47,73 @@
 
 namespace newtelligence.DasBlog.Web
 {
-	public partial class CategoryView : SharedBasePage
-	{
-		protected override PlaceHolder ContentPlaceHolder
-		{
-			get { return contentPlaceHolder; }
-		}
+    public partial class CategoryView : SharedBasePage
+    {
+        protected override PlaceHolder ContentPlaceHolder
+        {
+            get { return contentPlaceHolder; }
+        }
 
-		protected override EntryCollection LoadEntries()
-		{
-			SharedBasePage requestPage = Page as SharedBasePage;
+        protected override EntryCollection LoadEntries()
+        {
+            SharedBasePage requestPage = Page as SharedBasePage;
 
-			EntryCollection entryCollection = DataService.GetEntriesForCategory(categoryName, Request.Headers["Accept-Language"]);
+            EntryCollection entryCollection =
+                DataService.GetEntriesForCategory(categoryName, Request.Headers["Accept-Language"]);
 
-			if (!requestPage.SiteConfig.CategoryAllEntries)
-			{
-				// Do some paging if we are NOT showing all entries in category view.
-				string pageString = Request.QueryString.Get("page");
-				int page;
-				if (!int.TryParse(pageString, out page))
-				{
-					page = 1;
-				}
+            if (!requestPage.SiteConfig.CategoryAllEntries)
+            {
+                // Do some paging if we are NOT showing all entries in category view.
+                string pageString = Request.QueryString.Get("page");
+                int page;
+                if (!int.TryParse(pageString, out page))
+                {
+                    page = 1;
+                }
 
-				if (page != 0)
-				{
-					int count = entryCollection.Count;
-					if (count == 0)
-					{
-						Response.Redirect(SiteUtilities.GetBaseUrl());
-					}
+                if (page != 0)
+                {
+                    int count = entryCollection.Count;
+                    if (count == 0)
+                    {
+                        Response.Redirect(SiteUtilities.GetBaseUrl());
+                    }
 
-					int entriesPerPage = SiteConfig.EntriesPerPage;
-					int maxPage = (int) Math.Ceiling((double) count / (double) entriesPerPage);
-					if (page > maxPage)
-					{
-						page = maxPage;
-					}
-					int lastEntryToInclude = page * entriesPerPage;
+                    int entriesPerPage = SiteConfig.EntriesPerPage;
+                    int maxPage = (int) Math.Ceiling(count/(double) entriesPerPage);
 
-					// page = 1, remove everything after.
-					// page = maxPage, remove everything before.
-					// 1 < page < maxPage, remove left and right.
-					if (page == maxPage)
-					{
-						entryCollection.RemoveRange(0, lastEntryToInclude - entriesPerPage);
-					}
-					else
-					{
-						// Remove to the right.
-						entryCollection.RemoveRange(lastEntryToInclude, count - lastEntryToInclude);
-						// Remove to the left.
-						entryCollection.RemoveRange(0, lastEntryToInclude - entriesPerPage);
-					}
+                    if (page > maxPage)
+                    {
+                        page = maxPage;
+                    }
+                    int lastEntryToInclude = page*entriesPerPage;
 
-					HttpContext.Current.Items["page"] = page;
-					HttpContext.Current.Items["maxpage"] = maxPage;
-				}
-			}
+                    // page = 1, remove everything after.
+                    // page = maxPage, remove everything before.
+                    // 1 < page < maxPage, remove left and right.
+                    if (page == maxPage)
+                    {
+                        entryCollection.RemoveRange(0, lastEntryToInclude - entriesPerPage);
+                    }
+                    else
+                    {
+                        // Remove to the right.
+                        entryCollection.RemoveRange(lastEntryToInclude, count - lastEntryToInclude);
+                        // Remove to the left.
+                        entryCollection.RemoveRange(0, lastEntryToInclude - entriesPerPage);
+                    }
 
-			return entryCollection;
-		}
+                    HttpContext.Current.Items["page"] = page;
+                    HttpContext.Current.Items["maxpage"] = maxPage;
+                }
+            }
 
-		protected override Macros InitializeMacros()
-		{
-			return MacrosFactory.CreateMacrosInstance(this);
-		}
-	}
+            return entryCollection;
+        }
+
+        protected override Macros InitializeMacros()
+        {
+            return MacrosFactory.CreateMacrosInstance(this);
+        }
+    }
 }
\ No newline at end of file

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/CategoryView.aspx.designer.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/CategoryView.aspx.designer.cs	2008-01-12 15:43:20 UTC (rev 796)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/CategoryView.aspx.designer.cs	2008-01-12 18:18:51 UTC (rev 797)
@@ -1,10 +1,10 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:2.0.50727.1318
+//     Dieser Code wurde von einem Tool generiert.
+//     Laufzeitversion:2.0.50727.312
 //
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     \xC4nderungen an dieser Datei k\xF6nnen falsches Verhalten verursachen und gehen verloren, wenn
+//     der Code erneut generiert wird.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
@@ -12,19 +12,19 @@
     
     
     /// <summary>
-    /// CategoryView class.
+    /// CategoryView-Klasse.
     /// </summary>
     /// <remarks>
-    /// Auto-generated class.
+    /// Automatisch generierte Klasse.
     /// </remarks>
     public partial class CategoryView {
         
         /// <summary>
-        /// contentPlaceHolder control.
+        /// contentPlaceHolder-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.PlaceHolder contentPlaceHolder;
     }

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ClickThroughs.aspx
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ClickThroughs.aspx	2008-01-12 15:43:20 UTC (rev 796)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ClickThroughs.aspx	2008-01-12 18:18:51 UTC (rev 797)
@@ -1,2 +1,4 @@
-<%@ Page language="c#" validateRequest="true" Codebehind="ClickThroughs.aspx.cs" AutoEventWireup="False" Inherits="newtelligence.DasBlog.Web.ClickThroughs" %>
-<asp:placeholder id="contentPlaceHolder" runat="server"></asp:placeholder>
\ No newline at end of file
+<%@ Page Language="C#" ValidateRequest="true" AutoEventWireup="False" Inherits="newtelligence.DasBlog.Web.ClickThroughs"
+    CodeFile="ClickThroughs.aspx.cs" %>
+
+<asp:placeholder id="contentPlaceHolder" runat="server"></asp:placeholder>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ClickThroughs.aspx.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ClickThroughs.aspx.cs	2008-01-12 15:43:20 UTC (rev 796)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ClickThroughs.aspx.cs	2008-01-12 18:18:51 UTC (rev 797)
@@ -1,4 +1,5 @@
 #region Copyright (c) 2003, newtelligence AG. All rights reserved.
+
 /*
 // Copyright (c) 2003, newtelligence AG. (http://www.newtelligence.com)
 // Original BlogX Source Code: Copyright (c) 2003, Chris Anderson (http://simplegeek.com)
@@ -35,6 +36,7 @@
 // or following this notice. 
 //
 */
+
 #endregion
 
 using System;
@@ -45,56 +47,50 @@
 
 namespace newtelligence.DasBlog.Web
 {
-    /// <summary>
-    /// Summary description for WebForm1.
-    /// </summary>
-    public partial class ClickThroughs : SharedBasePage, IPageFormatInfo 
+    public partial class ClickThroughs : SharedBasePage, IPageFormatInfo
     {
+        protected override PlaceHolder ContentPlaceHolder
+        {
+            get { return contentPlaceHolder; }
+        }
 
-        
-                
-        override protected void OnInit(EventArgs e)
+        #region IPageFormatInfo Members
+
+        Control IPageFormatInfo.Bodytext
         {
+            get
+            {
+                ClickThroughsBox ClickThroughsBox = LoadControl("ClickThroughsBox.ascx") as ClickThroughsBox;
+                return ClickThroughsBox;
+            }
+        }
+
+        #endregion
+
+        protected override void OnInit(EventArgs e)
+        {
             InitializeComponent();
             base.OnInit(e);
         }
-		
-        private void InitializeComponent()
-        {    
-            this.Load += new EventHandler(this.ClickThroughs_Load);
 
+        private void InitializeComponent()
+        {
+            Load += ClickThroughs_Load;
         }
 
         protected void ClickThroughs_Load(object sender, EventArgs e)
         {
-			this.CategoryName = "admin";
+            CategoryName = "admin";
 
-            if (SiteSecurity.IsInRole("admin") == false) 
+            if (SiteSecurity.IsInRole("admin") == false)
             {
                 Response.Redirect("~/FormatPage.aspx?path=SiteConfig/accessdenied.format.html");
             }
         }
-       
-        protected override PlaceHolder ContentPlaceHolder
-        {
-            get
-            {
-                return contentPlaceHolder;
-            }
-        }
 
-		protected override EntryCollection LoadEntries()
-		{
-			return new EntryCollection();
-		}
-
-        Control IPageFormatInfo.Bodytext 
+        protected override EntryCollection LoadEntries()
         {
-            get
-            {
-                ClickThroughsBox ClickThroughsBox = LoadControl("ClickThroughsBox.ascx") as ClickThroughsBox;
-                return ClickThroughsBox;
-            }
+            return new EntryCollection();
         }
     }
-}
+}
\ No newline at end of file

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ClickThroughs.aspx.designer.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ClickThroughs.aspx.designer.cs	2008-01-12 15:43:20 UTC (rev 796)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ClickThroughs.aspx.designer.cs	2008-01-12 18:18:51 UTC (rev 797)
@@ -1,10 +1,10 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:2.0.50727.1318
+//     Dieser Code wurde von einem Tool generiert.
+//     Laufzeitversion:2.0.50727.312
 //
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     \xC4nderungen an dieser Datei k\xF6nnen falsches Verhalten verursachen und gehen verloren, wenn
+//     der Code erneut generiert wird.
 // </auto-generated>
 //------------------------------------------------------------------------------
 
@@ -12,19 +12,19 @@
     
     
     /// <summary>
-    /// ClickThroughs class.
+    /// ClickThroughs-Klasse.
     /// </summary>
     /// <remarks>
-    /// Auto-generated class.
+    /// Automatisch generierte Klasse.
     /// </remarks>
     public partial class ClickThroughs {
         
         /// <summary>
-        /// contentPlaceHolder control.
+        /// contentPlaceHolder-Steuerelement.
         /// </summary>
         /// <remarks>
-        /// Auto-generated field.
-        /// To modify move field declaration from designer file to code-behind file.
+        /// Automatisch generiertes Feld.
+        /// Verschieben Sie zum \xC4ndern die Felddeklaration aus der Designerdatei in die Code-Behind-Datei.
         /// </remarks>
         protected global::System.Web.UI.WebControls.PlaceHolder contentPlaceHolder;
     }

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ClickThroughsBox.ascx
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ClickThroughsBox.ascx	2008-01-12 15:43:20 UTC (rev 796)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ClickThroughsBox.ascx	2008-01-12 18:18:51 UTC (rev 797)
@@ -1,11 +1,14 @@
 <%@ Register TagPrefix="uc1" TagName="ActivityBox" Src="ActivityBox.ascx" %>
-<%@ Control language="c#" Codebehind="ClickThroughsBox.ascx.cs" AutoEventWireup="True" Inherits="newtelligence.DasBlog.Web.ClickThroughsBox" %>
+<%@ Control Language="C#" AutoEventWireup="True" Inherits="newtelligence.DasBlog.Web.ClickThroughsBox"
+    CodeFile="ClickThroughsBox.ascx.cs" %>
 <%@ Register TagPrefix="uc1" TagName="LogDateBar" Src="LogDateBar.ascx" %>
-<uc1:ActivityBox id="ActivityBox1" runat="server"></uc1:ActivityBox>
+<uc1:ActivityBox id="ActivityBox1" runat="server">
+</uc1:ActivityBox>
 <div class="bodyContentStyle">
-	<div class="pageTopic">
-		<asp:Label id=Label1 runat="server" Text='<%# newtelligence.DasBlog.Web.ApplicationResourceTable.Get().GetString("text_clickthrough_title") %>'>
-		</asp:Label>
-		<uc1:LogDateBar id="LogDateBar1" runat="server"></uc1:LogDateBar></div>
-	<asp:placeholder id="contentPlaceHolder" runat="server"></asp:placeholder>
+    <div class="pageTopic">
+        <asp:Label ID="Label1" runat="server" Text='<%# newtelligence.DasBlog.Web.ApplicationResourceTable.Get().GetString("text_clickthrough_title") %>'>
+        </asp:Label>
+        <uc1:LogDateBar id="LogDateBar1" runat="server">
+        </uc1:LogDateBar></div>
+    <asp:PlaceHolder ID="contentPlaceHolder" runat="server"></asp:PlaceHolder>
 </div>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ClickThroughsBox.ascx.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ClickThroughsBox.ascx.cs	2008-01-12 15:43:20 UTC (rev 796)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ClickThroughsBox.ascx.cs	2008-01-12 18:18:51 UTC (rev 797)
@@ -1,4 +1,5 @@
 #region Copyright (c) 2003, newtelligence AG. All rights reserved.
+
 /*
 // Copyright (c) 2003, newtelligence AG. (http://www.newtelligence.com)
 // Original BlogX Source Code: Copyright (c) 2003, Chris Anderson (http://simplegeek.com)
@@ -35,6 +36,7 @@
 // or following this notice. 
 //
 */
+
 #endregion
 
 using System;
@@ -49,174 +51,183 @@
 
 namespace newtelligence.DasBlog.Web
 {
-	/// <summary>
-	/// Summary description for WebForm1.
-	/// </summary>
-	public partial class ClickThroughsBox : StatisticsListBase
-	{
+    public partial class ClickThroughsBox : StatisticsListBase
+    {
+        protected void Page_Load(object sender, EventArgs e)
+        {
+        }
 
-		protected void Page_Load(object sender, EventArgs e)
-		{
-		}
+        private static void BuildClickThroughsRow(TableRow row, StatisticsItem item, object objDataService)
+        {
+            HyperLink link = new HyperLink();
+            IBlogDataService dataService = objDataService as IBlogDataService;
 
-		#region Web Form Designer generated code
-		protected override void OnInit(EventArgs e)
-		{
-			//
-			// CODEGEN: This call is required by the ASP.NET Web Form Designer.
-			//
-			InitializeComponent();
-			base.OnInit(e);
-		}
+            string[] urls = item.identifier.Split('\xB0');
+            string text = SiteUtilities.ClipString(urls[0], 80);
+            link.Text = text;
+            link.NavigateUrl = urls[0];
 
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
-			this.Load += new EventHandler(this.Page_Load);
-			this.PreRender += new EventHandler(this.ClickThroughsBox_PreRender);
+            HyperLink hlLocal = new HyperLink();
+            hlLocal.NavigateUrl = urls[1];
+            text = SiteUtilities.ClipString(urls[1], 80);
 
-		}
-		#endregion
+            if ((hlLocal.NavigateUrl != null && (hlLocal.NavigateUrl.Length > 0)))
+            {
+                int idx;
+                string id;
 
-		private void BuildClickThroughsRow(TableRow row, StatisticsItem item, object objDataService)
-		{
-			HyperLink link = new HyperLink();
-			IBlogDataService dataService = objDataService as IBlogDataService;
+                // urls in the log have been written using URL Rewriting
+                if (hlLocal.NavigateUrl.IndexOf("guid,") > -1)
+                {
+                    string guid = hlLocal.NavigateUrl.Substring(0, hlLocal.NavigateUrl.Length - 5);
+                    idx = guid.IndexOf("guid,");
+                    id = guid.Substring(idx + 5);
+                }
+                else
+                {
+                    idx = hlLocal.NavigateUrl.IndexOf("guid=");
+                    id = hlLocal.NavigateUrl.Substring(idx + 5);
+                }
 
-			string[] urls = item.identifier.Split('\xB0');
-			string text = SiteUtilities.ClipString(urls[0], 80);
-			link.Text = text;
-			link.NavigateUrl = urls[0];
+                Entry entry = dataService.GetEntry(id);
 
-			HyperLink hlLocal = new HyperLink();
-			hlLocal.NavigateUrl = urls[1];
-			text = SiteUtilities.ClipString(urls[1], 80);
-			if ((hlLocal.NavigateUrl != null && (hlLocal.NavigateUrl.Length > 0)))
-			{
-				int idx;
-				string id;
+                if (entry != null && entry.Title != null && entry.Title.Length > 0)
+                {
+                    text = SiteUtilities.ClipString(entry.Title, 80);
+                }
+            }
 
-				// urls in the log have been written using URL Rewriting
-				if (hlLocal.NavigateUrl.IndexOf("guid,") > -1)
-				{
-					string guid = hlLocal.NavigateUrl.Substring(0, hlLocal.NavigateUrl.Length - 5);
-					idx = guid.IndexOf("guid,");
-					id = guid.Substring(idx + 5);
-				}
-				else
-				{
-					idx = hlLocal.NavigateUrl.IndexOf("guid=");
-					id = hlLocal.NavigateUrl.Substring(idx + 5);
-				}
+            hlLocal.Text = text;
 
-				Entry entry = dataService.GetEntry(id);
-		
-				if (entry != null && entry.Title != null && entry.Title.Length > 0)
-				{
-					text = SiteUtilities.ClipString(entry.Title, 80);
-				}
-			}
+            row.Cells[0].Controls.Add(link);
+            row.Cells[0].Controls.Add(new LiteralControl("<br />from:"));
+            row.Cells[0].Controls.Add(hlLocal);
+            row.Cells[1].Text = item.count.ToString();
+        }
 
-			hlLocal.Text = text;
+        private void ClickThroughsBox_PreRender(object sender, EventArgs e)
+        {
+            Control root = contentPlaceHolder;
 
-			row.Cells[0].Controls.Add(link);
-			row.Cells[0].Controls.Add(new LiteralControl("<br />from:"));
-			row.Cells[0].Controls.Add(hlLocal);
-			row.Cells[1].Text = item.count.ToString();
-		}
+            SiteConfig siteConfig = SiteConfig.GetSiteConfig();
+            ILoggingDataService logService =
+                LoggingDataServiceFactory.GetService(SiteConfig.GetLogPathFromCurrentContext());
+            IBlogDataService dataService =
+                BlogDataServiceFactory.GetService(SiteConfig.GetContentPathFromCurrentContext(), logService);
 
-		private void ClickThroughsBox_PreRender(object sender, EventArgs e)
-		{
-			Control root = contentPlaceHolder;
+            Hashtable clickThroughUrls = new Hashtable();
+            Hashtable userAgents = new Hashtable();
+            Hashtable userDomains = new Hashtable();
 
-			SiteConfig siteConfig = SiteConfig.GetSiteConfig();
-			ILoggingDataService logService = LoggingDataServiceFactory.GetService(SiteConfig.GetLogPathFromCurrentContext());
-			IBlogDataService dataService = BlogDataServiceFactory.GetService(SiteConfig.GetContentPathFromCurrentContext(), logService);
+            // get the user's local time
+            DateTime utcTime = DateTime.UtcNow;
+            DateTime localTime = siteConfig.GetConfiguredTimeZone().ToLocalTime(utcTime);
 
-			Hashtable clickThroughUrls = new Hashtable();
-			Hashtable userAgents = new Hashtable();
-			Hashtable userDomains = new Hashtable();
+            if (Request.QueryString["date"] != null)
+            {
+                try
+                {
+                    DateTime popUpTime =
+                        DateTime.ParseExact(Request.QueryString["date"], "yyyy-MM-dd", CultureInfo.InvariantCulture);
+                    new DateTime(popUpTime.Year, popUpTime.Month, popUpTime.Day, utcTime.Hour, utcTime.Minute,
+                                 utcTime.Second);
+                    localTime =
+                        new DateTime(popUpTime.Year, popUpTime.Month, popUpTime.Day, localTime.Hour, localTime.Minute,
+                                     localTime.Second);
+                }
+                catch (FormatException ex)
+                {
+                    ErrorTrace.Trace(TraceLevel.Error, ex);
+                }
+            }
 
-			// get the user's local time
-			DateTime utcTime = DateTime.UtcNow;
-			DateTime localTime = siteConfig.GetConfiguredTimeZone().ToLocalTime(utcTime);
-			
-			if (Request.QueryString["date"] != null)
-			{
-				try
-				{
-					DateTime popUpTime = DateTime.ParseExact(Request.QueryString["date"], "yyyy-MM-dd", CultureInfo.InvariantCulture);
-					utcTime = new DateTime(popUpTime.Year, popUpTime.Month, popUpTime.Day, utcTime.Hour, utcTime.Minute, utcTime.Second);
-					localTime = new DateTime(popUpTime.Year, popUpTime.Month, popUpTime.Day, localTime.Hour, localTime.Minute, localTime.Second);
-				}
-				catch (FormatException ex)
-				{
-					ErrorTrace.Trace(TraceLevel.Error, ex);
-				}
-			}
+            LogDataItemCollection logItems = new LogDataItemCollection();
+            logItems.AddRange(logService.GetClickThroughsForDay(localTime));
 
-			LogDataItemCollection logItems = new LogDataItemCollection();
-			logItems.AddRange(logService.GetClickThroughsForDay(localTime));
+            if (siteConfig.AdjustDisplayTimeZone)
+            {
+                WindowsTimeZone tz = siteConfig.GetConfiguredTimeZone();
+                TimeSpan ts = tz.GetUtcOffset(DateTime.UtcNow);
+                int offset = ts.Hours;
 
-			if (siteConfig.AdjustDisplayTimeZone)
-			{
-				WindowsTimeZone tz = siteConfig.GetConfiguredTimeZone();
-				TimeSpan ts = tz.GetUtcOffset(DateTime.UtcNow);
-				int offset = ts.Hours;
+                if (offset < 0)
+                {
+                    logItems.AddRange(logService.GetClickThroughsForDay(localTime.AddDays(1)));
+                }
+                else
+                {
+                    logItems.AddRange(logService.GetClickThroughsForDay(localTime.AddDays(-1)));
+                }
+            }
 
-				if (offset < 0)
-				{
-					logItems.AddRange(logService.GetClickThroughsForDay(localTime.AddDays(1)));
-				}
-				else
-				{
-					logItems.AddRange(logService.GetClickThroughsForDay(localTime.AddDays(-1)));
-				}
-			}
+            foreach (LogDataItem log in logItems)
+            {
+                bool exclude = false;
 
-			foreach (LogDataItem log in logItems)
-			{
-				bool exclude = false;
+                if (siteConfig.AdjustDisplayTimeZone)
+                {
+                    if (siteConfig.GetConfiguredTimeZone().ToLocalTime(log.RequestedUtc).Date != localTime.Date)
+                    {
+                        exclude = true;
+                    }
+                }
 
-				if (siteConfig.AdjustDisplayTimeZone)
-				{
-					if (siteConfig.GetConfiguredTimeZone().ToLocalTime(log.RequestedUtc).Date != localTime.Date)
-					{
-						exclude = true;
-					}
-				}
+                if (!exclude)
+                {
+                    string key = log.UrlRequested + "\xB0" + log.UrlReferrer;
 
-				if (!exclude)
-				{
-					string key = log.UrlRequested + "\xB0" + log.UrlReferrer;
-					if (!clickThroughUrls.Contains(key))
-					{
-						clickThroughUrls[key] = 0;
-					}
-					clickThroughUrls[key] = ((int) clickThroughUrls[key]) + 1;
+                    if (!clickThroughUrls.Contains(key))
+                    {
+                        clickThroughUrls[key] = 0;
+                    }
+                    clickThroughUrls[key] = ((int) clickThroughUrls[key]) + 1;
 
-					if (!userAgents.Contains(log.UserAgent))
-					{
-						userAgents[log.UserAgent] = 0;
-					}
-					userAgents[log.UserAgent] = ((int) userAgents[log.UserAgent]) + 1;
+                    if (!userAgents.Contains(log.UserAgent))
+                    {
+                        userAgents[log.UserAgent] = 0;
+                    }
+                    userAgents[log.UserAgent] = ((int) userAgents[log.UserAgent]) + 1;
 
-					if(!userDomains.Contains(log.UserDomain))
-					{
-						userDomains[log.UserDomain] = 0;
-					}
-					userDomains[log.UserDomain] = ((int) userDomains[log.UserDomain]) + 1;
-				}
-			}
+                    if (!userDomains.Contains(log.UserDomain))
+                    {
+                        userDomains[log.UserDomain] = 0;
+                    }
 
-            root.Controls.Add(BuildStatisticsTable(GenerateSortedItemList(clickThroughUrls), resmgr.GetString("text_activity_click_throughs"), resmgr.GetString("text_activity_clicks"), new StatisticsBuilderCallback(this.BuildClickThroughsRow), dataService));
-            root.Controls.Add(BuildStatisticsTable(GenerateSortedItemList(userDomains), resmgr.GetString("text_activity_user_domains"), resmgr.GetString("text_activity_hits"), new StatisticsBuilderCallback(this.BuildUserDomainRow), dataService));
-            root.Controls.Add(BuildStatisticsTable(GenerateSortedItemList(userAgents), resmgr.GetString("text_activity_user_agent"), resmgr.GetString("text_activity_hits"), new StatisticsBuilderCallback(this.BuildAgentsRow), dataService));

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Dasblogce-cvs] SF.net SVN: dasblogce: [802] branches/refactoring_architecture/source

From: <sfcaus@us...> - 2008-01-14 00:39

Revision: 802
          http://dasblogce.svn.sourceforge.net/dasblogce/?rev=802&view=rev
Author:   sfcaus
Date:     2008-01-13 16:39:27 -0800 (Sun, 13 Jan 2008)

Log Message:
-----------
- refactoring macros (no downward compatible)
- newtelligence.dasblog.web.core.Config refactored

Modified Paths:
--------------
    branches/refactoring_architecture/source/newtelligence.DasBlog.Util/RFC2822Date.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Util/ReflectionHelper.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Util/TimeZones.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Activity.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ActivityBox.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AdminNavBar.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AggBugs.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Archives.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/BlogRollControl.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Blogroll.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/CategoryView.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ClickThroughs.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/CommentView.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/CrosspostReferrers.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditBlogRoll.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditBlogRollItem.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditConfig.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditContentFilters.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditCrosspostSites.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditEntry.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditNavigatorLinks.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditUser.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Email.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Eventlog.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/FormatPage.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Login.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/MonthView.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/PermaLink.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Profile.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Referrers.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/SearchView.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/TimeLine.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/UserClickThroughs.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/UserView.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Web.config
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/default.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ftb/ftb.colorpicker.aspx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ftb/ftb.imagegallery.aspx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ftb/ftb.insertcode.aspx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/newtelligence.DasBlog.Web.csproj
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/BookControl.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/HttpCache.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/NavigationLink.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/ReferralBlackList.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/SharedBasePage.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/SideBarList.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/SideBarOpmlList.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/SiteSecurity.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/SiteUtilities.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/TemplateProcessor.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Themes.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/newtelligence.DasBlog.Web.Core.csproj

Added Paths:
-----------
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Config/
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Config/CoreControlNames.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Config/CoreCssStyles.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Config/CoreFileNames.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Config/CoreFilePaths.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Config/CoreFolderNames.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Config/CoreQueryStrings.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Config/CoreSecurityNames.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Macros/
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Macros/DayMacros.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Macros/EditMacros.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Macros/EditRadioMacros.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Macros/EditRadioProperties.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Macros/IPageFormatInfo.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Macros/ItemMacros.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Macros/MacroSectionHandler.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Macros/Macros.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Macros/MacrosFactory.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Macros/NewtelligenceProperties.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Macros/RadioMacros.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Macros/RadioPropertys.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Macros/WeblogMacros.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Util.cs

Removed Paths:
-------------
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Config.cs

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Util/RFC2822Date.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Util/RFC2822Date.cs	2008-01-13 16:49:20 UTC (rev 801)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Util/RFC2822Date.cs	2008-01-14 00:39:27 UTC (rev 802)
@@ -1,4 +1,5 @@
 #region Copyright (c) 2003, newtelligence AG. All rights reserved.
+
 /*
 // Copyright (c) 2003, newtelligence AG. (http://www.newtelligence.com)
 // All rights reserved.
@@ -33,6 +34,7 @@
 // 
 // This file was adopted from RssComponents, class written and (c) 2003 by Torsten Rendelmann.
 */
+
 #endregion
 
 using System;
@@ -46,11 +48,44 @@
     /// </summary>
     public class RFC2822Date
     {
+        private const int timeZones = 35;
 
-        private static readonly Regex rfc2822 = new Regex(@"\s*(?:(?:Mon|Tue|Wed|Thu|Fri|Sat|Sun)\s*,\s*)?(\d{1,2})\s+(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s+(\d{2,})\s+(\d{2})\s*:\s*(\d{2})\s*(?::\s*(\d{2}))?\s+([+\-]\d{4}|UT|GMT|EST|EDT|CST|CDT|MST|MDT|PST|PDT|[A-IK-Z])", RegexOptions.Compiled);
+        private static readonly Regex rfc2822 =
+            new Regex(
+                @"\s*(?:(?:Mon|Tue|Wed|Thu|Fri|Sat|Sun)\s*,\s*)?(\d{1,2})\s+(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\s+(\d{2,})\s+(\d{2})\s*:\s*(\d{2})\s*(?::\s*(\d{2}))?\s+([+\-]\d{4}|UT|GMT|EST|EDT|CST|CDT|MST|MDT|PST|PDT|[A-IK-Z])",
+                RegexOptions.Compiled);
 
-        private static ArrayList months = new ArrayList(new string[]{"ZeroIndex","Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec" });
+        private static ArrayList months =
+            new ArrayList(
+                new string[]
+                    {"ZeroIndex", "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"});
 
+        private static TZB[] ZoneBias = new TZB[timeZones]
+            {
+                new TZB("GMT", 0), new TZB("UT", 0),
+                new TZB("EST", -5*60), new TZB("EDT", -4*60),
+                new TZB("CST", -6*60), new TZB("CDT", -5*60),
+                new TZB("MST", -7*60), new TZB("MDT", -6*60),
+                new TZB("PST", -8*60), new TZB("PDT", -7*60),
+                new TZB("Z", 0), new TZB("A", -1*60),
+                new TZB("B", -2*60), new TZB("C", -3*60),
+                new TZB("D", -4*60), new TZB("E", -5*60),
+                new TZB("F", -6*60), new TZB("G", -7*60),
+                new TZB("H", -8*60), new TZB("I", -9*60),
+                new TZB("K", -10*60), new TZB("L", -11*60),
+                new TZB("M", -12*60), new TZB("N", 1*60),
+                new TZB("O", 2*60), new TZB("P", 3*60),
+                new TZB("Q", 4*60), new TZB("R", 3*60),
+                new TZB("S", 6*60), new TZB("T", 3*60),
+                new TZB("U", 8*60), new TZB("V", 3*60),
+                new TZB("W", 10*60), new TZB("X", 3*60),
+                new TZB("Y", 12*60)
+            };
+
+        private RFC2822Date()
+        {
+        }
+
         /// Parse is able to parse RFC2822/RFC822 formatted dates.
         /// It has a fallback mechanism: if the string does not match,
         /// the normal DateTime.Parse() is called. If that throws a FormatException
@@ -58,25 +93,29 @@
         public static DateTime Parse(string dateTimeString)
         {
             if (dateTimeString == null)
+            {
                 return DateTime.Now.ToUniversalTime();
+            }
 
             if (dateTimeString.Trim().Length == 0)
+            {
                 return DateTime.Now.ToUniversalTime();
+            }
 
             Match m = rfc2822.Match(dateTimeString);
-            if (m.Success) 
+            if (m.Success)
             {
                 try
                 {
-                    int dd = Int32.Parse(m.Groups[1].Value); 
+                    int dd = Int32.Parse(m.Groups[1].Value);
                     int mth = months.IndexOf(m.Groups[2].Value);
-                    int yy = Int32.Parse(m.Groups[3].Value); 
+                    int yy = Int32.Parse(m.Groups[3].Value);
                     // following year completion is compliant with RFC 2822.
-                    yy = (yy < 50 ? 2000 + yy: (yy < 1000 ? 1900 + yy: yy));
+                    yy = (yy < 50 ? 2000 + yy : (yy < 1000 ? 1900 + yy : yy));
                     int hh = Int32.Parse(m.Groups[4].Value);
                     int mm = Int32.Parse(m.Groups[5].Value);
                     int ss = Int32.Parse(m.Groups[6].Value);
-                    string zone =  m.Groups[7].Value;
+                    string zone = m.Groups[7].Value;
 
                     DateTime xd = new DateTime(yy, mth, dd, hh, mm, ss);
                     return xd.AddHours(RFCTimeZoneToGMTBias(zone)*-1);
@@ -85,16 +124,16 @@
                 {
                     //Requires FullTrust
                     //Debug.WriteLine("rfc2822 date exception:"+e.Message);
-                    for (int i = 0; i < m.Groups.Count; i++) 
-                    { 
-                        Console.WriteLine("Found:'" + m.Groups[i] + "' at " 
-                            + m.Groups[i].Index);
+                    for (int i = 0; i < m.Groups.Count; i++)
+                    {
+                        Console.WriteLine("Found:'" + m.Groups[i] + "' at "
+                                          + m.Groups[i].Index);
                     }
                 }
             }
             else
             {
-                try 
+                try
                 {
                     return DateTime.Parse(dateTimeString);
                 }
@@ -107,63 +146,47 @@
             return DateTime.Now.ToUniversalTime();
         }
 
-
-        private RFC2822Date(){}
-
-
-        private struct TZB
-        {					
-            public TZB(string z, int b) { Zone = z; Bias = b; }
-            public string Zone;
-            public int Bias;
-        }
-
-        private const int timeZones = 35;
-        private static TZB[] ZoneBias = new TZB[timeZones]
-                {
-                    new TZB("GMT", 0),     new TZB("UT", 0),
-                    new TZB("EST", -5*60), new TZB("EDT", -4*60),
-                    new TZB("CST", -6*60), new TZB("CDT", -5*60),
-                    new TZB("MST", -7*60), new TZB("MDT", -6*60),
-                    new TZB("PST", -8*60), new TZB("PDT", -7*60),
-                    new TZB("Z", 0),       new TZB("A", -1*60),
-                    new TZB("B", -2*60),   new TZB("C", -3*60),
-                    new TZB("D", -4*60),   new TZB("E", -5*60),
-                    new TZB("F", -6*60),   new TZB("G", -7*60),
-                    new TZB("H", -8*60),   new TZB("I", -9*60),
-                    new TZB("K", -10*60),  new TZB("L", -11*60),
-                    new TZB("M", -12*60),  new TZB("N", 1*60),
-                    new TZB("O", 2*60),    new TZB("P", 3*60),
-                    new TZB("Q", 4*60),    new TZB("R", 3*60),
-                    new TZB("S", 6*60),    new TZB("T", 3*60),
-                    new TZB("U", 8*60),    new TZB("V", 3*60),
-                    new TZB("W", 10*60),   new TZB("X", 3*60),
-                    new TZB("Y", 12*60)
-                };
-
         private static double RFCTimeZoneToGMTBias(string zone)
         {
+            string s;
 
-            string s;
-			
-            if ( zone.IndexOfAny(new char[]{'+', '-'}) == 0 )  // +hhmm format
+            if (zone.IndexOfAny(new char[] {'+', '-'}) == 0) // +hhmm format
             {
-                int fact = (zone.Substring(0,1) == "-"? -1: 1);
+                int fact = (zone.Substring(0, 1) == "-" ? -1 : 1);
                 s = zone.Substring(1).TrimEnd();
-                double hh = Math.Min(23, Int32.Parse(s.Substring(0,2)));
-                double mm = Math.Min(59, Int32.Parse(s.Substring(2,2)))/60;
-                return fact * (hh+mm);
-            } 
+                double hh = Math.Min(23, Int32.Parse(s.Substring(0, 2)));
+                double mm = Math.Min(59, Int32.Parse(s.Substring(2, 2)))/60;
+                return fact*(hh + mm);
+            }
             else
-            { // named format
+            {
+                // named format
                 s = zone.ToUpper().Trim();
                 for (int i = 0; i < timeZones; i++)
-                    if (ZoneBias[i].Zone.Equals(s)) 
+                {
+                    if (ZoneBias[i].Zone.Equals(s))
                     {
-                        return ZoneBias[i].Bias / 60;
+                        return ZoneBias[i].Bias/60;
                     }
+                }
             }
             return 0.0;
         }
+
+        #region Nested type: TZB
+
+        private struct TZB
+        {
+            public int Bias;
+            public string Zone;
+
+            public TZB(string z, int b)
+            {
+                Zone = z;
+                Bias = b;
+            }
+        }
+
+        #endregion
     }
-}
+}
\ No newline at end of file

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Util/ReflectionHelper.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Util/ReflectionHelper.cs	2008-01-13 16:49:20 UTC (rev 801)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Util/ReflectionHelper.cs	2008-01-14 00:39:27 UTC (rev 802)
@@ -4,42 +4,45 @@
 
 namespace newtelligence.DasBlog.Util
 {
-	public sealed class ReflectionHelper
-	{
+    public sealed class ReflectionHelper
+    {
+        private ReflectionHelper()
+        {
+        }
 
-		private ReflectionHelper() {}
+        //************************************************************
+        //  Method Name: CodeBase
+        /// <summary>
+        /// Returns the code base file location as a standard directory.
+        /// </summary>
+        /// <returns>This assemblies code base as a local file system path.</returns>
+        /// <creationDate>March 15, 2002</creationDate>
+        //************************************************************
+        public static string CodeBase()
+        {
+            Assembly currentAssembly = null;
+            StackTrace stackTrace = new StackTrace();
+            StackFrame currentFrame;
 
-		//************************************************************
-		//  Method Name: CodeBase
-		/// <summary>
-		/// Returns the code base file location as a standard directory.
-		/// </summary>
-		/// <returns>This assemblies code base as a local file system path.</returns>
-		/// <creationDate>March 15, 2002</creationDate>
-		//************************************************************
-		public static string CodeBase()
-		{
-			Assembly currentAssembly = null;
-			StackTrace stackTrace = new StackTrace();
-			StackFrame currentFrame;
+            for (int i = 1; i < stackTrace.FrameCount; i++)
+            {
+                currentFrame = stackTrace.GetFrame(i);
+                currentAssembly = currentFrame.GetMethod().DeclaringType.Assembly;
+                if (!currentAssembly.GlobalAssemblyCache)
+                {
+                    break;
+                }
+            }
 
-			for (int i = 1; i < stackTrace.FrameCount; i++)
-			{
-				currentFrame = stackTrace.GetFrame(i);
-				currentAssembly = currentFrame.GetMethod().DeclaringType.Assembly;
-				if (!currentAssembly.GlobalAssemblyCache)
-				{
-					break;
-				}
-			}
+            string[] codeBaseSplit = currentAssembly.CodeBase.Split('/');
+            StringBuilder fileSpec = new StringBuilder();
 
-			string [] codeBaseSplit = currentAssembly.CodeBase.Split('/');
-			StringBuilder fileSpec = new StringBuilder();
-			
-			for (int split=3; split < codeBaseSplit.Length-1; split++)
-				fileSpec.Append( codeBaseSplit[split]+"\\" );
+            for (int split = 3; split < codeBaseSplit.Length - 1; split++)
+            {
+                fileSpec.Append(codeBaseSplit[split] + "\\");
+            }
 
-			return fileSpec.ToString();
-		}
-	}
+            return fileSpec.ToString();
+        }
+    }
 }
\ No newline at end of file

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Util/TimeZones.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Util/TimeZones.cs	2008-01-13 16:49:20 UTC (rev 801)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Util/TimeZones.cs	2008-01-14 00:39:27 UTC (rev 802)
@@ -8,610 +8,655 @@
 
 namespace newtelligence.DasBlog.Util
 {
-    
-	/// <summary>
-	/// This structure is the equivalent of the Windows SYSTEMTIME structure.
-	/// </summary>
-	public struct WindowsSystemTime
-	{
-		public ushort year;
-		public ushort month;
-		public ushort dayOfWeek;
-		public ushort day;
-		public ushort hour;
-		public ushort minute;
-		public ushort second;
-		public ushort milliseconds;
+    /// <summary>
+    /// This structure is the equivalent of the Windows SYSTEMTIME structure.
+    /// </summary>
+    public struct WindowsSystemTime
+    {
+        public ushort day;
+        public ushort dayOfWeek;
+        public ushort hour;
+        public ushort milliseconds;
+        public ushort minute;
+        public ushort month;
+        public ushort second;
+        public ushort year;
 
-		public int InitializeFromByteArray( byte[] buffer, int offset )
-		{
-			int pos = offset;
-			year = BitConverter.ToUInt16( buffer, pos ); pos += 2;
-			month = BitConverter.ToUInt16( buffer, pos ); pos += 2;
-			dayOfWeek = BitConverter.ToUInt16( buffer, pos ); pos += 2;
-			day = BitConverter.ToUInt16( buffer, pos ); pos += 2;
-			hour = BitConverter.ToUInt16( buffer, pos ); pos += 2;
-			minute = BitConverter.ToUInt16( buffer, pos ); pos += 2;
-			second = BitConverter.ToUInt16( buffer, pos ); pos += 2;
-			milliseconds = BitConverter.ToUInt16( buffer, pos ); pos += 2;
-			return pos;
-		}
-	}
+        public int InitializeFromByteArray(byte[] buffer, int offset)
+        {
+            int pos = offset;
+            year = BitConverter.ToUInt16(buffer, pos);
+            pos += 2;
+            month = BitConverter.ToUInt16(buffer, pos);
+            pos += 2;
+            dayOfWeek = BitConverter.ToUInt16(buffer, pos);
+            pos += 2;
+            day = BitConverter.ToUInt16(buffer, pos);
+            pos += 2;
+            hour = BitConverter.ToUInt16(buffer, pos);
+            pos += 2;
+            minute = BitConverter.ToUInt16(buffer, pos);
+            pos += 2;
+            second = BitConverter.ToUInt16(buffer, pos);
+            pos += 2;
+            milliseconds = BitConverter.ToUInt16(buffer, pos);
+            pos += 2;
+            return pos;
+        }
+    }
 
-	/// <summary>
-	/// This structure is the binary equivalent of the TZI information found
-	/// in the Windows registry for each key underneath 
-	/// "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Time Zones"
-	/// </summary>
-	public struct WindowsTZI
-	{
-		/// <summary>
-		/// Base Bias from GMT, in seconds. Subtracting this value from the local time results in GMT.
-		/// For Western Europe, this value is -60, for US Eastern Time this value is +300.
-		/// </summary>
-		public int bias;
-		/// <summary>
-		/// Standard time bias as an offset to the base bias. This is usually 0.
-		/// </summary>
-		public int standardBias;
-		/// <summary>
-		/// Daylight savings time bias as an offset to the base bias. Subtracting this value from
-		/// the local time results in the standard time. For Western Europe, this value is -60,
-		/// for US Eastern time \xEDt's also -60 and for India Standard Time it's 0.
-		/// </summary>
-		public int daylightBias;
-		/// <summary>
-		/// This is WindowsSystemTime structure (equivalent to the unmanaged SYSTEMTIME) structure,
-		/// but stores NOT a valid date. Instead, the following rules apply:
-		/// If "month" is 0, there is no daylight savings time for this zone. The dayOfWeek value
-		/// indicates the day of the week on which daylight savings time is effective. The day value
-		/// indicates, starting at 1 (with a maximum value of 5, saying "last") the occurrence of 
-		/// that weekday within the month on which the daylight savings time is effective.
-		/// </summary>
-		public WindowsSystemTime standardDate;
-		/// <summary>
-		/// This is WindowsSystemTime structure (equivalent to the unmanaged SYSTEMTIME) structure,
-		/// but stores NOT a valid date. Instead, the following rules apply:
-		/// If "month" is 0, there is no daylight savings time for this zone. The dayOfWeek value
-		/// indicates the day of the week on which daylight savings time reverts back to standard time. 
-		/// The day value indicates, starting at 1 (with a maximum value of 5, saying "last") the 
-		/// occurrence of that weekday within the month on which the daylight savings time reverts back.
-		/// </summary>
-		public WindowsSystemTime daylightDate;
+    /// <summary>
+    /// This structure is the binary equivalent of the TZI information found
+    /// in the Windows registry for each key underneath 
+    /// "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Time Zones"
+    /// </summary>
+    public struct WindowsTZI
+    {
+        /// <summary>
+        /// Base Bias from GMT, in seconds. Subtracting this value from the local time results in GMT.
+        /// For Western Europe, this value is -60, for US Eastern Time this value is +300.
+        /// </summary>
+        public int bias;
 
-		/// <summary>
-		/// Initializes the structure from a byte array.
-		/// </summary>
-		/// <param name="buffer">Byte buffer</param>
-		/// <param name="offset">Offset intro the buffer at which to start</param>
-		/// <returns>Position at which the parsing left off</returns>
-		public int InitializeFromByteArray( byte[] buffer, int offset )
-		{
-			int pos = offset;
-			standardDate.month = 0;
-			daylightDate.month = 0;
-			bias = BitConverter.ToInt32(buffer,pos);pos+=4;
-			standardBias = BitConverter.ToInt32(buffer,pos);pos+=4;
-			daylightBias = BitConverter.ToInt32(buffer,pos);pos+=4;
-			pos = standardDate.InitializeFromByteArray( buffer, pos );
-			pos = daylightDate.InitializeFromByteArray( buffer, pos );
-			return pos;
-		}
-	}
+        /// <summary>
+        /// Daylight savings time bias as an offset to the base bias. Subtracting this value from
+        /// the local time results in the standard time. For Western Europe, this value is -60,
+        /// for US Eastern time \xEDt's also -60 and for India Standard Time it's 0.
+        /// </summary>
+        public int daylightBias;
 
-    
+        /// <summary>
+        /// This is WindowsSystemTime structure (equivalent to the unmanaged SYSTEMTIME) structure,
+        /// but stores NOT a valid date. Instead, the following rules apply:
+        /// If "month" is 0, there is no daylight savings time for this zone. The dayOfWeek value
+        /// indicates the day of the week on which daylight savings time reverts back to standard time. 
+        /// The day value indicates, starting at 1 (with a maximum value of 5, saying "last") the 
+        /// occurrence of that weekday within the month on which the daylight savings time reverts back.
+        /// </summary>
+        public WindowsSystemTime daylightDate;
 
-	/// <summary>
-	/// This is a specialization of the abstract TimeZone class
-	/// that implements time zones based in the time zone information
-	/// found in Windows.
-	/// </summary>
-	public class WindowsTimeZone : TimeZone
-	{
-		private string displayName;
-		private string daylightZoneName;
-		private string standardZoneName;
-		private int zoneIndex;
-		private TimeSpan baseBias;
-		private TimeSpan standardBias;
-		private TimeSpan daylightBias;
-		private WindowsTZI winTZI;
-       
-		internal WindowsTimeZone(string displayName, string daylightZoneName, string standardZoneName, int zoneIndex, byte[] tzi )
-		{
-			this.winTZI.bias = 0;
-			this.displayName = displayName.Trim();
-			this.daylightZoneName = daylightZoneName.Trim();
-			this.standardZoneName = standardZoneName.Trim();
-			this.zoneIndex = zoneIndex;
+        /// <summary>
+        /// Standard time bias as an offset to the base bias. This is usually 0.
+        /// </summary>
+        public int standardBias;
 
-			winTZI.InitializeFromByteArray( tzi, 0 );
-			this.baseBias = TimeSpan.FromMinutes( winTZI.bias*-1 );
-			this.standardBias = TimeSpan.FromMinutes( winTZI.standardBias*-1 );
-			this.daylightBias = TimeSpan.FromMinutes( winTZI.daylightBias*-1 );
-		}
+        /// <summary>
+        /// This is WindowsSystemTime structure (equivalent to the unmanaged SYSTEMTIME) structure,
+        /// but stores NOT a valid date. Instead, the following rules apply:
+        /// If "month" is 0, there is no daylight savings time for this zone. The dayOfWeek value
+        /// indicates the day of the week on which daylight savings time is effective. The day value
+        /// indicates, starting at 1 (with a maximum value of 5, saying "last") the occurrence of 
+        /// that weekday within the month on which the daylight savings time is effective.
+        /// </summary>
+        public WindowsSystemTime standardDate;
 
+        /// <summary>
+        /// Initializes the structure from a byte array.
+        /// </summary>
+        /// <param name="buffer">Byte buffer</param>
+        /// <param name="offset">Offset intro the buffer at which to start</param>
+        /// <returns>Position at which the parsing left off</returns>
+        public int InitializeFromByteArray(byte[] buffer, int offset)
+        {
+            int pos = offset;
+            standardDate.month = 0;
+            daylightDate.month = 0;
+            bias = BitConverter.ToInt32(buffer, pos);
+            pos += 4;
+            standardBias = BitConverter.ToInt32(buffer, pos);
+            pos += 4;
+            daylightBias = BitConverter.ToInt32(buffer, pos);
+            pos += 4;
+            pos = standardDate.InitializeFromByteArray(buffer, pos);
+            pos = daylightDate.InitializeFromByteArray(buffer, pos);
+            return pos;
+        }
+    }
 
-		public string DisplayName { get { return displayName; } set { this.displayName = value;}}
-		public string DaylightZoneName { get { return daylightZoneName; } set { this.daylightZoneName = value;}}
-		public string StandardZoneName { get { return standardZoneName; } set { this.standardZoneName = value;}}
-		public int ZoneIndex { get { return zoneIndex; } set { this.zoneIndex = value;}}
-		public WindowsTZI WinTZI { get { return winTZI; } 
-			set
-			{
-				this.winTZI = value;
-				this.baseBias = TimeSpan.FromMinutes( winTZI.bias*-1 );
-				this.standardBias = TimeSpan.FromMinutes( winTZI.standardBias*-1 );
-				this.daylightBias = TimeSpan.FromMinutes( winTZI.daylightBias*-1 );
-			}
-		}
+    /// <summary>
+    /// This is a specialization of the abstract TimeZone class
+    /// that implements time zones based in the time zone information
+    /// found in Windows.
+    /// </summary>
+    public class WindowsTimeZone : TimeZone
+    {
+        private static Hashtable daylightChanges = new Hashtable();
+        private static object daylightChangesLock = new object();
+        private static WindowsTimeZoneCollection timeZones;
+        private TimeSpan baseBias;
+        private TimeSpan daylightBias;
+        private string daylightZoneName;
+        private string displayName;
+        private TimeSpan standardBias;
+        private string standardZoneName;
+        private WindowsTZI winTZI;
+        private int zoneIndex;
 
-		public TimeSpan BaseBias { get { return baseBias; } }
-		public TimeSpan StandardBias { get { return standardBias; } }
-		public TimeSpan DaylightBias { get { return daylightBias; } }
+        static WindowsTimeZone()
+        {
+            RegistryPermission permission = new RegistryPermission(
+                RegistryPermissionAccess.Read,
+                "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Time Zones");
 
-		public override string DaylightName
-		{
-			get
-			{
-				return daylightZoneName;
-			}
-		}
+            try
+            {
+                permission.Demand();
+                timeZones = LoadTimeZonesFromRegistry();
+            }
+            catch //(Exception ex) //If we can't get into the Registry for any reason, try the fallback...
+            {
+                //SDH: Requires FullTrust
+                //System.Diagnostics.Debug.WriteLine("Error: LoadTimeZonesFromRegistry " + ex.ToString());
+                timeZones = LoadTimeZonesFromXml();
+            }
+        }
 
-		public override string ToString()
-		{
-			return displayName;
-		}
+        internal WindowsTimeZone(string displayName, string daylightZoneName, string standardZoneName, int zoneIndex,
+                                 byte[] tzi)
+        {
+            winTZI.bias = 0;
+            this.displayName = displayName.Trim();
+            this.daylightZoneName = daylightZoneName.Trim();
+            this.standardZoneName = standardZoneName.Trim();
+            this.zoneIndex = zoneIndex;
 
+            winTZI.InitializeFromByteArray(tzi, 0);
+            baseBias = TimeSpan.FromMinutes(winTZI.bias*-1);
+            standardBias = TimeSpan.FromMinutes(winTZI.standardBias*-1);
+            daylightBias = TimeSpan.FromMinutes(winTZI.daylightBias*-1);
+        }
 
-		private static object daylightChangesLock = new object();
-		private static Hashtable daylightChanges = new Hashtable();
+        /// <summary>
+        /// Initializes a new instance of the <see cref="WindowsTimeZone"/> class.
+        /// </summary>
+        /// <remarks>Made public for serialization.</remarks>
+        public WindowsTimeZone()
+        {
+            // empty
+        }
 
-		public override DaylightTime GetDaylightChanges(int year)
-		{
-			//Check cache...
-			//This was broken.
-			DaylightTime retVal = daylightChanges[this.zoneIndex + ":" + year] as DaylightTime;
-			
-			if (retVal == null)
-			{
-				lock(daylightChangesLock)
-				{
-					DateTime current;
-					DateTime start = DateTime.MinValue;
-					DateTime end = DateTime.MinValue;
-					TimeSpan delta = TimeSpan.FromTicks(0);
-            
-					if ( winTZI.daylightDate.month != 0 && winTZI.standardDate.month != 0 )
-					{
-						// day count is a value from 1 to 5, indicating the day 
-						// in the month on which the switch occurs
-						int dayCount = winTZI.daylightDate.day;
-						current = start = new DateTime( year, winTZI.daylightDate.month, 1, winTZI.daylightDate.hour,winTZI.daylightDate.minute,winTZI.daylightDate.second );
-						while ( current.Month == winTZI.daylightDate.month )
-						{
-							if ( Convert.ToUInt16(current.DayOfWeek) == winTZI.daylightDate.dayOfWeek )
-							{
-								start = current;
-								--dayCount;
-								if ( dayCount == 0 )
-								{
-									break;
-								}
-							}
-							current = current.AddDays(1);                    
-						}
 
-						// day count is a value from 1 to 5, indicating the day 
-						// in the month on which the switch occurs
-						dayCount = winTZI.standardDate.day;
-						current = end = new DateTime( year, winTZI.standardDate.month, 1, winTZI.standardDate.hour,winTZI.standardDate.minute,winTZI.standardDate.second );
-						while ( current.Month == winTZI.standardDate.month )
-						{
-							if ( Convert.ToUInt16(current.DayOfWeek) == winTZI.standardDate.dayOfWeek )
-							{
-								end = current;
-								--dayCount;
-								if ( dayCount == 0 )
-								{
-									break;
-								}
-							}
-							current = current.AddDays(1);                    
-						}
-						delta = daylightBias - standardBias;
-					}
-					retVal = new DaylightTime(start,end,delta);
-					if (daylightChanges.ContainsKey(this.zoneIndex + ":" + year) == false)
-					{
-						daylightChanges.Add(this.zoneIndex + ":" + year, retVal);
-					}
-				}
-			}
-			return retVal;
-		}
+        public string DisplayName
+        {
+            get { return displayName; }
+            set { displayName = value; }
+        }
 
-		public override TimeSpan GetUtcOffset(DateTime time)
-		{
-			if ( IsDaylightSavingTime( time ) )
-			{
-				return baseBias + daylightBias;
-			}
-			else
-			{
-				return baseBias + standardBias;
-			}
-		}
+        public string DaylightZoneName
+        {
+            get { return daylightZoneName; }
+            set { daylightZoneName = value; }
+        }
 
-		public override string StandardName
-		{
-			get
-			{
-				return standardZoneName;
-			}
-		}
+        public string StandardZoneName
+        {
+            get { return standardZoneName; }
+            set { standardZoneName = value; }
+        }
 
-		/// <summary>
-		/// Returns the local time (for this timezone) that corresponds to a specified coordinated universal time (UTC).
-		/// </summary>
-		/// <param name="time">A UTC time.</param>
-		/// <returns>
-		/// A <see cref="T:System.DateTime"></see> instance whose value is the local time that corresponds to time.
-		/// </returns>
-		public override DateTime ToLocalTime(DateTime time)
-		{
-			bool isAmbiguousLocalDst;
-			long offset = this.GetUtcOffsetFromUniversalTime(time, out isAmbiguousLocalDst);
-			long newTimeInTicks = time.Ticks + offset;
+        public int ZoneIndex
+        {
+            get { return zoneIndex; }
+            set { zoneIndex = value; }
+        }
 
-			if (newTimeInTicks > 0x2bca2875f4373fff)
-			{
-				return new DateTime(0x2bca2875f4373fff);
-			}
-			if(newTimeInTicks < 0)
-			{
-				return new DateTime(0);
-			}
+        public WindowsTZI WinTZI
+        {
+            get { return winTZI; }
+            set
+            {
+                winTZI = value;
+                baseBias = TimeSpan.FromMinutes(winTZI.bias*-1);
+                standardBias = TimeSpan.FromMinutes(winTZI.standardBias*-1);
+                daylightBias = TimeSpan.FromMinutes(winTZI.daylightBias*-1);
+            }
+        }
 
-			return new DateTime(newTimeInTicks);
-		}
+        public TimeSpan BaseBias
+        {
+            get { return baseBias; }
+        }
 
-		public override DateTime ToUniversalTime(DateTime time)
-		{
-			long newTimeInTicks = time.Ticks - GetUtcOffset( time ).Ticks;
-			return new DateTime(newTimeInTicks);
-		}
+        public TimeSpan StandardBias
+        {
+            get { return standardBias; }
+        }
 
-		/// <summary>
-		/// Renders a UTC date time as a local time string, displaying the offset from UTC.
-		/// </summary>
-		/// <param name="date"></param>
-		/// <returns></returns>
-		public string FormatAdjustedUniversalTime( DateTime date )
-		{
-			TimeSpan utcOffset = GetUtcOffset( date );
-			DateTime adjustedTime = date + utcOffset;
-			string adjustedDateString;
-                
-			if ( IsDaylightSavingTime( adjustedTime ) )
-			{
-				adjustedDateString = String.Format( "{0} ({1}, UTC{2}{3:00}:{4:00})",adjustedTime.ToString("F"), DaylightName, Math.Sign(utcOffset.Ticks)<0?"-":"+", Math.Abs(utcOffset.Hours), Math.Abs(utcOffset.Minutes%60) );
-			}
-			else
-			{
-				adjustedDateString = String.Format( "{0} ({1}, UTC{2}{3:00}:{4:00})",adjustedTime.ToString("F"), StandardName, Math.Sign(utcOffset.Ticks)<0?"-":"+", Math.Abs(utcOffset.Hours), Math.Abs(utcOffset.Minutes%60) );
-			}
-			return adjustedDateString;
-		}
+        public TimeSpan DaylightBias
+        {
+            get { return daylightBias; }
+        }
 
+        public override string DaylightName
+        {
+            get { return daylightZoneName; }
+        }
 
-		private static WindowsTimeZoneCollection timeZones;
+        public override string StandardName
+        {
+            get { return standardZoneName; }
+        }
 
-		/// <summary>
-		/// Initializes a new instance of the <see cref="WindowsTimeZone"/> class.
-		/// </summary>
-		/// <remarks>Made public for serialization.</remarks>
-		public WindowsTimeZone()
-		{
-			   // empty
-		}
+        public static WindowsTimeZoneCollection TimeZones
+        {
+            get { return timeZones; }
+        }
 
-		static WindowsTimeZone()
-		{
-			RegistryPermission permission = new RegistryPermission(
-				RegistryPermissionAccess.Read, 
-				"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Time Zones");
+        public override string ToString()
+        {
+            return displayName;
+        }
 
-			try
-			{
-				permission.Demand();
-				timeZones = LoadTimeZonesFromRegistry();
-			}
-			catch //(Exception ex) //If we can't get into the Registry for any reason, try the fallback...
-			{
-                //SDH: Requires FullTrust
-                //System.Diagnostics.Debug.WriteLine("Error: LoadTimeZonesFromRegistry " + ex.ToString());
-				timeZones = LoadTimeZonesFromXml();
-			}
-		}
 
-		public static WindowsTimeZoneCollection TimeZones
-		{
-			get
-			{
-				return timeZones;
-			}
-		}
+        public override DaylightTime GetDaylightChanges(int year)
+        {
+            //Check cache...
+            //This was broken.
+            DaylightTime retVal = daylightChanges[zoneIndex + ":" + year] as DaylightTime;
 
-		private static WindowsTimeZoneCollection LoadTimeZonesFromXml()
-		{
-			WindowsTimeZoneCollection tzs = new WindowsTimeZoneCollection();
-			XmlSerializer ser = new XmlSerializer(tzs.GetType());
+            if (retVal == null)
+            {
+                lock (daylightChangesLock)
+                {
+                    DateTime current;
+                    DateTime start = DateTime.MinValue;
+                    DateTime end = DateTime.MinValue;
+                    TimeSpan delta = TimeSpan.FromTicks(0);
 
-			using (StreamReader rs = new StreamReader(tzs.GetType().Assembly.GetManifestResourceStream(tzs.GetType().Namespace + ".WindowsTimeZoneCollection.xml")))
-			{
-				tzs = ser.Deserialize(rs) as WindowsTimeZoneCollection;
-			}
+                    if (winTZI.daylightDate.month != 0 && winTZI.standardDate.month != 0)
+                    {
+                        // day count is a value from 1 to 5, indicating the day 
+                        // in the month on which the switch occurs
+                        int dayCount = winTZI.daylightDate.day;
+                        current =
+                            start =
+                            new DateTime(year, winTZI.daylightDate.month, 1, winTZI.daylightDate.hour,
+                                         winTZI.daylightDate.minute, winTZI.daylightDate.second);
+                        while (current.Month == winTZI.daylightDate.month)
+                        {
+                            if (Convert.ToUInt16(current.DayOfWeek) == winTZI.daylightDate.dayOfWeek)
+                            {
+                                start = current;
+                                --dayCount;
+                                if (dayCount == 0)
+                                {
+                                    break;
+                                }
+                            }
+                            current = current.AddDays(1);
+                        }
 
-			return tzs;
-		}
+                        // day count is a value from 1 to 5, indicating the day 
+                        // in the month on which the switch occurs
+                        dayCount = winTZI.standardDate.day;
+                        current =
+                            end =
+                            new DateTime(year, winTZI.standardDate.month, 1, winTZI.standardDate.hour,
+                                         winTZI.standardDate.minute, winTZI.standardDate.second);
+                        while (current.Month == winTZI.standardDate.month)
+                        {
+                            if (Convert.ToUInt16(current.DayOfWeek) == winTZI.standardDate.dayOfWeek)
+                            {
+                                end = current;
+                                --dayCount;
+                                if (dayCount == 0)
+                                {
+                                    break;
+                                }
+                            }
+                            current = current.AddDays(1);
+                        }
+                        delta = daylightBias - standardBias;
+                    }
+                    retVal = new DaylightTime(start, end, delta);
+                    if (daylightChanges.ContainsKey(zoneIndex + ":" + year) == false)
+                    {
+                        daylightChanges.Add(zoneIndex + ":" + year, retVal);
+                    }
+                }
+            }
+            return retVal;
+        }
 
-		private static WindowsTimeZoneCollection LoadTimeZonesFromRegistry()
-		{
-			WindowsTimeZoneCollection tzs = new WindowsTimeZoneCollection();
-            
-			RegistryKey timeZoneListKey = Registry.LocalMachine.OpenSubKey("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Time Zones", false);
-			string[] timeZoneKeyNames = timeZoneListKey.GetSubKeyNames();
-			foreach (string timeZoneKeyName in timeZoneKeyNames)
-			{
-				RegistryKey timeZoneKey = timeZoneListKey.OpenSubKey(timeZoneKeyName);
-				WindowsTimeZone windowsTimeZone = 
-					new WindowsTimeZone(
-					timeZoneKey.GetValue("Display") as string,
-					timeZoneKey.GetValue("Dlt") as string,
-					timeZoneKey.GetValue("Std") as string,
-					(int)timeZoneKey.GetValue("Index" ),
-					timeZoneKey.GetValue("TZI") as byte[] );
+        public override TimeSpan GetUtcOffset(DateTime time)
+        {
+            if (IsDaylightSavingTime(time))
+            {
+                return baseBias + daylightBias;
+            }
+            else
+            {
+                return baseBias + standardBias;
+            }
+        }
 
-				tzs.Add( windowsTimeZone );
-			}
-			tzs.SortByTimeZoneBias();
-			return tzs;
-		}
+        /// <summary>
+        /// Returns the local time (for this timezone) that corresponds to a specified coordinated universal time (UTC).
+        /// </summary>
+        /// <param name="time">A UTC time.</param>
+        /// <returns>
+        /// A <see cref="T:System.DateTime"></see> instance whose value is the local time that corresponds to time.
+        /// </returns>
+        public override DateTime ToLocalTime(DateTime time)
+        {
+            bool isAmbiguousLocalDst;
+            long offset = GetUtcOffsetFromUniversalTime(time, out isAmbiguousLocalDst);
+            long newTimeInTicks = time.Ticks + offset;
 
-		internal long GetUtcOffsetFromUniversalTime(DateTime time, out bool isAmbiguousLocalDst)
-		{
-			TimeSpan utcOffset = this.baseBias;
-			DaylightTime daylightSavingsChanges = this.GetDaylightChanges(time.Year);
-			isAmbiguousLocalDst = false;
-			if ((daylightSavingsChanges != null) && (daylightSavingsChanges.Delta.Ticks != 0))
-			{
-				DateTime time4;
-				DateTime time5;
-				DateTime daylightSavingsStart = daylightSavingsChanges.Start - utcOffset;
-				DateTime daylightSavingsEnd = (daylightSavingsChanges.End - utcOffset) - daylightSavingsChanges.Delta;
-				if (daylightSavingsChanges.Delta.Ticks > 0)
-				{
-					time4 = daylightSavingsEnd - daylightSavingsChanges.Delta;
-					time5 = daylightSavingsEnd;
-				}
-				else
-				{
-					time4 = daylightSavingsStart;
-					time5 = daylightSavingsStart - daylightSavingsChanges.Delta;
-				}
-				bool flag1;
-				if (daylightSavingsStart > daylightSavingsEnd)
-				{
-					flag1 = (time < daylightSavingsEnd) || (time >= daylightSavingsStart);
-				}
-				else
-				{
-					flag1 = (time >= daylightSavingsStart) && (time < daylightSavingsEnd);
-				}
-				if (flag1)
-				{
-					utcOffset += daylightSavingsChanges.Delta;
-					if ((time >= time4) && (time < time5))
-					{
-						isAmbiguousLocalDst = true;
-					}
-				}
-			}
-			return utcOffset.Ticks;
-		}
-	}
+            if (newTimeInTicks > 0x2bca2875f4373fff)
+            {
+                return new DateTime(0x2bca2875f4373fff);
+            }
+            if (newTimeInTicks < 0)
+            {
+                return new DateTime(0);
+            }
 
+            return new DateTime(newTimeInTicks);
+        }
 
-	class WindowsTimeZoneBiasSorter : IComparer
-	{
-		public int Compare(object x, object y)
-		{
-			return ((WindowsTimeZone)x).BaseBias.CompareTo(((WindowsTimeZone)y).BaseBias);
-		}
-	}
+        public override DateTime ToUniversalTime(DateTime time)
+        {
+            long newTimeInTicks = time.Ticks - GetUtcOffset(time).Ticks;
+            return new DateTime(newTimeInTicks);
+        }
 
-	/// <summary>
-	/// A collection of elements of type WindowsTimeZone
-	/// </summary>
-	public class WindowsTimeZoneCollection: CollectionBase
-	{
-		/// <summary>
-		/// Initializes a new empty instance of the WindowsTimeZoneCollection class.
-		/// </summary>
-		/// <remarks>Made public for serialization.</remarks>
-		public WindowsTimeZoneCollection()
-		{
-			// empty
-		}
+        /// <summary>
+        /// Renders a UTC date time as a local time string, displaying the offset from UTC.
+        /// </summary>
+        /// <param name="date"></param>
+        /// <returns></returns>
+        public string FormatAdjustedUniversalTime(DateTime date)
+        {
+            TimeSpan utcOffset = GetUtcOffset(date);
+            DateTime adjustedTime = date + utcOffset;
+            string adjustedDateString;
 
-		/// <summary>
-		/// Adds an instance of type WindowsTimeZone to the end of this WindowsTimeZoneCollection.
-		/// </summary>
-		/// <param name="value">
-		/// The WindowsTimeZone to be added to the end of this WindowsTimeZoneCollection.
-		/// </param>
-		public virtual void Add(WindowsTimeZone value)
-		{
-			this.List.Add(value);
-		}
+            if (IsDaylightSavingTime(adjustedTime))
+            {
+                adjustedDateString =
+                    String.Format("{0} ({1}, UTC{2}{3:00}:{4:00})", adjustedTime.ToString("F"), DaylightName,
+                                  Math.Sign(utcOffset.Ticks) < 0 ? "-" : "+", Math.Abs(utcOffset.Hours),
+                                  Math.Abs(utcOffset.Minutes%60));
+            }
+            else
+            {
+                adjustedDateString =
+                    String.Format("{0} ({1}, UTC{2}{3:00}:{4:00})", adjustedTime.ToString("F"), StandardName,
+                                  Math.Sign(utcOffset.Ticks) < 0 ? "-" : "+", Math.Abs(utcOffset.Hours),
+                                  Math.Abs(utcOffset.Minutes%60));
+            }
+            return adjustedDateString;
+        }
 
-		/// <summary>
-		/// Determines whether a specfic WindowsTimeZone value is in this WindowsTimeZoneCollection.
-		/// </summary>
-		/// <param name="value">
-		/// The WindowsTimeZone value to locate in this WindowsTimeZoneCollection.
-		/// </param>
-		/// <returns>
-		/// true if value is found in this WindowsTimeZoneCollection;
-		/// false otherwise.
-		/// </returns>
-		public virtual bool Contains(WindowsTimeZone value)
-		{
-			return this.List.Contains(value);
-		}
 
-		/// <summary>
-		/// Return the zero-based index of the first occurrence of a specific value
-		/// in this WindowsTimeZoneCollection
-		/// </summary>
-		/// <param name="value">
-		/// The WindowsTimeZone value to locate in the WindowsTimeZoneCollection.
-		/// </param>
-		/// <returns>
-		/// The zero-based index of the first occurrence of the _ELEMENT value if found;
-		/// -1 otherwise.
-		/// </returns>
-		public virtual int IndexOf(WindowsTimeZone value)
-		{
-			return this.List.IndexOf(value);
-		}
+        private static WindowsTimeZoneCollection LoadTimeZonesFromXml()
+        {
+            WindowsTimeZoneCollection tzs = new WindowsTimeZoneCollection();
+            XmlSerializer ser = new XmlSerializer(tzs.GetType());
 
-		/// <summary>
-		/// Gets or sets the WindowsTimeZone at the given index in this WindowsTimeZoneCollection.
-		/// </summary>
-		public virtual WindowsTimeZone this[int index]
-		{
-			get
-			{
-				return (WindowsTimeZone) this.List[index];
-			}
-		}
+            using (
+                StreamReader rs =
+                    new StreamReader(
+                        tzs.GetType().Assembly.GetManifestResourceStream(tzs.GetType().Namespace +
+                                                                         ".WindowsTimeZoneCollection.xml")))
+            {
+                tzs = ser.Deserialize(rs) as WindowsTimeZoneCollection;
+            }
 
-		public virtual WindowsTimeZone GetByZoneIndex(int zoneIndex)
-		{
-			foreach( WindowsTimeZone wtz in this )
-			{
-				if ( wtz.ZoneIndex == zoneIndex )
-				{
-					return wtz;
-				}
-			}
-			return null;
-		}
+            return tzs;
+        }
 
-		/// <summary>
-		/// Type-specific enumeration class, used by WindowsTimeZoneCollection.GetEnumerator.
-		/// </summary>
-		public class Enumerator: IEnumerator
-		{
-			private IEnumerator wrapped;
+        private static WindowsTimeZoneCollection LoadTimeZonesFromRegistry()
+        {
+            WindowsTimeZoneCollection tzs = new WindowsTimeZoneCollection();
 
-			public Enumerator(WindowsTimeZoneCollection collection)
-			{
-				this.wrapped = ((CollectionBase)collection).GetEnumerator();
-			}
+            RegistryKey timeZoneListKey =
+                Registry.LocalMachine.OpenSubKey("SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Time Zones", false);
+            string[] timeZoneKeyNames = timeZoneListKey.GetSubKeyNames();
+            foreach (string timeZoneKeyName in timeZoneKeyNames)
+            {
+                RegistryKey timeZoneKey = timeZoneListKey.OpenSubKey(timeZoneKeyName);
+                WindowsTimeZone windowsTimeZone =
+                    new WindowsTimeZone(
+                        timeZoneKey.GetValue("Display") as string,
+                        timeZoneKey.GetValue("Dlt") as string,
+                        timeZoneKey.GetValue("Std") as string,
+                        (int) timeZoneKey.GetValue("Index"),
+                        timeZoneKey.GetValue("TZI") as byte[]);
 
-			public WindowsTimeZone Current
-			{
-				get
-				{
-					return (WindowsTimeZone) (this.wrapped.Current);
-				}
-			}
+                tzs.Add(windowsTimeZone);
+            }
+            tzs.SortByTimeZoneBias();
+            return tzs;
+        }
 
-			object IEnumerator.Current
-			{
-				get
-				{
-					return (this.wrapped.Current);
-				}
-			}
+        internal long GetUtcOffsetFromUniversalTime(DateTime time, out bool isAmbiguousLocalDst)
+        {
+            TimeSpan utcOffset = baseBias;
+            DaylightTime daylightSavingsChanges = GetDaylightChanges(time.Year);
+            isAmbiguousLocalDst = false;
+            if ((daylightSavingsChanges != null) && (daylightSavingsChanges.Delta.Ticks != 0))
+            {
+                DateTime time4;
+                DateTime time5;
+                DateTime daylightSavingsStart = daylightSavingsChanges.Start - utcOffset;
+                DateTime daylightSavingsEnd = (daylightSavingsChanges.End - utcOffset) - daylightSavingsChanges.Delta;
+                if (daylightSavingsChanges.Delta.Ticks > 0)
+                {
+                    time4 = daylightSavingsEnd - daylightSavingsChanges.Delta;
+                    time5 = daylightSavingsEnd;
+                }
+                else
+                {
+                    time4 = daylightSavingsStart;
+                    time5 = daylightSavingsStart - daylightSavingsChanges.Delta;
+                }
+                bool flag1;
+                if (daylightSavingsStart > daylightSavingsEnd)
+                {
+                    flag1 = (time < daylightSavingsEnd) || (time >= daylightSavingsStart);
+                }
+                else
+                {
+                    flag1 = (time >= daylightSavingsStart) && (time < daylightSavingsEnd);
+                }
+                if (flag1)
+                {
+                    utcOffset += daylightSavingsChanges.Delta;
+                    if ((time >= time4) && (time < time5))
+                    {
+                        isAmbiguousLocalDst = true;
+                    }
+                }
+            }
+            return utcOffset.Ticks;
+        }
+    }
 
-			public bool MoveNext()
-			{
-				return this.wrapped.MoveNext();
-			}
 
-			public void Reset()
-			{
-				this.wrapped.Reset();
-			}
+    internal class WindowsTimeZoneBiasSorter : IComparer
+    {
+        #region IComparer Members
 
-            
-		}
+        public int Compare(object x, object y)
+        {
+            return ((WindowsTimeZone) x).BaseBias.CompareTo(((WindowsTimeZone) y).BaseBias);
+        }
 
-		/// <summary>
-		/// Returns an enumerator that can iterate through the elements of this WindowsTimeZoneCollection.
-		/// </summary>
-		/// <returns>
-		/// An object that implements System.Collections.IEnumerator.
-		/// </returns>        
-		public new virtual Enumerator GetEnumerator()
-		{
-			return new Enumerator(this);
-		}
+        #endregion
+    }
 
-		public void SortByTimeZoneBias()
-		{
-			this.InnerList.Sort( new WindowsTimeZoneBiasSorter());
-		}
-	}
+    /// <summary>
+    /// A collection of elements of type WindowsTimeZone
+    /// </summary>
+    public class WindowsTimeZoneCollection : CollectionBase
+    {
+        /// <summary>
+        /// Initializes a new empty instance of the WindowsTimeZoneCollection class.
+        /// </summary>
+        /// <remarks>Made public for serialization.</remarks>
+        public WindowsTimeZoneCollection()
+        {
+            // empty
+        }
 
+        /// <summary>
+        /// Gets or sets the WindowsTimeZone at the given index in this WindowsTimeZoneCollection.
+        /// </summary>
+        public virtual WindowsTimeZone this[int index]
+        {
+            get { return (WindowsTimeZone) List[index]; }
+        }
 
-	public class UTCTimeZone : TimeZone
-	{
-		public override string DaylightName
-		{
-			get
-			{
-				return "UTC";
-			}
-		}
+        /// <summary>
+        /// Adds an instance of type WindowsTimeZone to the end of this WindowsTimeZoneCollection.
+        /// </summary>
+        /// <param name="value">
+        /// The WindowsTimeZone to be added to the end of this WindowsTimeZoneCollection.
+        /// </param>
+        public virtual void Add(WindowsTimeZone value)
+        {
+            List.Add(value);
+        }
 
-		public override DaylightTime GetDaylightChanges(int year)
-		{
-			return new DaylightTime(DateTime.MinValue,DateTime.MinValue, TimeSpan.FromTicks(0));
-		}
+        /// <summary>
+        /// Determines whether a specfic WindowsTimeZone value is in this WindowsTimeZoneCollection.
+        /// </summary>
+        /// <param name="value">
+        /// The WindowsTimeZone value to locate in this WindowsTimeZoneCollection.
+        /// </param>
+        /// <returns>
+        /// true if value is found in this WindowsTimeZoneCollection;
+        /// false otherwise.
+        /// </returns>
+        public virtual bool Contains(WindowsTimeZone value)
+        {
+            return List.Contains(value);
+        }
 
-		public override TimeSpan GetUtcOffset(DateTime time)
-		{
-			return TimeSpan.FromTicks(0);
-		}
+        /// <summary>
+        /// Return the zero-based index of the first occurrence of a specific value
+        /// in this WindowsTimeZoneCollection
+        /// </summary>
+        /// <param name="value">
+        /// The WindowsTimeZone value to locate in the WindowsTimeZoneCollection.
+        /// </param>
+        /// <returns>
+        /// The zero-based index of the first occurrence of the _ELEMENT value if found;
+        /// -1 otherwise.
+        /// </returns>
+        public virtual int IndexOf(WindowsTimeZone value)
+        {
+            return List.IndexOf(value);
+        }
 
-		public override bool IsDaylightSavingTime(DateTime time)
-		{
-			return false;
-		}
+        public virtual WindowsTimeZone GetByZoneIndex(int zoneIndex)
+        {
+            foreach (WindowsTimeZone wtz in this)
+            {
+                if (wtz.ZoneIndex == zoneIndex)
+                {
+                    return wtz;
+                }
+            }
+            return null;
+        }
 
-		public override string StandardName
-		{
-			get
-			{
-				return "UTC";
-			}
-		}
+        /// <summary>
+        /// Returns an enumerator that can iterate through the elements of this WindowsTimeZoneCollection.
+        /// </summary>
+        /// <returns>
+        /// An object that implements System.Collections.IEnumerator.
+        /// </returns>        
+        public new virtual Enumerator GetEnumerator()
+        {
+            return new Enumerator(this);
+        }
 
-		public override DateTime ToLocalTime(DateTime time)
-		{
-			return time;
-		}
+        public void SortByTimeZoneBias()
+        {
+            InnerList.Sort(new WindowsTimeZoneBiasSorter());
+        }
 
-		public override DateTime ToUniversalTime(DateTime time)
-		{
-			return time;
-		}
-	}
-    
+        #region Nested type: Enumerator
 
-}
+        /// <summary>
+        /// Type-specific enumeration class, used by WindowsTimeZoneCollection.GetEnumerator.
+        /// </summary>
+        public class Enumerator : IEnumerator
+        {
+            private IEnumerator wrapped;
+
+            public Enumerator(WindowsTimeZoneCollection collection)
+            {
+                wrapped = ((CollectionBase) collection).GetEnumerator();
+            }
+
+            public WindowsTimeZone Current
+            {
+                get { return (WindowsTimeZone) (wrapped.Current); }
+            }
+
+            #region IEnumerator Members
+
+            object IEnumerator.Current
+            {
+                get { return (wrapped.Current); }
+            }
+
+            public bool MoveNext()
+            {
+                return wrapped.MoveNext();
+            }
+
+            public void Reset()
+            {
+                wrapped.Reset();
+            }
+
+            #endregion
+        }
+
+        #endregion
+    }
+
+
+    public class UTCTimeZone : TimeZone
+    {
+        public override string DaylightName
+        {
+            get { return "UTC"; }
+        }
+
+        public override string StandardName
+        {
+            get { return "UTC"; }
+        }
+
+        public override DaylightTime GetDaylightChanges(int year)
+        {
+            return new DaylightTime(DateTime.MinValue, DateTime.MinValue, TimeSpan.FromTicks(0));
+        }
+
+        public override TimeSpan GetUtcOffset(DateTime time)
+        {
+            return TimeSpan.FromTicks(0);
+        }
+
+        public override bool IsDaylightSavingTime(DateTime time)
+        {
+            return false;
+        }
+
+        public override DateTime ToLocalTime(DateTime time)
+        {
+            return time;
+        }
+
+        public override DateTime ToUniversalTime(DateTime time)
+        {
+            return time;
+        }
+    }
+}
\ No newline at end of file

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Activity.aspx.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Activity.aspx.cs	2008-01-13 16:49:20 UTC (rev 801)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Activity.aspx.cs	2008-01-14 00:39:27 UTC (rev 802)
@@ -46,6 +46,7 @@
 using System.Web.UI.WebControls;
 using newtelligence.DasBlog.Runtime;
 using newtelligence.DasBlog.Web.Core;
+using newtelligence.DasBlog.Web.Core.Macros;
 
 namespace newtelligence.DasBlog.Web
 {

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ActivityBox.ascx.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ActivityBox.ascx.cs	2008-01-13 16:49:20 UTC (rev 801)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ActivityBox.ascx.cs	2008-01-14 00:39:27 UTC (rev 802)
@@ -47,6 +47,7 @@
 using System.Web.UI.HtmlControls;
 using System.Web.UI.WebControls;
 using newtelligence.DasBlog.Web.Core;
+using newtelligence.DasBlog.Web.Core.Config;
 
 namespace newtelligence.DasBlog.Web
 {

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AdminNavBar.ascx.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AdminNavBar.ascx.cs	2008-01-13 16:49:20 UTC (rev 801)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AdminNavBar.ascx.cs	2008-01-14 00:39:27 UTC (rev 802)
@@ -45,6 +45,7 @@
 using System.Resources;
 using System.Web.UI;
 using newtelligence.DasBlog.Web.Core;
+using newtelligence.DasBlog.Web.Core.Config;
 
 namespace newtelligence.DasBlog.Web
 {

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AggBugs.aspx.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AggBugs.aspx.cs	2008-01-13 16:49:20 UTC (rev 801)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AggBugs.aspx.cs	2008-01-14 00:39:27 UTC (rev 802)
@@ -46,6 +46,8 @@
 using System.Web.UI.WebControls;
 using newtelligence.DasBlog.Runtime;
 using newtelligence.DasBlog.Web.Core;
+using newtelligence.DasBlog.Web.Core.Config;
+using newtelligence.DasBlog.Web.Core.Macros;
 
 namespace newtelligence.DasBlog.Web
 {

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Archives.aspx.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Archives.aspx.cs	2008-01-13 16:49:20 UTC (rev 801)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Archives.aspx.cs	2008-01-14 00:39:27 UTC (rev 802)
@@ -5,6 +5,8 @@
 using System.Web.UI.WebControls;
 using newtelligence.DasBlog.Runtime;
 using newtelligence.DasBlog.Web.Core;
+using newtelligence.DasBlog.Web.Core.Config;
+using newtelligence.DasBlog.Web.Core.Macros;
 
 namespace newtelligence.DasBlog.Web
 {

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/BlogRollControl.ascx.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/BlogRollControl.ascx.cs	2008-01-13 16:49:20 UTC (rev 801)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/BlogRollControl.ascx.cs	2008-01-14 00:39:27 UTC (rev 802)
@@ -5,7 +5,7 @@
 using System.Web.UI;
 using System.Xml.XPath;
 using System.Xml.Xsl;
-using newtelligence.DasBlog.Web.Core;
+using newtelligence.DasBlog.Web.Core.Config;
 
 namespace newtelligence.DasBlog.Web
 {

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Blogroll.aspx.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Blogroll.aspx.cs	2008-01-13 16:49:20 UTC (rev 801)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Blogroll.aspx.cs	2008-01-14 00:39:27 UTC (rev 802)
@@ -6,6 +6,8 @@
 using System.Web.UI.WebControls;
 using newtelligence.DasBlog.Runtime;
 using newtelligence.DasBlog.Web.Core;
+using newtelligence.DasBlog.Web.Core.Config;
+using newtelligence.DasBlog.Web.Core.Macros;
 
 namespace newtelligence.DasBlog.Web
 {

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/CategoryView.aspx.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/CategoryView.aspx.cs	2008-01-13 16:49:20 UTC (rev 801)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/CategoryView.aspx.cs	2008-01-14 00:39:27 UTC (rev 802)
@@ -44,6 +44,7 @@
 using System.Web.UI.WebControls;
 using newtelligence.DasBlog.Runtime;
 using newtelligence.DasBlog.Web.Core;
+using newtelligence.DasBlog.Web.Core.Macros;
 
 namespace newtelligence.DasBlog.Web
 {

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ClickThroughs.aspx.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ClickThroughs.aspx.cs	2008-01-13 16:49:20 UTC (rev 801)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ClickThroughs.aspx.cs	2008-01-14 00:39:27 UTC (rev 802)
@@ -46,6 +46,8 @@
 using System.Web.UI.WebControls;
 using newtelligence.DasBlog.Runtime;
 using newtelligence.DasBlog.Web.Core;
+using newtelligence.DasBlog.Web.Core.Config;
+using newtelligence.DasBlog.Web.Core.Macros;
 
 namespace newtelligence.DasBlog.Web
 {

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/CommentView.aspx.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/CommentView.aspx.cs	2008-01-13 16:49:20 UTC (rev 801)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/CommentView.aspx.cs	2008-01-14 00:39:27 UTC (rev 802)
@@ -46,6 +46,8 @@
 using System.Web.UI.WebControls;
 using newtelligence.DasBlog.Runtime;
 using newtelligence.DasBlog.Web.Core;
+using newtelligence.DasBlog.Web.Core.Config;
+using newtelligence.DasBlog.Web.Core.Macros;
 using newtelligence.DasBlog.Web.Services;
 
 namespace newtelligence.DasBlog.Web

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/CrosspostReferrers.aspx.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/CrosspostReferrers.aspx.cs	2008-01-13 16:49:20 UTC (rev 801)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/CrosspostReferrers.aspx.cs	2008-01-14 00:39:27 UTC (rev 802)
@@ -44,6 +44,7 @@
 using System.Web.UI.WebControls;
 using newtelligence.DasBlog.Runtime;
 using newtelligence.DasBlog.Web.Core;
+using newtelligence.DasBlog.Web.Core.Macros;
 
 namespace newtelligence.DasBlog.Web
 {

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditBlogRoll.aspx.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditBlogRoll.aspx.cs	2008-01-13 16:49:20 UTC (rev 801)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditBlogRoll.aspx.cs	2008-01-14 00:39:27 UTC (rev 802)
@@ -44,6 +44,7 @@
 using System.Web.UI.WebControls;
 using newtelligence.DasBlog.Runtime;
 using newtelligence.DasBlog.Web.Core;
+using newtelligence.DasBlog.Web.Core.Macros;
 
 namespace newtelligence.DasBlog.Web
 {

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditBlogRollItem.ascx
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditBlogRollItem.ascx	2008-01-13 16:49:20 UTC (rev 801)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditBlogRollItem.ascx	2008-01-14 00:39:27 UTC (rev 802)
@@ -1,6 +1,6 @@
 <%@ Control Language="C#" AutoEventWireup="True" Inherits="newtelligence.DasBlog.Web.EditBlogRollItem" CodeFile="EditBlogRollItem.ascx.cs" %>
 <p>
-    <asp:HyperLink ID="rssLink" runat="server" ImageUrl='<%# (outlineCollection != null &amp;&amp; outlineCollection.Count > 0 ) ? ((newtelligence.DasBlog.Web.Core.SharedBasePage)Page).GetThemedImageUrl("outlinearrow") : ((newtelligence.DasBlog.Web.Core.SharedBasePage)Page).GetThemedImageUrl("xmlButton")%>' NavigateUrl='<%# XmlUrl %>'>
+    <asp:HyperLink ID="rssLink" runat="server" ImageUrl='<%# (outlineCollection != null && outlineCollection.Count > 0 ) ? ((newtelligence.DasBlog.Web.Core.SharedBasePage)Page).GetThemedImageUrl("outlinearrow") : ((newtelligence.DasBlog.Web.Core.SharedBasePage)Page).GetThemedImageUrl("xmlButton")%>' NavigateUrl='<%# XmlUrl %>'>
     </asp:HyperLink>
     <asp:HyperLink ID="htmlLink" runat="server" Text='<%# Title %>' NavigateUrl='<%# HtmlUrl %>'>
     </asp:HyperLink>&nbsp;

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditConfig.aspx.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditConfig.aspx.cs	2008-01-13 16:49:20 UTC (rev 801)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditConfig.aspx.cs	2008-01-14 00:39:27 UTC (rev 802)
@@ -44,6 +44,7 @@
 using System.Web.UI.WebControls;
 using newtelligence.DasBlog.Runtime;
 using newtelligence.DasBlog.Web.Core;
+using newtelligence.DasBlog.Web.Core.Macros;
 
 namespace newtelligence.DasBlog.Web
 {

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditContentFilters.aspx.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditContentFilters.aspx.cs	2008-01-13 16:49:20 UTC (rev 801)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditContentFilters.aspx.cs	2008-01-14 00:39:27 UTC (rev 802)
@@ -44,6 +44,7 @@
 using System.Web.UI.WebControls;
 using newtelligence.DasBlog.Runtime;
 using newtelligence.DasBlog.Web.Core;
+using newtelligence.DasBlog.Web.Core.Macros;
 
 namespace newtelligence.DasBlog.Web
 {

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditCrosspostSites.aspx.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditCrosspostSites.aspx.cs	2008-01-13 16:49:20 UTC (rev 801)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditCrosspostSites.aspx.cs	2008-01-14 00:39:27 UTC (rev 802)
@@ -44,6 +44,7 @@
 using System.Web.UI.WebControls;
 using newtelligence.DasBlog.Runtime;
 using newtelligence.DasBlog.Web.Core;
+using newtelligence.DasBlog.Web.Core.Macros;
 
 namespace newtelligence.DasBlog.Web
 {

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditEntry.aspx.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditEntry.aspx.cs	2008-01-13 16:49:20 UTC (rev 801)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditEntry.aspx.cs	2008-01-14 00:39:27 UTC (rev 802)
@@ -2,6 +2,7 @@
 using System.Web.UI.WebControls;
 using newtelligence.DasBlog.Runtime;
 using newtelligence.DasBlog.Web.Core;
+using newtelligence.DasBlog.Web.Core.Macros;
 
 namespace newtelligence.DasBlog.Web
 {

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditNavigatorLinks.aspx.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditNavigatorLinks.aspx.cs	2008-01-13 16:49:20 UTC (rev 801)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditNavigatorLinks.aspx.cs	2008-01-14 00:39:27 UTC (rev 802)
@@ -44,6 +44,7 @@
 using System.Web.UI.WebControls;
 using newtelligence.DasBlog.Runtime;
 using newtelligence.DasBlog.Web.Core;
+using newtelligence.DasBlog.Web.Core.Macros;
 
 namespace newtelligence.DasBlog.Web
 {

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditUser.aspx.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditUser.aspx.cs	2008-01-13 16:49:20 UTC (rev 801)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditUser.aspx.cs	2008-01-14 00:39:27 UTC (rev 802)
@@ -3,6 +3,7 @@
 using System.Web.UI.WebControls;
 using newtelligence.DasBlog.Runtime;
 using newtelligence.DasBlog.Web.Core;
+using newtelligence.DasBlog.Web.Core.Macros;
 
 namespace newtelligence.DasBlog.Web
 {

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Email.aspx.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Email.aspx.cs	2008-01-13 16:49:20 UTC (rev 801)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Email.aspx.cs	2008-01-14 00:39:27 UTC (rev 802)
@@ -4,6 +4,7 @@
 using System.Web.UI.WebControls;
 using newtelligence.DasBlog.Runtime;
 using newtelligence.DasBlog.Web.Core;
+using newtelligence.DasBlog.Web.Core.Macros;
 
 namespace newtelligence.DasBlog.Web
 {

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Eventlog.aspx.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Eventlog.aspx.cs	2008-01-13 16:49:20 UTC (rev 801)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Eventlog.aspx.cs	2008-01-14 00:39:27 UTC (rev 802)
@@ -44,6 +44,7 @@
 using System.Web.UI.WebControls;
 using newtelligence.DasBlog.Runtime;
 using newtelligence.DasBlog.Web.Core;
+using newtelligence.DasBlog.Web.Core.Macros;
 
 namespace newtelligence.DasBlog.Web
 {

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/FormatPage.aspx.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/FormatPage.aspx.cs	2008-01-13 16:49:20 UTC (rev 801)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/FormatPage.aspx.cs	2008-01-14 00:39:27 UTC (rev 802)
@@ -46,6 +46,7 @@
 using System.Web.UI.WebControls;
 using newtelligence.DasBlog.Runtime;
 using newtelligence.DasBlog.Web.Core;
+using newtelligence.DasBlog.Web.Core.Macros;
 
 namespace newtelligence.DasBlog.Web
 {

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Login.aspx.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Login.aspx.cs	2008-01-13 16:49:20 UTC (rev 801)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Login.aspx.cs	2008-01-14 00:39:27 UTC (rev 802)
@@ -44,6 +44,7 @@
 using System.Web.UI.WebControls;
 using newtelligence.DasBlog.Runtime;
 using newtelligence.DasBlog.Web.Core;
+using newtelligence.DasBlog.Web.Core.Macros;
 
 namespace newtelligence.DasBlog.Web
 {

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/MonthView.aspx.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/MonthView.aspx.cs	2008-01-13 16:49:20 UTC (rev 801)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/MonthView.aspx.cs	2008-01-14 00:39:27 UTC (rev 802)
@@ -44,6 +44,7 @@
 using System.Web.UI.WebControls;
 using newtelligence.DasBlog.Runtime;
 using newtelligence.DasBlog.Web.Core;
+using newtelligence.DasBlog.Web.Core.Macros;
 
 namespace newtelligence.DasBlog.Web
 {

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/PermaLink.aspx.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/PermaLink.aspx.cs	2008-01-13 16:49:20 UTC (rev 801)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/PermaLink.aspx.cs	2008-01-14 00:39:27 UTC (rev 802)
@@ -44,6 +44,7 @@
 using System.Web.UI.WebControls;
 using newtelligence.DasBlog.Runtime;
 using newtelligence.DasBlog.Web.Core;
+using newtelligence.DasBlog.Web.Core.Macros;
 
 namespace newtelligence.DasBlog.Web
 {

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Profile.aspx.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Profile.aspx.cs	2008-01-13 16:49:20 UTC (rev 801)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Profile.aspx.cs	2008-01-14 00:39:27 UTC (rev 802)
@@ -45,6 +45,7 @@
 using System.Web.UI.WebControls;
 using newtelligence.DasBlog.Runtime;
 using newtelligence.DasBlog.Web.Core;
+using newtelligence.DasBlog.Web.Core.Macros;
 
 namespace newtelligence.DasBlog.Web
 {

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Referrers.aspx.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Referrers.aspx.cs	2008-01-13 16:49:20 UTC (rev 801)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Referrers.aspx.cs	2008-01-14 00:39:27 UTC (rev 802)
@@ -44,6 +44,7 @@
 using System.Web.UI.WebControls;
 using newtelligence.DasBlog.Runtime;
 using newtelligence.DasBlog.Web.Core;
+using newtelligence.DasBlog.Web.Core.Macros;
 
 namespace newtelligence.DasBlog.Web
 {

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/SearchView.aspx.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/SearchView.aspx.cs	2008-01-13 16:49:20 UTC (rev 801)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/SearchView.aspx.cs	2008-01-14 00:39:27 UTC (rev 802)
@@ -42,6 +42,7 @@
 using System.Web.UI.WebControls;
 using newtelligence.DasBlog.Runtime;
 using newtelligence.DasBlog.Web.Core;
+using newtelligence.DasBlog.Web.Core.Macros;
 
 namespace newtelligence.DasBlog.Web
 {

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/TimeLine.aspx.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/TimeLine.aspx.cs	2008-01-13 16:49:20 UTC (rev 801)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/TimeLine.aspx.cs	2008-01-14 00:39:27 UTC (rev 802)
@@ -3,6 +3,7 @@
 using System.Web.UI.WebControls;
 using newtelligence.DasBlog.Runtime;
 using newtelligence.DasBlog.Web.Core;
+using newtelligence.DasBlog.Web.Core.Macros;
 
 namespace newtelligence.DasBlog.Web
 {

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/UserClickThroughs.aspx.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/UserClickThroughs.aspx.cs	2008-01-13 16:49:20 UTC (rev 801)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/UserClickThroughs.aspx.cs	2008-01-14 00:39:27 UTC (rev 802)
@@ -44,6 +44,7 @@
 using System.Web.UI.WebControls;
 using newtelligence.DasBlog.Runtime;
 using newtelligence.DasBlog.Web.Core;
+using newtelligence.DasBlog.Web.Core.Macros;
 
 namespace newtelligence.DasBlog.Web
 {

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/UserView.aspx.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/UserView.aspx.cs	2008-01-13 16:49:20 UTC (rev 801)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/UserView.aspx.cs	2008-01-14 00:39:27 UTC (rev 802)
@@ -2,6 +2,7 @@
 using System.Web.UI.WebControls;
 using newtelligence.DasBlog.Runtime;
 using newtelligence.DasBlog.Web.Core;
+using newtelligence.DasBlog.Web.Core.Macros;
 
 namespace newtelligence.DasBlog.Web
 {

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Web.config
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Web.config	2008-01-13 16:49:20 UTC (rev 801)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Web.config	2008-01-14 00:39:27 UTC (rev 802)
@@ -1,80 +1,80 @@
 <?xml version="1.0"?>
 <configuration>
-	<configSections>
-		<!-- USED FOR CUSTOM MACROS ONLY
-        <section requirePermission="false" name="newtelligence.DasBlog.Macros" type="newtelligence.DasBlog.Web.Core.MacroSectionHandler, newtelligence.DasBlog.Web.Core" /> -->
-		<section requirePermission="false" name="newtelligence.ControlImages" type="newtelligence.DasBlog.Web.Core.WebControls.ControlImageModuleSectionHandler, newtelligence.DasBlog.Web.Core"/>
-		<section requirePermission="false" name="newtelligence.DasBlog.UrlMapper" type="newtelligence.DasBlog.Web.Core.UrlMapperModuleSectionHandler, newtelligence.DasBlog.Web.Core"/>
-		<!-- http compression handler section -->
-		<sectionGroup name="blowery.web">
-			<section requirePermission="false" name="httpCompress" type="blowery.Web.HttpCompress.SectionHandler, blowery.Web.HttpCompress"/>
-		</sectionGroup>
-	</configSections>
-	<runtime>
-		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-			<dependentAssembly>
-				<assemblyIdentity name="FreeTextBox" publicKeyToken="5962a4e684a48b87" culture="neutral"/>
-				<bindingRedirect oldVersion="3.0.5000.0-3.0.5000.6" newVersion="3.1.6.35504"/>
-			</dependentAssembly>
-		</assemblyBinding>
-	</runtime>
-	<!-- USED FOR CUSTOM MACROS ONLY
-    <newtelligence.DasBlog.Macros>
+  <configSections>
+    <!-- USED FOR CUSTOM MACROS ONLY
+		<section requirePermission="false" name="newtelligence.DasBlog.Macros.Macros" type="newtelligence.DasBlog.Web.Core.Macros.MacroSectionHandler, newtelligence.DasBlog.Web.Core" /> -->
+    <section requirePermission="false" name="newtelligence.ControlImages" type="newtelligence.DasBlog.Web.Core.WebControls.ControlImageModuleSectionHandler, newtelligence.DasBlog.Web.Core"/>
+    <section requirePermission="false" name="newtelligence.DasBlog.UrlMapper" type="newtelligence.DasBlog.Web.Core.UrlMapperModuleSectionHandler, newtelligence.DasBlog.Web.Core"/>
+    <!-- http compression handler section -->
+    <sectionGroup name="blowery.web">
+      <section requirePermission="false" name="httpCompress" type="blowery.Web.HttpCompress.SectionHandler, blowery.Web.HttpCompress"/>
+    </sectionGroup>
+  </configSections>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="FreeTextBox" publicKeyToken="5962a4e684a48b87" culture="neutral"/>
+        <bindingRedirect oldVersion="3.0.5000.0-3.0.5000.6" newVersion="3.1.6.35504"/>
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+  <!-- USED FOR CUSTOM MACROS ONLY
+    <newtelligence.DasBlog.Macros.Macros>
 		<add macro="foo" type="FooMacroPlugin.FooMacros,FooMacroPlugin"/>
-    </newtelligence.DasBlog.Macros> -->
-	<newtelligence.ControlImages>
-		<add type="newtelligence.DasBlog.Web.Core.WebControls.ShadowBox" name="shadowbox"/>
-	</newtelligence.ControlImages>
-	<newtelligence.DasBlog.UrlMapper>
-		<add matchExpression="(?&lt;basedir&gt;.*?)/atom\.ashx" mapTo="{basedir}/SyndicationServiceExperimental.asmx/GetAtom?"/>
-		<add matchExpression="(?&lt;basedir&gt;.*?)/rss\.as[hp]x" mapTo="{basedir}/SyndicationService.asmx/GetRss?"/>
-		<!-- TSC: LINK rewriting -->
-		<add matchExpression="LINKRW(?&lt;site&gt;.+).aspx\?(?&lt;param&gt;.+)=(?&lt;value&gt;.+)" mapTo="{site},{param},{value}.aspx"/>
-		<!-- TSC: URL rewriting -->
-		<!-- (?<basedir>.*?)/(?<site>.*?),(?<param>.*?),(?<value>.+)\.aspx -->
-		<add matchExpression="(?&lt;basedir&gt;.*?)/(?&lt;site&gt;.*?),(?&lt;param&gt;.*?),(?&lt;value&gt;.+)\.aspx" mapTo="{basedir}/{site}.aspx?{param}={value}"/>
-		<!-- .TEXT archive compatibility -->
-		<!-- Translates
+    </newtelligence.DasBlog.Macros.Macros> -->
+  <newtelligence.ControlImages>
+    <add type="newtelligence.DasBlog.Web.Core.WebControls.ShadowBox" name="shadowbox"/>
+  </newtelligence.ControlImages>
+  <newtelligence.DasBlog.UrlMapper>
+    <add matchExpression="(?&lt;basedir&gt;.*?)/atom\.ashx" mapTo="{basedir}/SyndicationServiceExperimental.asmx/GetAtom?"/>
+    <add matchExpression="(?&lt;basedir&gt;.*?)/rss\.as[hp]x" mapTo="{basedir}/SyndicationService.asmx/GetRss?"/>
+    <!-- TSC: LINK rewriting -->
+    <add matchExpression="LINKRW(?&lt;site&gt;.+).aspx\?(?&lt;param&gt;.+)=(?&lt;value&gt;.+)" mapTo="{site},{param},{value}.aspx"/>
+    <!-- TSC: URL rewriting -->
+    <!-- (?<basedir>.*?)/(?<site>.*?),(?<param>.*?),(?<value>.+)\.aspx -->
+    <add matchExpression="(?&lt;basedir&gt;.*?)/(?&lt;site&gt;.*?),(?&lt;param&gt;.*?),(?&lt;value&gt;.+)\.aspx" mapTo="{basedir}/{site}.aspx?{param}={value}"/>
+    <!-- .TEXT archive compatibility -->
+    <!-- Translates
 				FROM: /blog/archive/2004/07/27/194.aspx
                   TO: /blog/default.aspx?date=2004-07-27
         -->
-		<add matchExpression="(?&lt;basedir&gt;.*?)/archive/(?&lt;year&gt;\d{4})/(?&lt;month&gt;\d{2})/(?&lt;day&gt;\d{2})/(?&lt;postid&gt;\d+)\.aspx" mapTo="{basedir}/default.aspx?date={year}-{month}-{day}"/>
-		<!-- .TEXT archive compatibility -->
-		<!-- ALTERNATIVE: Translates
+    <add matchExpression="(?&lt;basedir&gt;.*?)/archive/(?&lt;year&gt;\d{4})/(?&lt;month&gt;\d{2})/(?&lt;day&gt;\d{2})/(?&lt;postid&gt;\d+)\.aspx" mapTo="{basedir}/default.aspx?date={year}-{month}-{day}"/>
+    <!-- .TEXT archive compatibility -->
+    <!-- ALTERNATIVE: Translates
 				FROM: /blog/archive/2004/07/27/194.aspx
                   TO: /blog/permalink.aspx?guid=194
         -->
-		<!-- 
+    <!-- 
         <add matchExpression="(?&lt;basedir&gt;.*?)/archive/(?&lt;year&gt;\d{4})/(?&lt;month&gt;\d{2})/(?&lt;day&gt;\d{2})/(?&lt;postid&gt;\d+)\.aspx"
             mapTo="{basedir}/permalink.aspx?guid={postid}" />        
 -->
-	</newtelligence.DasBlog.UrlMapper>
-	<!-- config section for my http module -->
-	<blowery.web>
-		<!-- Here's an example on how to change the algorithm or compression level
+  </newtelligence.DasBlog.UrlMapper>
+  <!-- config section for my http module -->
+  <blowery.web>
+    <!-- Here's an example on how to change the algorithm or compression level
 		<compressionModule preferredAlgorithm="deflate|gzip" compressionLevel="high|normal|low"/>
 		so, to use deflate by default, and high compression, you would use the following line 
 		-->
-		<httpCompress preferredAlgorithm="gzip" compressionLevel="high">
-			<excludedMimeTypes>
-				<add type="image/jpeg"/>
-				<add type="image/gif"/>
-			</excludedMimeTypes>
-			<excludedPaths>
-				<add path="WebResource.axd"/>
-				<add path="ebResource.axd"/>
-			</excludedPaths>
-		</httpCompress>
-	</blowery.web>
-	<system.diagnostics>
-		<assert assertuienabled="false"/>
-	</system.diagnostics>
-	<system.web>
-		<trust level="Medium" originUrl="" />
+    <httpCompress preferredAlgorithm="gzip" compressionLevel="high">
+      <excludedMimeTypes>
+        <add type="image/jpeg"/>
+        <add type="image/gif"/>
+      </excludedMimeTypes>
+      <excludedPaths>
+        <add path="WebResource.axd"/>
+        <add path="ebResource.axd"/>
+      </excludedPaths>
+    </httpCompress>
+  </blowery.web>
+  <system.diagnostics>
+    <assert assertuienabled="false"/>
+  </system.diagnostics>
+  <system.web>
+    <trust level="Medium" originUrl="" />
 
-		<!--  level="[Full|High|Medium|Low|Minimal]" -->
-		<!-- <trust level="High" originUrl=""/>  -->
-		<!--  DYNAMIC DEBUG COMPILATION
+    <!--  level="[Full|High|Medium|Low|Minimal]" -->
+    <!-- <trust level="High" originUrl=""/>  -->
+    <!--  DYNAMIC DEBUG COMPILATION
           Set compilation debug="true" to enable ASPX debugging.  Otherwise, setting this value to
           false will improve runtime performance of this application. 
           Set compilation debug="true" to insert debugging symbols (.pdb information)
@@ -83,8 +83,8 @@
           false at all other times. For more information, refer to the documentation about
           debugging ASP .NET files.
     -->
-		<compilation defaultLanguage="C#" debug="true"/>
-		<!--  CUSTOM ERROR MESSAGES
+    <compilation defaultLanguage="C#" debug="true"/>
+    <!--  CUSTOM ERROR MESSAGES
           Set customError mode values to control the display of user-friendly  
           error messages to users instead of error details (including a stack trace):
 
@@ -94,1068 +94,1068 @@
           on the local Web server. This setting is recommended for security purposes, so 
           that you do not display application detail information to remote clients.
     -->
-		<customErrors mode="Off"/>
-		<!-- ***IMPORTANT*** If you are using ASP.NET 2.0 to host dasBlog
+    <customErrors mode="Off"/>
+    <!-- ***IMPORTANT*** If you are using ASP.NET 2.0 to host dasBlog
 			                     you must uncomment the httpCookies section below, 
 			                     as dasBlog was written for ASP.NET 1.1 and will
 			                     automatically add the HttpOnly flag to cookies automatically -->
-		<!-- <httpCookies httpOnlyCookies="false"/> -->
-		<authentication mode="Forms">
-			<!-- NOTE: If you want to run MULTIPLE dasBlogs on the SAME Domain Name
+    <!-- <httpCookies httpOnlyCookies="false"/> -->
+    <authentication mode="Forms">
+      <!-- NOTE: If you want to run MULTIPLE dasBlogs on the SAME Domain Name
 			     include the path in each blog's Web.Config like path="/dasblog1" and path="/yoursite"
 			     as appropriate. -->
-			<forms name=".DASBLOGAUTH" protection="All" timeout="60" path="/" cookieless="UseCookies" />
-		</authentication>
-		<!--
+      <forms name=".DASBLOGAUTH" protection="All" timeout="60" path="/" cookieless="UseCookies" />
+    </authentication>
+    <!--
         If your ISP/Hoster supports ASP.NET impersonation, they are likley
         setting this to true in their machine.config. You should not set it to true
         unless you know that dasBlog will have the correct permissions
        
         <identity impersonate="false" />
         -->
-		<httpRuntime useFullyQualifiedRedirectUrl="true"/>
-		<!--  APPLICATION-LEVEL TRACE LOGGING
+    <httpRuntime useFullyQualifiedRedirectUrl="true"/>
+    <!--  APPLICATION-LEVEL TRACE LOGGING
           Application-level tracing enables trace log output for every page within an application. 
           Set trace enabled="true" to enable application trace logging.  If pageOutput="true", the
           trace information will be displayed at the bottom of each page.  Otherwise, you can view the 
           application trace log by browsing the "trace.axd" page from your web application
           root. 
     -->
-		<trace enabled="false" requestLimit="1000" pageOutput="true" traceMode="SortByTime" localOnly="true"/>
-		<!--  SESSION STATE SETTINGS
+    <trace enabled="false" requestLimit="1000" pageOutput="true" traceMode="SortByTime" localOnly="true"/>
+    <!--  SESSION STATE SETTINGS
           By default ASP .NET uses cookies to identify which requests belong to a particular session. 
           If cookies are not available, a session can be tracked by adding a session identifier to the URL. 
           To disable cookies, set sessionState cookieless="true".
     -->
-		<sessionState mode="InProc" stateConnectionString="tcpip=127.0.0.1:42424" sqlConnectionString="data source=127.0.0.1;user id=sa;password=" cookieless="false" timeout="20"/>
-		<!--  GLOBALIZATION
+    <sessionState mode="InProc" stateConnectionString="tcpip=127.0.0.1:42424" sqlConnectionString="data source=127.0.0.1;user id=sa;password=" cookieless="false" timeout="20"/>
+    <!--  GLOBALIZATION
           This section sets the globalization settings of the application. 
     -->
-		<globalization requestEncoding="utf-8" responseEncoding="utf-8"/>
-		<pages validateRequest="true"/>
-		<httpHandlers>
-			<add verb="GET" path="CaptchaImage.aspx" type="WebControlCaptcha.CaptchaImageHandler, WebControlCaptcha"/>
-			<add verb="*" path="aggbug.ashx" type="newtelligence.DasBlog.Web.Services.AggregatorBugHandler, newtelligence.DasBlog.Web.Services"/>
-			<add verb="*" path="ct.ashx" type="newtelligence.DasBlog.Web.Services.ClickThroughHandler, newtelligence.DasBlog.Web.Services"/>
-			<add verb="*" path="cptrk.ashx" type="newtelligence.DasBlog.Web.Services.CrosspostReferrerHandler, newtelligence.DasBlog.Web.Services"/>
-			<add verb="*" path="deleteItem.ashx" type="newtelligence.DasBlog.Web.Services.DeleteItemHandler, newtelligence.DasBlog.Web.Services"/>
-			<add verb="*" path="approveItem.ashx" type="newtelligence.DasBlog.Web.Services.ApproveItemHandler, newtelligence.DasBlog.Web.Services"/>
-			<add verb="*" path="cdf.ashx" type="newtelligence.DasBlog.Web.Services.CdfHandler, newtelligence.DasBlog.Web.Services"/>
-			<add verb="*" path="blogger.aspx" type="newtelligence.DasBlog.Web.Services.BloggerAPI, newtelligence.DasBlog.Web.Services"/>
-			<add verb="*" path="pingback.aspx" type="newtelligence.DasBlog.Web.Services.PingbackAPI, newtelligence.DasBlog.Web.Services"/>
-			<add verb="*" path="trackback.aspx" type="newtelligence.DasBlog.Web.Services.TrackbackHandler, newtelligence.DasBlog.Web.Services"/>
-			<add verb="*" path="autoSaveEntry.ashx" type="newtelligence.DasBlog.Web.Services.AutoSaveEntryHandler, newtelligence.DasBlog.Web.Services"/>
-			<add verb="*" path="microsummary.ashx" type="newtelligence.DasBlog.Web.Services.MicrosummaryHandler, newtelligence.DasBlog.Web.Services"/>
-			<add verb="GET" path="googleSitemap.ashx" type="newtelligence.DasBlog.Web.Services.GoogleSitemapHandler, newtelligence.DasBlog.Web.Services"/>
-			<add verb="GET" path="timeline.ashx" type="newtelligence.DasBlog.Web.Services.TimelineHandler, newtelligence.DasBlog.Web.Services"/>
-			<add verb="*" path="*.blogtemplate" type="System.Web.HttpForbiddenHandler"/>
-		</httpHandlers>
-		<webServices>
-			<protocols>
-				<add name="HttpGet"/>
-			</protocols>
-		</webServices>
-		<httpModules>
-			<add type="newtelligence.DasBlog.Web.Core.UrlMapperModule, newtelligence.DasBlog.Web.Core" name="UrlMapperModule"/>
-			<add type="newtelligence.DasBlog.Web.Core.TitleMapperModule, newtelligence.DasBlog.Web.Core" name="TitleMapperModule"/>
-			<add type="newtelligence.DasBlog.Web.Core.ProfileMapperModule, newtelligence.DasBlog.Web.Core" name="ProfileMapperModule"/>
-			<add type="newtelligence.DasBlog.Web.Core.WebControls.ControlImageModule, newtelligence.DasBlog.Web.Core" name="ControlImageModule"/>
-			<add type="blowery.Web.HttpCompress.HttpModule, blowery.web.HttpCompress" name="CompressionModule"/>
-			<add type="newtelligence.DasBlog.Web.Core.IPBlackList, newtelligence.DasBlog.Web.Core" name="IPBlackList"/>
-		</httpModules>
-		<!-- ** UPDATE YOUR OWN BrowserCaps section with markup from SlingFive:
+    <globalization requestEncoding="utf-8" responseEncoding="utf-8"/>
+    <pages validateRequest="true"/>
+    <httpHandlers>
+      <add verb="GET" path="CaptchaImage.aspx" type="WebControlCaptcha.CaptchaImageHandler, WebControlCaptcha"/>
+      <add verb="*" path="aggbug.ashx" type="newtelligence.DasBlog.Web.Services.AggregatorBugHandler, newtelligence.DasBlog.Web.Services"/>
+      <add verb="*" path="ct.ashx" type="newtelligence.DasBlog.Web.Services.ClickThroughHandler, newtelligence.DasBlog.Web.Services"/>
+      <add verb="*" path="cptrk.ashx" type="newtelligence.DasBlog.Web.Services.CrosspostReferrerHandler, newtelligence.DasBlog.Web.Services"/>
+      <add verb="*" path="deleteItem.ashx" type="newtelligence.DasBlog.Web.Services.DeleteItemHandler, newtelligence.DasBlog.Web.Services"/>
+      <add verb="*" path="approveItem.ashx" type="newtelligence.DasBlog.Web.Services.ApproveItemHandler, newtelligence.DasBlog.Web.Services"/>
+      <add verb="*" path="cdf.ashx" type="newtelligence.DasBlog.Web.Services.CdfHandler, newtelligence.DasBlog.Web.Services"/>
+      <add verb="*" path="blogger.aspx" type="newtelligence.DasBlog.Web.Services.BloggerAPI, newtelligence.DasBlog.Web.Services"/>
+      <add verb="*" path="pingback.aspx" type="newtelligence.DasBlog.Web.Services.PingbackAPI, newtelligence.DasBlog.Web.Services"/>
+      <add verb="*" path="trackback.aspx" type="newtelligence.DasBlog.Web.Services.TrackbackHandler, newtelligence.DasBlog.Web.Services"/>
+      <add verb="*" path="autoSaveEntry.ashx" type="newtelligence.DasBlog.Web.Services.AutoSaveEntryHandler, newtelligence.DasBlog.Web.Services"/>
+      <add verb="*" path="microsummary.ashx" type="newtelligence.DasBlog.Web.Services.MicrosummaryHandler, newtelligence.DasBlog.Web.Services"/>
+      <add verb="GET" path="googleSitemap.ashx" type="newtelligence.DasBlog.Web.Services.GoogleSitemapHandler, newtelligence.DasBlog.Web.Services"/>
+      <add verb="GET" path="timeline.ashx" type="newtelligence.DasBlog.Web.Services.TimelineHandler, newtelligence.DasBlog.Web.Services"/>
+      <add verb="*" path="*.blogtemplate" type="System.Web.HttpForbiddenHandler"/>
+    </httpHandlers>
+    <webServices>
+      <protocols>
+        <add name="HttpGet"/>
+      </protocols>
+    </webServices>
+    <httpModules>
+      <add type="newtelligence.DasBlog.Web.Core.UrlMapperModule, newtelligence.DasBlog.Web.Core" name="UrlMapperModule"/>
+      <add type="newtelligence.DasBlog.Web.Core.TitleMapperModule, newtelligence.DasBlog.Web.Core" name="TitleMapperModule"/>
+      <add type="newtelligence.DasBlog.Web.Core.ProfileMapperModule, newtelligence.DasBlog.Web.Core" name="ProfileMapperModule"/>
+      <add type="newtelligence.DasBlog.Web.Core.WebControls.ControlImageModule, newtelligence.DasBlog.Web.Core" name="ControlImageModule"/>
+      <add type="blowery.Web.HttpCompress.HttpModule, blowery.web.HttpCompress" name="CompressionModule"/>
+      <add type="newtelligence.DasBlog.Web.Core.IPBlackList, newtelligence.DasBlog.Web.Core" name="IPBlackList"/>
+    </httpModules>
+    <!-- ** UPDATE YOUR OWN BrowserCaps section with markup from SlingFive:
 			http://slingfive.com/pages/code/browserCaps/ 
 			This is useful for supporting Mobile Browsers...however, this WHOLE section
 			can be safely deleted if you like.
 		-->
-		<!-- Periodic device updates replace this browser capabilities section.
+    <!-- Periodic device updates replace this browser capabilities section.
 					Please document any changes you make to this section before installing device updates.
 			-->
-		<!-- For updates to this browser data visit CodeProject, at http://www.codeproject.com/aspnet/browsercaps.asp -->
-		<browserCaps>
-			<result type="System.Web.Mobile.MobileCapabilities, System.Web.Mobile, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"/>
-			<use var="HTTP_USER_AGENT"/>
-	
-	  browser=Unknown
-	  version=0.0
-	  majorversion=0
-	  minorversion=0
-	  frames=false
-	  tables=false
-	  cookies=false
-	  backgroundsounds=false
-	  vbscript=false
-	  javascript=false
-	  javaapplets=false
-	  activexcontrols=false
-	  win16=false
-	  win32=false
-	  beta=false
-	  ak=false
-	  sk=false
-	  aol=false
-	  crawler=false
-	  cdf=false
-	  gold=false
-	  authenticodeupdate=false
-	  tagwriter=System.Web.UI.Html32TextWriter
-	  ecmascriptversion=0.0
-	  msdomversion=0.0
-	  w3cdomversion=0.0
-	  platform=Unknown
-	  css1=false
-	  css2=false
-	  xml=false
-	
-	  mobileDeviceManufacturer = "Unknown"
-	  mobileDeviceModel = "Unknown"
-	
-	  gatewayVersion = "None"
-	  gatewayMajorVersion = "0"
-	  gatewayMinorVersion = "0"
-	  gatewayRevisionVersion = "0"
-	
-	  preferredRenderingType = "html32"
-	  preferredRenderingMime = "text/html"
-	  preferredImageMime = "image/gif"
-	
-	  defaultScreenCharactersWidth = "12"
-	  defaultScreenCharactersHeight = "6"
-	  defaultScreenPixelsWidth = "96"
-	  defaultScreenPixelsHeight = "72"
-	  defaultCharacterWidth = "8"
-	  defaultCharacterHeight = "12"
-	  screenBitDepth = "1"
-	  isColor = "false"
-	  inputType = "telephoneKeypad"
-	
-	  numberOfSoftkeys = "0"
-	  maximumSoftkeyLabelLength = "5"
-	
-	  canInitiateVoiceCall = "false"
-	
-	  canSendMail = "true"
-	  hasBackButton = "true"
-	  rendersWmlDoAcceptsInline = "true"
-	  rendersWmlSelectsAsMenuCards = "false"
-	  rendersBreaksAfterWmlAnchor = "false"
-	  rendersBreaksAfterWmlInput = "false"
-	  rendersBreakBeforeWmlSelectAndInput = "false"
-	  requiresAttributeColonSubstitution = "false"
-	  requiresPhoneNumbersAsPlainText = "false"
-	  requiresUrlEncodedPostfieldValues = "false"
-	  requiredMetaTagNameValue = ""
-	  rendersBreaksAfterHtmlLists = "true"
-	  requiresUniqueHtmlCheckboxNames = "false"
-	  requiresUniqueHtmlInputNames = "false"
-	  requiresUniqueFilePathSuffix = "false"
-	  supportsCss = "false"
-	  hidesRightAlignedMultiselectScrollbars = "false"
-	  canRenderAfterInputOrSelectElement = "true"
-	  canRenderInputAndSelectElementsTogether = "true"
-	  canRenderOneventAndPrevElementsTogether = "true"
-	  canCombineFormsInDeck = "true"
-	  canRenderMixedSelects = "true"
-	  canRenderPostBackCards = "true"
-	  canRenderSetvarZeroWithMultiSelectionList = "true"
-	  supportsImageSubmit = "false"
-	  supportsSelectMultiple = "true"
-	  requiresHtmlAdaptiveErrorReporting = "false"
-	  requiresContentTypeMetaTag = "false"
-	  requiresDBCSCharacter = "false"
-	  requiresOutputOptimization = "false"
-	  supportsAccesskeyAttribute = "false"
-	  supportsInputIStyle = "false"
-	  supportsInputMode = "false"
-	  supportsIModeSymbols = "false"
-	  supportsJPhoneSymbols = "false"
-	  supportsJPhoneMultiMediaAttributes = "false"
-	  maximumRenderedPageSize = "2000"
-	  requiresSpecialViewStateEncoding = "false"
-	  requiresNoBreakInFormatting = "false"
-	  requiresLeadingPageBreak = "false"
-	  supportsQueryStringInFormAction = "true"
-	  supportsCacheControlMetaTag = "true"
-	  supportsUncheck = "true"
-	  canRenderEmptySelects = "true"
-	  supportsRedirectWithCookie = "true"
-	  supportsEmptyStringInCookieValue = "true"
-	  cachesAllResponsesWithExpires = "false"
-	  requiresNoSoftkeyLabels = "false"
-	  defaultSubmitButtonLimit = "1"
-	
-	  supportsBold = "false"
-	  supportsItalic = "false"
-	  supportsFontSize = "false"
-	  supportsFontName = "false"
-	  supportsFontColor = "true"
-	  supportsBodyColor = "true"
-	  supportsDivAlign = "true"
-	  supportsDivNoWrap = "false"
-	  supportsCharacterEntityEncoding = "true"
-	
-	  isMobileDevice="false"
-	
-	  <!-- Owen Brady 10-15-05 -->
-			<!-- 
+    <!-- For updates to this browser data visit CodeProject, at http://www.codeproject.com/aspnet/browsercaps.asp -->
+    <browserCaps>
+      <result type="System.Web.Mobile.MobileCapabilities, System.Web.Mobile, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"/>
+      <use var="HTTP_USER_AGENT"/>
+
+      browser=Unknown
+      version=0.0
+      majorversion=0
+      minorversion=0
+      frames=false
+      tables=false
+      cookies=false
+      backgroundsounds=false
+      vbscript=false
+      javascript=false
+      javaapplets=false
+      activexcontrols=false
+      win16=false
+      win32=false
+      beta=false
+      ak=false
+      sk=false
+      aol=false
+      crawler=false
+      cdf=false
+      gold=false
+      authenticodeupdate=false
+      tagwriter=System.Web.UI.Html32TextWriter
+      ecmascriptversion=0.0
+      msdomversion=0.0
+      w3cdomversion=0.0
+      platform=Unknown
+      css1=false
+      css2=false
+      xml=false
+
+      mobileDeviceManufacturer = "Unknown"
+      mobileDeviceModel = "Unknown"
+
+      gatewayVersion = "None"
+      gatewayMajorVersion = "0"
+      gatewayMinorVersion = "0"
+      gatewayRevisionVersion = "0"
+
+      preferredRenderingType = "html32"
+      preferredRenderingMime = "text/html"
+      preferredImageMime = "image/gif"
+
+      defaultScreenCharactersWidth = "12"
+      defaultScreenCharactersHeight = "6"
+      defaultScreenPixelsWidth = "96"
+      defaultScreenPixelsHeight = "72"
+      defaultCharacterWidth = "8"
+      defaultCharacterHeight = "12"
+      screenBitDepth = "1"
+      isColor = "false"
+      inputType = "telephoneKeypad"
+
+      numberOfSoftkeys = "0"
+      maximumSoftkeyLabelLength = "5"
+
+      canInitiateVoiceCall = "false"
+
+      canSendMail = "true"
+      hasBackButton = "true"
+      rendersWmlDoAcceptsInline = "true"
+      rendersWmlSelectsAsMenuCards = "false"
+      rendersBreaksAfterWmlAnchor = "false"
+      rendersBreaksAfterWmlInput = "false"
+      rendersBreakBeforeWmlSelectAndInput = "false"
+      requiresAttributeColonSubstitution = "false"
+      requiresPhoneNumbersAsPlainText = "false"
+      requiresUrlEncodedPostfieldValues = "false"
+      requiredMetaTagNameValue = ""
+      rendersBreaksAfterHtmlLists = "true"
+      requiresUniqueHtmlCheckboxNames = "false"
+      requiresUniqueHtmlInputNames = "false"
+      requiresUniqueFilePathSuffix = "false"
+      supportsCss = "false"
+      hidesRightAlignedMultiselectScrollbars = "false"
+      canRenderAfterInputOrSelectElement = "true"
+      canRenderInputAndSelectElementsTogether = "true"
+      canRenderOneventAndPrevElementsTogether = "true"
+      canCombineFormsInDeck = "true"
+      canRenderMixedSelects = "true"
+      canRenderPostBackCards = "true"
+      canRenderSetvarZeroWithMultiSelectionList = "true"
+      supportsImageSubmit = "false"
+      supportsSelectMultiple = "true"
+      requiresHtmlAdaptiveErrorReporting = "false"
+      requiresContentTypeMetaTag = "false"
+      requiresDBCSCharacter = "false"
+      requiresOutputOptimization = "false"
+      supportsAccesskeyAttribute = "false"
+      supportsInputIStyle = "false"
+      supportsInputMode = "false"
+      supportsIModeSymbols = "false"
+      supportsJPhoneSymbols = "false"
+      supportsJPhoneMultiMediaAttributes = "false"
+      maximumRenderedPageSize = "2000"
+      requiresSpecialViewStateEncoding = "false"
+      requiresNoBreakInFormatting = "false"
+      requiresLeadingPageBreak = "false"
+      supportsQueryStringInFormAction = "true"
+      supportsCacheControlMetaTag = "true"
+      supportsUncheck = "true"
+      canRenderEmptySelects = "true"
+      supportsRedirectWithCookie = "true"
+      supportsEmptyStringInCookieValue = "true"
+      cachesAllResponsesWithExpires = "false"
+      requiresNoSoftkeyLabels = "false"
+      defaultSubmitButtonLimit = "1"
+
+      supportsBold = "false"
+      supportsItalic = "false"
+      supportsFontSize = "false"
+      supportsFontName = "false"
+      supportsFontColor = "true"

@@ Diff output truncated at 100000 characters. @@

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Dasblogce-cvs] SF.net SVN: dasblogce: [806] branches/refactoring_architecture/source

From: <sfcaus@us...> - 2008-01-17 00:58

Revision: 806
          http://dasblogce.svn.sourceforge.net/dasblogce/?rev=806&view=rev
Author:   sfcaus
Date:     2008-01-16 16:58:40 -0800 (Wed, 16 Jan 2008)

Log Message:
-----------
- refactoring issue fixed

Modified Paths:
--------------
    branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Html/HtmlTokenizer.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Global.asax

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Html/HtmlTokenizer.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Html/HtmlTokenizer.cs	2008-01-15 21:54:35 UTC (rev 805)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Util/Html/HtmlTokenizer.cs	2008-01-17 00:58:40 UTC (rev 806)
@@ -47,6 +47,8 @@
 #endregion
 
 using System;
+using System.IO;
+using System.Text;
 
 namespace newtelligence.DasBlog.Util.Html 
 {
@@ -847,12 +849,14 @@
             }
             char[] chars = Encoding.UTF8.GetChars(memStream.ToArray());
 
-            Token t = HtmlTokenizer.GetFirstToken(chars);
+            Token t = GetFirstToken(chars);
             Console.WriteLine(t);
             FileStream stream = new FileStream(args[1], FileMode.Create);
+
             while (t != null) 
             {
-                t = HtmlTokenizer.GetNextToken(t);
+                t = GetNextToken(t);
+
                 if (t != null) 
                 {
                     Console.WriteLine(t);

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Global.asax
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Global.asax	2008-01-15 21:54:35 UTC (rev 805)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Global.asax	2008-01-17 00:58:40 UTC (rev 806)
@@ -1,2 +1 @@
-<%@ Import namespace="newtelligence.DasBlog.Web"%>
-<%@ Application CodeFile="Global.asax.cs" Inherits="Global" %>
+<%@ Application CodeBehind="Global.asax.cs" Inherits="newtelligence.DasBlog.Web.Global" %>
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Dasblogce-cvs] SF.net SVN: dasblogce: [798] branches/refactoring_architecture/source/ newtelligence.DasBlog.Web

From: <sfcaus@us...> - 2008-01-13 12:44

Revision: 798
          http://dasblogce.svn.sourceforge.net/dasblogce/?rev=798&view=rev
Author:   sfcaus
Date:     2008-01-13 04:44:28 -0800 (Sun, 13 Jan 2008)

Log Message:
-----------
+ ASP.NET 2.0 migration fix

Modified Paths:
--------------
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Activity.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AdminNavBar.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ArchivesControl.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/BlogRollControl.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ConfigEditingService.asmx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditBlogRollBox.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditBlogRollEditItem.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditBlogRollItem.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditConfigBox.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditContentFiltersBox.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditCrosspostSitesBox.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditEntryBox.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditNavigatorLinksBox.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditService.asmx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditUserBox.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EmailBox.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/FormatControl.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/LogDateBar.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/LoginBox.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Logout.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ProfileCombo.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Search.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/SearchViewBox.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/SingleCommentView.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/SyndicationService.asmx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/SyndicationServiceExperimental.asmx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ThemeBar.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ThemeCombo.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/TimeLineControl.ascx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Web.config
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/SyndicationServiceExperimentalImplementation.cs

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Activity.aspx.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Activity.aspx.cs	2008-01-12 18:18:51 UTC (rev 797)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Activity.aspx.cs	2008-01-13 12:44:28 UTC (rev 798)
@@ -1,4 +1,5 @@
 #region Copyright (c) 2003, newtelligence AG. All rights reserved.
+
 /*
 // Copyright (c) 2003, newtelligence AG. (http://www.newtelligence.com)
 // Original BlogX Source Code: Copyright (c) 2003, Chris Anderson (http://simplegeek.com)
@@ -35,6 +36,7 @@
 // or following this notice. 
 //
 */
+
 #endregion
 
 using System;
@@ -45,42 +47,35 @@
 
 namespace newtelligence.DasBlog.Web
 {
-    /// <summary>
-    /// Summary description for WebForm1.
-    /// </summary>
-    public partial class Activity : SharedBasePage, IPageFormatInfo 
+    public partial class Activity : SharedBasePage, IPageFormatInfo
     {
-                
-		override protected void OnInit(EventArgs e)
-		{
-			InitializeComponent();
-			base.OnInit(e);
-		}
-		
-		private void InitializeComponent()
-		{    
-		}
-       
-		protected override PlaceHolder ContentPlaceHolder
-		{
-			get
-			{
-				return contentPlaceHolder;
-			}
-		}
+        protected override PlaceHolder ContentPlaceHolder
+        {
+            get { return contentPlaceHolder; }
+        }
 
-		protected override EntryCollection LoadEntries()
-		{
-			return new EntryCollection();
-		}
+        #region IPageFormatInfo Members
 
-		public Control Bodytext
-		{
-			get
-			{
-				return LoadControl("ActivityBox.ascx");
-			}
-		}
+        public Control Bodytext
+        {
+            get { return LoadControl("ActivityBox.ascx"); }
+        }
 
+        #endregion
+
+        protected override void OnInit(EventArgs e)
+        {
+            InitializeComponent();
+            base.OnInit(e);
+        }
+
+        private void InitializeComponent()
+        {
+        }
+
+        protected override EntryCollection LoadEntries()
+        {
+            return new EntryCollection();
+        }
     }
-}
+}
\ No newline at end of file

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AdminNavBar.ascx
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AdminNavBar.ascx	2008-01-12 18:18:51 UTC (rev 797)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AdminNavBar.ascx	2008-01-13 12:44:28 UTC (rev 798)
@@ -1,4 +1,4 @@
-<%@ Control Language="c#" AutoEventWireup="True" Inherits="newtelligence.DasBlog.Web.AdminNavBar" CodeFile="AdminNavBar.ascx.cs" %>
+<%@ Control Language="C#" AutoEventWireup="True" Inherits="newtelligence.DasBlog.Web.AdminNavBar" CodeFile="AdminNavBar.ascx.cs" %>
 <div class="adminNavbarStyle" id="DIV1" runat="server">
     <ul>
         <li id="editEntry" class="first" runat="server">

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ArchivesControl.ascx
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ArchivesControl.ascx	2008-01-12 18:18:51 UTC (rev 797)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ArchivesControl.ascx	2008-01-13 12:44:28 UTC (rev 798)
@@ -1,4 +1,4 @@
-<%@ Control Language="c#" AutoEventWireup="True" Inherits="newtelligence.DasBlog.Web.ArchivesControl"
+<%@ Control Language="C#" AutoEventWireup="True" Inherits="newtelligence.DasBlog.Web.ArchivesControl"
     CodeFile="ArchivesControl.ascx.cs" %>
 <div class="bodyContentStyle">
     <asp:PlaceHolder ID="contentPlaceHolder" runat="server"></asp:PlaceHolder>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/BlogRollControl.ascx
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/BlogRollControl.ascx	2008-01-12 18:18:51 UTC (rev 797)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/BlogRollControl.ascx	2008-01-13 12:44:28 UTC (rev 798)
@@ -1,4 +1,4 @@
-<%@ Control Language="c#" AutoEventWireup="True" Inherits="newtelligence.DasBlog.Web.BlogRollControl" CodeFile="BlogRollControl.ascx.cs" %>
+<%@ Control Language="C#" AutoEventWireup="True" Inherits="newtelligence.DasBlog.Web.BlogRollControl" CodeFile="BlogRollControl.ascx.cs" %>
 <div class="bodyContentStyle">
     <div id="footer">
         <asp:PlaceHolder ID="contentPlaceHolder" runat="server"></asp:PlaceHolder>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ConfigEditingService.asmx
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ConfigEditingService.asmx	2008-01-12 18:18:51 UTC (rev 797)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ConfigEditingService.asmx	2008-01-13 12:44:28 UTC (rev 798)
@@ -1 +1 @@
-<%@ WebService Language="c#" CodeFile="ConfigEditingService.asmx.cs" Class="newtelligence.DasBlog.Web.ConfigEditingService" %>
+<%@ WebService Language="C#" CodeFile="ConfigEditingService.asmx.cs" Class="newtelligence.DasBlog.Web.ConfigEditingService" %>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditBlogRollBox.ascx
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditBlogRollBox.ascx	2008-01-12 18:18:51 UTC (rev 797)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditBlogRollBox.ascx	2008-01-13 12:44:28 UTC (rev 798)
@@ -1,7 +1,7 @@
 <%@ Register TagPrefix="uc1" TagName="EditBlogRollItem" Src="EditBlogRollItem.ascx" %>
 <%@ Register TagPrefix="uc1" TagName="EditBlogRollEditItem" Src="EditBlogRollEditItem.ascx" %>
 <%@ Register TagPrefix="cc1" Namespace="newtelligence.DasBlog.Web.Core.WebControls" Assembly="newtelligence.DasBlog.Web.Core" %>
-<%@ Control Language="c#" AutoEventWireup="True" CodeFile="EditBlogRollBox.ascx.cs" Inherits="newtelligence.DasBlog.Web.EditBlogRollBox" %>
+<%@ Control Language="C#" AutoEventWireup="True" CodeFile="EditBlogRollBox.ascx.cs" Inherits="newtelligence.DasBlog.Web.EditBlogRollBox" %>
 <div class="bodyContentStyle">
     <div class="pageTopic">
         <asp:Label ID="Label1" runat="server" Text='<%# resmgr.GetString("text_blogrolls_title")%>'>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditBlogRollEditItem.ascx
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditBlogRollEditItem.ascx	2008-01-12 18:18:51 UTC (rev 797)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditBlogRollEditItem.ascx	2008-01-13 12:44:28 UTC (rev 798)
@@ -1,4 +1,4 @@
-<%@ Control Language="c#" AutoEventWireup="True" CodeFile="EditBlogRollEditItem.ascx.cs" Inherits="newtelligence.DasBlog.Web.EditBlogRollEditItem" %>
+<%@ Control Language="C#" AutoEventWireup="True" CodeFile="EditBlogRollEditItem.ascx.cs" Inherits="newtelligence.DasBlog.Web.EditBlogRollEditItem" %>
 <%@ Register TagPrefix="blogcore" Namespace="newtelligence.DasBlog.Web.Core" Assembly="newtelligence.DasBlog.Web.Core" %>
 <%@ Register TagPrefix="uc1" TagName="EditBlogRollItem" Src="EditBlogRollItem.ascx" %>
 <table id="itemEditTable" cellspacing="0" cellpadding="2" width="100%" border="0" style="margin-bottom: 20px">

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditBlogRollItem.ascx
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditBlogRollItem.ascx	2008-01-12 18:18:51 UTC (rev 797)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditBlogRollItem.ascx	2008-01-13 12:44:28 UTC (rev 798)
@@ -1,4 +1,4 @@
-<%@ Control Language="c#" AutoEventWireup="True" Inherits="newtelligence.DasBlog.Web.EditBlogRollItem" CodeFile="EditBlogRollItem.ascx.cs" %>
+<%@ Control Language="C#" AutoEventWireup="True" Inherits="newtelligence.DasBlog.Web.EditBlogRollItem" CodeFile="EditBlogRollItem.ascx.cs" %>
 <p>
     <asp:HyperLink ID="rssLink" runat="server" ImageUrl='<%# (outlineCollection != null &amp;&amp; outlineCollection.Count > 0 ) ? ((newtelligence.DasBlog.Web.Core.SharedBasePage)Page).GetThemedImageUrl("outlinearrow") : ((newtelligence.DasBlog.Web.Core.SharedBasePage)Page).GetThemedImageUrl("xmlButton")%>' NavigateUrl='<%# XmlUrl %>'>
     </asp:HyperLink>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditConfigBox.ascx
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditConfigBox.ascx	2008-01-12 18:18:51 UTC (rev 797)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditConfigBox.ascx	2008-01-13 12:44:28 UTC (rev 798)
@@ -1,4 +1,4 @@
-<%@ Control Language="c#" AutoEventWireup="True" Inherits="newtelligence.DasBlog.Web.EditConfigBox" CodeFile="EditConfigBox.ascx.cs" %>
+<%@ Control Language="C#" AutoEventWireup="True" Inherits="newtelligence.DasBlog.Web.EditConfigBox" CodeFile="EditConfigBox.ascx.cs" %>
 <div class="bodyContentStyle">
     <div class="pageTopic">
         <asp:Label ID="Label12" runat="server" Text='<%# resmgr.GetString("text_config_title") %>'>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditContentFiltersBox.ascx
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditContentFiltersBox.ascx	2008-01-12 18:18:51 UTC (rev 797)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditContentFiltersBox.ascx	2008-01-13 12:44:28 UTC (rev 798)
@@ -1,6 +1,6 @@
 <%@ Register TagPrefix="cc1" Namespace="newtelligence.DasBlog.Web.Core.WebControls" Assembly="newtelligence.DasBlog.Web.Core" %>
 <%@ Register TagPrefix="ftb" Namespace="FreeTextBoxControls" Assembly="FreeTextBox" %>
-<%@ Control Language="c#" AutoEventWireup="True" Inherits="newtelligence.DasBlog.Web.EditContentFiltersBox" CodeFile="EditContentFiltersBox.ascx.cs" %>
+<%@ Control Language="C#" AutoEventWireup="True" Inherits="newtelligence.DasBlog.Web.EditContentFiltersBox" CodeFile="EditContentFiltersBox.ascx.cs" %>
 <div class="bodyContentStyle">
     <div class="pageTopic">
         <asp:Label ID="labelTitle" runat="server" Text='<%# resmgr.GetString("text_filters_title") %>'>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditCrosspostSitesBox.ascx
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditCrosspostSitesBox.ascx	2008-01-12 18:18:51 UTC (rev 797)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditCrosspostSitesBox.ascx	2008-01-13 12:44:28 UTC (rev 798)
@@ -1,5 +1,5 @@
 <%@ Register TagPrefix="cc1" Namespace="newtelligence.DasBlog.Web.Core.WebControls" Assembly="newtelligence.DasBlog.Web.Core" %>
-<%@ Control Language="c#" AutoEventWireup="True" Inherits="newtelligence.DasBlog.Web.EditCrosspostSitesBox" Debug="True" CodeFile="EditCrosspostSitesBox.ascx.cs" %>
+<%@ Control Language="C#" AutoEventWireup="True" Inherits="newtelligence.DasBlog.Web.EditCrosspostSitesBox" Debug="True" CodeFile="EditCrosspostSitesBox.ascx.cs" %>
 <div class="bodyContentStyle">
     <div class="pageTopic">
         <asp:Label ID="labelTitle" runat="server" Text='<%# resmgr.GetString("text_crosspost_title") %>'>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditEntryBox.ascx
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditEntryBox.ascx	2008-01-12 18:18:51 UTC (rev 797)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditEntryBox.ascx	2008-01-13 12:44:28 UTC (rev 798)
@@ -1,5 +1,5 @@
 <%@ Register TagPrefix="bdp" Namespace="BasicFrame.WebControls" Assembly="BasicFrame.WebControls.BasicDatePicker" %>
-<%@ Control Language="c#" AutoEventWireup="True" Inherits="newtelligence.DasBlog.Web.EditEntryBox" CodeFile="EditEntryBox.ascx.cs" %>
+<%@ Control Language="C#" AutoEventWireup="True" Inherits="newtelligence.DasBlog.Web.EditEntryBox" CodeFile="EditEntryBox.ascx.cs" %>
 <%@ Register TagPrefix="ftb" Namespace="FreeTextBoxControls" Assembly="FreeTextBox" %>
 
 <script src="scripts/AjaxDelegate.js" type="text/javascript"></script>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditNavigatorLinksBox.ascx
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditNavigatorLinksBox.ascx	2008-01-12 18:18:51 UTC (rev 797)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditNavigatorLinksBox.ascx	2008-01-13 12:44:28 UTC (rev 798)
@@ -1,4 +1,4 @@
-<%@ Control Language="c#" AutoEventWireup="True" Inherits="newtelligence.DasBlog.Web.EditNavigatorLinksBox" CodeFile="EditNavigatorLinksBox.ascx.cs" %>
+<%@ Control Language="C#" AutoEventWireup="True" Inherits="newtelligence.DasBlog.Web.EditNavigatorLinksBox" CodeFile="EditNavigatorLinksBox.ascx.cs" %>
 <%@ Register TagPrefix="cc1" Namespace="newtelligence.DasBlog.Web.Core.WebControls" Assembly="newtelligence.DasBlog.Web.Core" %>
 <div class="bodyContentStyle">
     <div class="pageTopic">

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditService.asmx
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditService.asmx	2008-01-12 18:18:51 UTC (rev 797)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditService.asmx	2008-01-13 12:44:28 UTC (rev 798)
@@ -1 +1 @@
-<%@ WebService Language="c#" CodeFile="EditService.asmx.cs" Class="newtelligence.DasBlog.Web.EditService" %>
+<%@ WebService Language="C#" CodeFile="EditService.asmx.cs" Class="newtelligence.DasBlog.Web.EditService" %>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditUserBox.ascx
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditUserBox.ascx	2008-01-12 18:18:51 UTC (rev 797)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EditUserBox.ascx	2008-01-13 12:44:28 UTC (rev 798)
@@ -1,5 +1,5 @@
 <%@ Register TagPrefix="ftb" Namespace="FreeTextBoxControls" Assembly="FreeTextBox" %>
-<%@ Control Language="c#" AutoEventWireup="True" Inherits="newtelligence.DasBlog.Web.EditUserBox" CodeFile="EditUserBox.ascx.cs" %>
+<%@ Control Language="C#" AutoEventWireup="True" Inherits="newtelligence.DasBlog.Web.EditUserBox" CodeFile="EditUserBox.ascx.cs" %>
 <div class="bodyContentStyle">
     <div class="pageTopic">
         <asp:Label ID="labelConfig" Text='<%# resmgr.GetString("text_config_title") %>' runat="server">

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EmailBox.ascx
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EmailBox.ascx	2008-01-12 18:18:51 UTC (rev 797)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/EmailBox.ascx	2008-01-13 12:44:28 UTC (rev 798)
@@ -1,5 +1,5 @@
 <%@ Register TagPrefix="cc1" Namespace="WebControlCaptcha" Assembly="WebControlCaptcha" %>
-<%@ Control Language="c#" AutoEventWireup="True" CodeFile="EmailBox.ascx.cs" Inherits="newtelligence.DasBlog.Web.EmailBox" %>
+<%@ Control Language="C#" AutoEventWireup="True" CodeFile="EmailBox.ascx.cs" Inherits="newtelligence.DasBlog.Web.EmailBox" %>
 <div class="bodyContentStyle" id="content" runat="server">
     <div class="commentViewBoxStyle" id="commentViewEntry">
         <h3>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/FormatControl.ascx
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/FormatControl.ascx	2008-01-12 18:18:51 UTC (rev 797)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/FormatControl.ascx	2008-01-13 12:44:28 UTC (rev 798)
@@ -1,4 +1,4 @@
-<%@ Control Language="c#" AutoEventWireup="True" Inherits="newtelligence.DasBlog.Web.FormatControl" CodeFile="FormatControl.ascx.cs" %>
+<%@ Control Language="C#" AutoEventWireup="True" Inherits="newtelligence.DasBlog.Web.FormatControl" CodeFile="FormatControl.ascx.cs" %>
 <div class="bodyContentStyle">
     <asp:PlaceHolder ID="contentPlaceHolder" runat="server"></asp:PlaceHolder>
 </div>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/LogDateBar.ascx
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/LogDateBar.ascx	2008-01-12 18:18:51 UTC (rev 797)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/LogDateBar.ascx	2008-01-13 12:44:28 UTC (rev 798)
@@ -1,4 +1,4 @@
-<%@ Control Language="c#" AutoEventWireup="True" Inherits="newtelligence.DasBlog.Web.LogDateBar" CodeFile="LogDateBar.ascx.cs" %>
+<%@ Control Language="C#" AutoEventWireup="True" Inherits="newtelligence.DasBlog.Web.LogDateBar" CodeFile="LogDateBar.ascx.cs" %>
 <a id="linkPrevious" runat="server" title='<%# resmgr.GetString("tooltip_previous")%>'>&lt;</a>
 <asp:DropDownList ID="DropDownListMonth" runat="server">
 </asp:DropDownList>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/LoginBox.ascx
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/LoginBox.ascx	2008-01-12 18:18:51 UTC (rev 797)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/LoginBox.ascx	2008-01-13 12:44:28 UTC (rev 798)
@@ -1,4 +1,4 @@
-<%@ Control Language="c#" AutoEventWireup="True" Inherits="newtelligence.DasBlog.Web.LoginBox" CodeFile="LoginBox.ascx.cs" %>
+<%@ Control Language="C#" AutoEventWireup="True" Inherits="newtelligence.DasBlog.Web.LoginBox" CodeFile="LoginBox.ascx.cs" %>
 <div class="signInContainerStyle" id="login">
     <table class="signInTableStyle">
         <tr>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Logout.ascx
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Logout.ascx	2008-01-12 18:18:51 UTC (rev 797)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Logout.ascx	2008-01-13 12:44:28 UTC (rev 798)
@@ -1,4 +1,4 @@
-<%@ Control Language="c#" AutoEventWireup="True" Inherits="newtelligence.DasBlog.Web.Logout" CodeFile="Logout.ascx.cs" %>
+<%@ Control Language="C#" AutoEventWireup="True" Inherits="newtelligence.DasBlog.Web.Logout" CodeFile="Logout.ascx.cs" %>
 <div class="signInContainerStyle">
     <table class="signInTableStyle">
         <tr>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ProfileCombo.ascx
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ProfileCombo.ascx	2008-01-12 18:18:51 UTC (rev 797)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ProfileCombo.ascx	2008-01-13 12:44:28 UTC (rev 798)
@@ -1,3 +1,3 @@
-<%@ Control Language="c#" AutoEventWireup="True" Inherits="newtelligence.DasBlog.Web.ProfileCombo" CodeFile="ProfileCombo.ascx.cs" %>
+<%@ Control Language="C#" AutoEventWireup="True" Inherits="newtelligence.DasBlog.Web.ProfileCombo" CodeFile="ProfileCombo.ascx.cs" %>
 <asp:DropDownList ID="listProfiles" runat="server" AutoPostBack="True" OnSelectedIndexChanged="listProfiles_SelectedIndexChanged">
 </asp:DropDownList>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Search.ascx
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Search.ascx	2008-01-12 18:18:51 UTC (rev 797)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Search.ascx	2008-01-13 12:44:28 UTC (rev 798)
@@ -1,5 +1,5 @@
 <%@ Import Namespace="newtelligence.DasBlog.Web" %>
-<%@ Control Language="c#" AutoEventWireup="True" Inherits="Search" CodeFile="Search.ascx.cs" %>
+<%@ Control Language="C#" AutoEventWireup="True" Inherits="Search" CodeFile="Search.ascx.cs" %>
 
 <script type="text/javascript">
 <!--

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/SearchViewBox.ascx
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/SearchViewBox.ascx	2008-01-12 18:18:51 UTC (rev 797)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/SearchViewBox.ascx	2008-01-13 12:44:28 UTC (rev 798)
@@ -1,4 +1,4 @@
-<%@ Control Language="c#" Codebehind="SearchViewBox.ascx.cs" AutoEventWireup="false" Inherits="newtelligence.DasBlog.Web.SeachViewBox" %>
+<%@ Control Language="C#" Codebehind="SearchViewBox.ascx.cs" AutoEventWireup="false" Inherits="newtelligence.DasBlog.Web.SeachViewBox" %>
 <div class="pageTopic">
     <asp:Label ID="labelSearchQuery" runat="server"></asp:Label></div>
 <div class="bodyContentStyle">

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/SingleCommentView.ascx
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/SingleCommentView.ascx	2008-01-12 18:18:51 UTC (rev 797)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/SingleCommentView.ascx	2008-01-13 12:44:28 UTC (rev 798)
@@ -1 +1 @@
-<%@ Control Language="c#" AutoEventWireup="True" Inherits="SingleCommentView" CodeFile="SingleCommentView.ascx.cs" %>
+<%@ Control Language="C#" AutoEventWireup="True" Inherits="SingleCommentView" CodeFile="SingleCommentView.ascx.cs" %>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/SyndicationService.asmx
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/SyndicationService.asmx	2008-01-12 18:18:51 UTC (rev 797)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/SyndicationService.asmx	2008-01-13 12:44:28 UTC (rev 798)
@@ -1 +1 @@
-<%@ WebService Language="c#" CodeFile="SyndicationService.asmx.cs" Class="newtelligence.DasBlog.Web.SyndicationService" %>
+<%@ WebService Language="C#" CodeFile="SyndicationService.asmx.cs" Class="newtelligence.DasBlog.Web.SyndicationService" %>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/SyndicationServiceExperimental.asmx
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/SyndicationServiceExperimental.asmx	2008-01-12 18:18:51 UTC (rev 797)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/SyndicationServiceExperimental.asmx	2008-01-13 12:44:28 UTC (rev 798)
@@ -1 +1 @@
-<%@ WebService Language="c#" CodeFile="SyndicationServiceExperimental.asmx.cs" Class="newtelligence.DasBlog.Web.SyndicationServiceExperimental" %>
+<%@ WebService Language="C#" CodeFile="SyndicationServiceExperimental.asmx.cs" Class="newtelligence.DasBlog.Web.SyndicationServiceExperimental" %>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ThemeBar.ascx
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ThemeBar.ascx	2008-01-12 18:18:51 UTC (rev 797)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ThemeBar.ascx	2008-01-13 12:44:28 UTC (rev 798)
@@ -1,4 +1,4 @@
-<%@ Control Language="c#" AutoEventWireup="True" Inherits="newtelligence.DasBlog.Web.ThemeBar" CodeFile="ThemeBar.ascx.cs" %>
+<%@ Control Language="C#" AutoEventWireup="True" Inherits="newtelligence.DasBlog.Web.ThemeBar" CodeFile="ThemeBar.ascx.cs" %>
 <asp:Label ID="Label1" runat="server" Text='<%# newtelligence.DasBlog.Web.ApplicationResourceTable.Get().GetString("text_pick_theme") %>'>
 </asp:Label>
 <asp:PlaceHolder ID="content" runat="server"></asp:PlaceHolder>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ThemeCombo.ascx
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ThemeCombo.ascx	2008-01-12 18:18:51 UTC (rev 797)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ThemeCombo.ascx	2008-01-13 12:44:28 UTC (rev 798)
@@ -1,4 +1,4 @@
-<%@ Control Language="c#" AutoEventWireup="False" Inherits="newtelligence.DasBlog.Web.ThemeCombo" CodeFile="ThemeCombo.ascx.cs" %>
+<%@ Control Language="C#" AutoEventWireup="False" Inherits="newtelligence.DasBlog.Web.ThemeCombo" CodeFile="ThemeCombo.ascx.cs" %>
 <asp:Label ID="lblTheme" runat="server"></asp:Label>
 <asp:DropDownList ID="listThemes" runat="server" AutoPostBack="True">
 </asp:DropDownList>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/TimeLineControl.ascx
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/TimeLineControl.ascx	2008-01-12 18:18:51 UTC (rev 797)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/TimeLineControl.ascx	2008-01-13 12:44:28 UTC (rev 798)
@@ -1,4 +1,4 @@
-<%@ Control Language="c#" AutoEventWireup="True" Inherits="newtelligence.DasBlog.Web.TimelineControl" CodeFile="TimeLineControl.ascx.cs" %>
+<%@ Control Language="C#" AutoEventWireup="True" Inherits="newtelligence.DasBlog.Web.TimelineControl" CodeFile="TimeLineControl.ascx.cs" %>
 
 <script type="text/javascript">
 var tl;

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Web.config
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Web.config	2008-01-12 18:18:51 UTC (rev 797)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Web.config	2008-01-13 12:44:28 UTC (rev 798)
@@ -83,7 +83,7 @@
           false at all other times. For more information, refer to the documentation about
           debugging ASP .NET files.
     -->
-		<compilation defaultLanguage="c#" debug="true"/>
+		<compilation defaultLanguage="C#" debug="true"/>
 		<!--  CUSTOM ERROR MESSAGES
           Set customError mode values to control the display of user-friendly  
           error messages to users instead of error details (including a stack trace):

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/SyndicationServiceExperimentalImplementation.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/SyndicationServiceExperimentalImplementation.cs	2008-01-12 18:18:51 UTC (rev 797)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/SyndicationServiceExperimentalImplementation.cs	2008-01-13 12:44:28 UTC (rev 798)
@@ -43,9 +43,6 @@
 
 namespace newtelligence.DasBlog.Web.Services
 {
-    /// <summary>
-    /// Summary description for SyndicationServiceExperimental.
-    /// </summary>
     [WebService(Namespace="urn:schemas-newtelligence-com:dasblog:syndication-services:experimental")]
     public class SyndicationServiceExperimentalImplementation : SyndicationServiceBase 
     {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Dasblogce-cvs] SF.net SVN: dasblogce: [799] branches/refactoring_architecture/source/ newtelligence.DasBlog.Web

From: <sfcaus@us...> - 2008-01-13 15:31

Revision: 799
          http://dasblogce.svn.sourceforge.net/dasblogce/?rev=799&view=rev
Author:   sfcaus
Date:     2008-01-13 07:31:18 -0800 (Sun, 13 Jan 2008)

Log Message:
-----------
- core config system (Config.cs) added for css-names, filenames, filepaths
- IfIsNotAdminRedirect added
- some minor changes

Modified Paths:
--------------
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Activity.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ActivityBox.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AdminNavBar.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AggBugs.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AggBugsBox.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ftb/ftb.inserttable.aspx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/newtelligence.DasBlog.Web.csproj
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/SiteSecurity.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/newtelligence.DasBlog.Web.Core.csproj
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/MicrosummaryHandler.cs

Added Paths:
-----------
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Config.cs

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Activity.aspx.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Activity.aspx.cs	2008-01-13 12:44:28 UTC (rev 798)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Activity.aspx.cs	2008-01-13 15:31:18 UTC (rev 799)
@@ -1,3 +1,5 @@
+// NOTE: refactored, iteration 1
+
 #region Copyright (c) 2003, newtelligence AG. All rights reserved.
 
 /*

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ActivityBox.ascx.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ActivityBox.ascx.cs	2008-01-13 12:44:28 UTC (rev 798)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ActivityBox.ascx.cs	2008-01-13 15:31:18 UTC (rev 799)
@@ -1,3 +1,5 @@
+// NOTE: refactored, iteration 1
+
 #region Copyright (c) 2003, newtelligence AG. All rights reserved.
 
 /*
@@ -58,46 +60,42 @@
 
         protected void Page_Load(object sender, EventArgs e)
         {
-            if (SiteSecurity.IsInRole("admin") == false)
-            {
-                Response.Redirect("~/FormatPage.aspx?path=SiteConfig/accessdenied.format.html");
-            }
-
-            //set the current page <li> tag to here
+            SiteSecurity.IfIsNotAdminRedirect(Response);
+            // set the current page <li> tag to here
             string filePath = Request.FilePath;
 
-            if (filePath.EndsWith("CrosspostReferrers.aspx", StringComparison.InvariantCultureIgnoreCase))
+            if (filePath.EndsWith(CoreFileNames.CrosspostReferrers, StringComparison.InvariantCultureIgnoreCase))
             {
-                crosspost.Attributes["class"] = "here";
-                hyperlinkCrosspostReferrers.NavigateUrl = "";
+                crosspost.Attributes[CoreCssStyles.Attributes.Class] = CoreCssStyles.Links.Here;
+                hyperlinkCrosspostReferrers.NavigateUrl = String.Empty;
             }
-            else if (filePath.EndsWith("UserClickThroughs.aspx", StringComparison.InvariantCultureIgnoreCase))
+            else if (filePath.EndsWith(CoreFileNames.UserClickThroughs, StringComparison.InvariantCultureIgnoreCase))
             {
-                userclickthrough.Attributes["class"] = "here";
-                hyperlinkUserClickThroughs.NavigateUrl = "";
+                userclickthrough.Attributes[CoreCssStyles.Attributes.Class] = CoreCssStyles.Links.Here;
+                hyperlinkUserClickThroughs.NavigateUrl = String.Empty;
             }
-            else if (filePath.EndsWith("ClickThroughs.aspx", StringComparison.InvariantCultureIgnoreCase))
+            else if (filePath.EndsWith(CoreFileNames.ClickThroughs, StringComparison.InvariantCultureIgnoreCase))
             {
-                clickthrough.Attributes["class"] = "here";
-                hyperlinkClickThroughs.NavigateUrl = "";
+                clickthrough.Attributes[CoreCssStyles.Attributes.Class] = CoreCssStyles.Links.Here;
+                hyperlinkClickThroughs.NavigateUrl = String.Empty;
             }
-            else if (filePath.EndsWith("AggBugs.aspx", StringComparison.InvariantCultureIgnoreCase))
+            else if (filePath.EndsWith(CoreFileNames.AggBugs, StringComparison.InvariantCultureIgnoreCase))
             {
-                aggbugs.Attributes["class"] = "here";
-                hyperlinkAggBugs.NavigateUrl = "";
+                aggbugs.Attributes[CoreCssStyles.Attributes.Class] = CoreCssStyles.Links.Here;
+                hyperlinkAggBugs.NavigateUrl = String.Empty;
             }
-            else if (filePath.EndsWith("Referrers.aspx", StringComparison.InvariantCultureIgnoreCase))
+            else if (filePath.EndsWith(CoreFileNames.Referrers, StringComparison.InvariantCultureIgnoreCase))
             {
-                referrers.Attributes["class"] = "here";
-                hyperLinkReferrers.NavigateUrl = "";
+                referrers.Attributes[CoreCssStyles.Attributes.Class] = CoreCssStyles.Links.Here;
+                hyperLinkReferrers.NavigateUrl = String.Empty;
             }
-            else if (filePath.EndsWith("Eventlog.aspx", StringComparison.InvariantCultureIgnoreCase))
+            else if (filePath.EndsWith(CoreFileNames.Eventlog, StringComparison.InvariantCultureIgnoreCase))
             {
-                eventlog.Attributes["class"] = "firstHere";
-                hyperLinkEventlog.NavigateUrl = "";
+                eventlog.Attributes[CoreCssStyles.Attributes.Class] = CoreCssStyles.Links.FirstHere;
+                hyperLinkEventlog.NavigateUrl = String.Empty;
             }
 
-            if (Request.QueryString["date"] != null)
+            if (Request.QueryString[CoreQueryStrings.DateTime.Date] != null)
             {
                 AddDateQueryString(hyperLinkEventlog);
                 AddDateQueryString(hyperLinkReferrers);
@@ -108,38 +106,34 @@
             }
         }
 
+        protected void ActivityBox_PreRender(object sender, EventArgs e)
+        {
+            DataBind();
+        }
+
         private void AddDateQueryString(HyperLink hyperLink)
         {
             if (hyperLink.NavigateUrl != String.Empty)
             {
-                hyperLink.NavigateUrl = String.Format("{0}?date={1}",
-                                                      hyperLink.NavigateUrl,
-                                                      Request.QueryString["date"]);
+                hyperLink.NavigateUrl =
+                    String.Format("{0}?" + CoreQueryStrings.DateTime.Date + "={1}", hyperLink.NavigateUrl,
+                                  Request.QueryString[CoreQueryStrings.DateTime.Date]);
             }
         }
 
-        protected void ActivityBox_PreRender(object sender, EventArgs e)
+        private void InitializeComponent()
         {
-            DataBind();
+            PreRender += ActivityBox_PreRender;
         }
 
-        #region Web Form Designer generated code
-
         protected override void OnInit(EventArgs e)
         {
-            resmgr = ((System.Resources.ResourceManager) ApplicationResourceTable.Get());
+            resmgr = ApplicationResourceTable.Get();
             SharedBasePage requestPage = Page as SharedBasePage;
             siteConfig = requestPage.SiteConfig;
 
             InitializeComponent();
             base.OnInit(e);
         }
-
-        private void InitializeComponent()
-        {
-            this.PreRender += new System.EventHandler(this.ActivityBox_PreRender);
-        }
-
-        #endregion
     }
 }
\ No newline at end of file

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AdminNavBar.ascx.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AdminNavBar.ascx.cs	2008-01-13 12:44:28 UTC (rev 798)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AdminNavBar.ascx.cs	2008-01-13 15:31:18 UTC (rev 799)
@@ -1,3 +1,5 @@
+// NOTE: refactored, iteration 1
+
 #region Copyright (c) 2003, newtelligence AG. All rights reserved.
 
 /*
@@ -42,6 +44,7 @@
 using System;
 using System.Resources;
 using System.Web.UI;
+using newtelligence.DasBlog.Web.Core;
 
 namespace newtelligence.DasBlog.Web
 {
@@ -50,62 +53,72 @@
         protected ResourceManager resmgr;
         protected SiteConfig siteConfig;
 
+        protected override void OnInit(EventArgs e)
+        {
+            InitializeComponent();
+            base.OnInit(e);
+        }
+
+        private void InitializeComponent()
+        {
+        }
+
         protected void Page_Load(object sender, EventArgs e)
         {
+            SiteSecurity.IfIsNotAdminRedirect(Response);
             siteConfig = SiteConfig.GetSiteConfig();
-
             resmgr = ApplicationResourceTable.Get();
 
             //set the current page <li> tag to here
             string filePath = Request.FilePath;
 
-            if (filePath.EndsWith("EditCrossPostSites.aspx", StringComparison.InvariantCultureIgnoreCase))
+            if (filePath.EndsWith(CoreFileNames.CrosspostReferrers, StringComparison.InvariantCultureIgnoreCase))
             {
-                editCrossPostSites.Attributes["class"] = "here";
-                hyperLinkEditCrossPostSites.NavigateUrl = "";
+                editCrossPostSites.Attributes[CoreCssStyles.Attributes.Class] = CoreCssStyles.Links.Here;
+                hyperLinkEditCrossPostSites.NavigateUrl = String.Empty;
             }
-            else if (filePath.EndsWith("EditNavigatorLinks.aspx", StringComparison.InvariantCultureIgnoreCase))
+            else if (filePath.EndsWith(CoreFileNames.EditNavigatorLinks, StringComparison.InvariantCultureIgnoreCase))
             {
-                editNavigatorLinks.Attributes["class"] = "here";
-                hyperLinkEditNavigatorLinks.NavigateUrl = "";
+                editNavigatorLinks.Attributes[CoreCssStyles.Attributes.Class] = CoreCssStyles.Links.Here;
+                hyperLinkEditNavigatorLinks.NavigateUrl = String.Empty;
             }
-            else if (filePath.EndsWith("EditBlogRoll.aspx", StringComparison.InvariantCultureIgnoreCase))
+            else if (filePath.EndsWith(CoreFileNames.EditBlogRoll, StringComparison.InvariantCultureIgnoreCase))
             {
-                editBlogRoll.Attributes["class"] = "here";
-                hyperLinkEditBlogRoll.NavigateUrl = "";
+                editBlogRoll.Attributes[CoreCssStyles.Attributes.Class] = CoreCssStyles.Links.Here;
+                hyperLinkEditBlogRoll.NavigateUrl = String.Empty;
             }
-            else if (filePath.EndsWith("EditContentFilters.aspx", StringComparison.InvariantCultureIgnoreCase))
+            else if (filePath.EndsWith(CoreFileNames.EditContentFilters, StringComparison.InvariantCultureIgnoreCase))
             {
-                editContentFilters.Attributes["class"] = "here";
+                editContentFilters.Attributes[CoreCssStyles.Attributes.Class] = CoreCssStyles.Links.Here;
                 hyperLinkEditContentFilters.NavigateUrl = "";
             }
-            else if (filePath.EndsWith("EditConfig.aspx", StringComparison.InvariantCultureIgnoreCase))
+            else if (filePath.EndsWith(CoreFileNames.EditConfig, StringComparison.InvariantCultureIgnoreCase))
             {
-                editConfig.Attributes["class"] = "here";
-                hyperLinkEditConfig.NavigateUrl = "";
+                editConfig.Attributes[CoreCssStyles.Attributes.Class] = CoreCssStyles.Links.Here;
+                hyperLinkEditConfig.NavigateUrl = String.Empty;
             }
-            else if (filePath.EndsWith("Referrers.aspx", StringComparison.InvariantCultureIgnoreCase) ||
-                     filePath.EndsWith("Eventlog.aspx", StringComparison.InvariantCultureIgnoreCase) ||
-                     filePath.EndsWith("AggBugs.aspx", StringComparison.InvariantCultureIgnoreCase) ||
-                     filePath.EndsWith("ClickThroughs.aspx", StringComparison.InvariantCultureIgnoreCase))
+            else if (filePath.EndsWith(CoreFileNames.Referrers, StringComparison.InvariantCultureIgnoreCase) ||
+                     filePath.EndsWith(CoreFileNames.Eventlog, StringComparison.InvariantCultureIgnoreCase) ||
+                     filePath.EndsWith(CoreFileNames.AggBugs, StringComparison.InvariantCultureIgnoreCase) ||
+                     filePath.EndsWith(CoreFileNames.ClickThroughs, StringComparison.InvariantCultureIgnoreCase))
             {
-                activity.Attributes["class"] = "here";
-                hyperLinkActivity.NavigateUrl = "";
+                activity.Attributes[CoreCssStyles.Attributes.Class] = CoreCssStyles.Links.Here;
+                hyperLinkActivity.NavigateUrl = String.Empty;
             }
-            else if (filePath.EndsWith("EditEntry.aspx", StringComparison.InvariantCultureIgnoreCase))
+            else if (filePath.EndsWith(CoreFileNames.EditEntry, StringComparison.InvariantCultureIgnoreCase))
             {
-                editEntry.Attributes["class"] = "firstHere";
-                hyperLinkEditEntry.NavigateUrl = "";
+                editEntry.Attributes[CoreCssStyles.Attributes.Class] = CoreCssStyles.Links.FirstHere;
+                hyperLinkEditEntry.NavigateUrl = String.Empty;
             }
-            else if (filePath.EndsWith("EditUser.aspx", StringComparison.InvariantCultureIgnoreCase))
+            else if (filePath.EndsWith(CoreFileNames.EditUser, StringComparison.InvariantCultureIgnoreCase))
             {
-                editUser.Attributes["class"] = "here";
-                hyperLinkEditUser.NavigateUrl = "";
+                editUser.Attributes[CoreCssStyles.Attributes.Class] = CoreCssStyles.Links.Here;
+                hyperLinkEditUser.NavigateUrl = String.Empty;
             }
 
-            // The only tab that should be visible for a contributor is the
+            // the only tab that should be visible for a contributor is the
             // "Add Entry" and "User Settings" tab
-            if (SiteSecurity.IsInRole("contributor"))
+            if (SiteSecurity.IsInRole(CoreSecurity.Roles.Contributor))
             {
                 editConfig.Visible = false;
                 editCrossPostSites.Visible = false;
@@ -114,21 +127,8 @@
                 editNavigatorLinks.Visible = false;
                 activity.Visible = false;
             }
+
             DataBind();
         }
-
-        #region Web Form Designer generated code
-
-        protected override void OnInit(EventArgs e)
-        {
-            InitializeComponent();
-            base.OnInit(e);
-        }
-
-        private void InitializeComponent()
-        {
-        }
-
-        #endregion
     }
 }
\ No newline at end of file

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AggBugs.aspx.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AggBugs.aspx.cs	2008-01-13 12:44:28 UTC (rev 798)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AggBugs.aspx.cs	2008-01-13 15:31:18 UTC (rev 799)
@@ -1,3 +1,5 @@
+// NOTE: refactored, iteration 1
+
 #region Copyright (c) 2003, newtelligence AG. All rights reserved.
 
 /*
@@ -60,37 +62,35 @@
         {
             get
             {
-                AggBugsBox AggBugsBox = LoadControl("AggBugsBox.ascx") as AggBugsBox;
+                AggBugsBox AggBugsBox = LoadControl(CoreControlNames.AggBugsBox) as AggBugsBox;
+
                 return AggBugsBox;
             }
         }
 
         #endregion
 
-        protected override void OnInit(EventArgs e)
+        protected void AggBugs_Load(object sender, EventArgs e)
         {
-            InitializeComponent();
-            base.OnInit(e);
+            CategoryName = CoreSecurity.Roles.Admin;
+            SiteSecurity.IfIsNotAdminRedirect(Response);
         }
 
-        private void InitializeComponent()
+        protected override EntryCollection LoadEntries()
         {
-            Load += AggBugs_Load;
+            return new EntryCollection();
         }
 
-        protected void AggBugs_Load(object sender, EventArgs e)
+
+        private void InitializeComponent()
         {
-            CategoryName = "admin";
-
-            if (SiteSecurity.IsInRole("admin") == false)
-            {
-                Response.Redirect("~/FormatPage.aspx?path=SiteConfig/accessdenied.format.html");
-            }
+            Load += AggBugs_Load;
         }
 
-        protected override EntryCollection LoadEntries()
+        protected override void OnInit(EventArgs e)
         {
-            return new EntryCollection();
+            InitializeComponent();
+            base.OnInit(e);
         }
     }
 }
\ No newline at end of file

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AggBugsBox.ascx.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AggBugsBox.ascx.cs	2008-01-13 12:44:28 UTC (rev 798)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AggBugsBox.ascx.cs	2008-01-13 15:31:18 UTC (rev 799)
@@ -82,6 +82,7 @@
                     idx = item.identifier.IndexOf("guid=");
                     id = item.identifier.Substring(idx + 5);
                 }
+
                 Entry entry = dataService.GetEntry(id);
 
                 if (entry != null && entry.Title != null && entry.Title.Length > 0)
@@ -91,7 +92,7 @@
             }
 
             link.Text = text;
-            link.NavigateUrl = item.identifier.ToString();
+            link.NavigateUrl = item.identifier;
             row.Cells[0].Controls.Add(link);
             row.Cells[1].Text = item.count.ToString();
         }

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ftb/ftb.inserttable.aspx
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ftb/ftb.inserttable.aspx	2008-01-13 12:44:28 UTC (rev 798)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ftb/ftb.inserttable.aspx	2008-01-13 15:31:18 UTC (rev 799)
@@ -1,5 +1,6 @@
 <%@ Page Language="C#" %>
-<%@ Import namespace="newtelligence.DasBlog.Web"%>
+<%@ Import namespace="newtelligence.DasBlog.Web.Core"%>
+
 <script language="C#" runat="server">
 
 private void Page_Load(object sender, EventArgs e) {

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/newtelligence.DasBlog.Web.csproj
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/newtelligence.DasBlog.Web.csproj	2008-01-13 12:44:28 UTC (rev 798)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/newtelligence.DasBlog.Web.csproj	2008-01-13 15:31:18 UTC (rev 799)
@@ -612,21 +612,18 @@
     </Compile>
     <Compile Include="AdminNavBar.ascx.cs">
       <DependentUpon>AdminNavBar.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="AdminNavBar.ascx.designer.cs">
       <DependentUpon>AdminNavBar.ascx</DependentUpon>
     </Compile>
     <Compile Include="AggBugs.aspx.cs">
       <DependentUpon>AggBugs.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="AggBugs.aspx.designer.cs">
       <DependentUpon>AggBugs.aspx</DependentUpon>
     </Compile>
     <Compile Include="AggBugsBox.ascx.cs">
       <DependentUpon>AggBugsBox.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="AggBugsBox.ascx.designer.cs">
       <DependentUpon>AggBugsBox.ascx</DependentUpon>

Added: branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Config.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Config.cs	                        (rev 0)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Config.cs	2008-01-13 15:31:18 UTC (rev 799)
@@ -0,0 +1,202 @@
+using System;
+
+namespace newtelligence.DasBlog.Web.Core
+{
+    /// <summary>
+    /// Defines essentially control names for the core functionality.
+    /// </summary>
+    public static class CoreControlNames
+    {
+        public static String AggBugsBox
+        {
+            get { return "AggBugsBox.ascx"; }
+        }
+    }
+
+    /// <summary>
+    /// Defines essentially filenames for the core functionality.
+    /// </summary>
+    public static class CoreFileNames
+    {
+        public static String AccessDenied
+        {
+            get { return "accessdenied.format.html"; }
+        }
+
+        public static String AggBugs
+        {
+            get { return "AggBugs.aspx"; }
+        }
+
+        public static String ClickThroughs
+        {
+            get { return "ClickThroughs.aspx"; }
+        }
+
+        public static String CrosspostReferrers
+        {
+            get { return "CrosspostReferrers.aspx"; }
+        }
+
+        public static String FormatPage
+        {
+            get { return "FormatPage.aspx"; }
+        }
+
+        public static String EditBlogRoll
+        {
+            get { return "EditBlogRoll.aspx"; }
+        }
+
+        public static String EditConfig
+        {
+            get { return "EditConfig.aspx"; }
+        }
+
+        public static String EditContentFilters
+        {
+            get { return "EditContentFilters.aspx"; }
+        }
+
+        public static String EditCrossPostSites
+        {
+            get { return "EditCrossPostSites.aspx"; }
+        }
+
+        public static String EditEntry
+        {
+            get { return "EditEntry.aspx"; }
+        }
+
+        public static String EditUser
+        {
+            get { return "EditUser.aspx"; }
+        }
+
+        public static String EditNavigatorLinks
+        {
+            get { return "EditNavigatorLinks.aspx"; }
+        }
+
+        public static String Eventlog
+        {
+            get { return "Eventlog.aspx"; }
+        }
+
+        public static String UserClickThroughs
+        {
+            get { return "UserClickThroughs.aspx"; }
+        }
+
+        public static String Referrers
+        {
+            get { return "Referrers.aspx"; }
+        }
+    }
+
+    /// <summary>
+    /// Defines essentially foldernames for the core functionality.
+    /// </summary>
+    public static class CoreFolderNames
+    {
+        public static String SiteConfig
+        {
+            get { return "SiteConfig"; }
+        }
+    }
+
+    /// <summary>
+    /// Defines essentially filepaths and methods for the core functionality.
+    /// </summary>
+    public static class CoreFilePaths
+    {
+        /// <summary>
+        /// Returns a string with the path to the "Access Denied"-Page.
+        /// </summary>
+        public static String AccessDenied
+        {
+            get { return CoreFolderNames.SiteConfig + "/" + CoreFileNames.AccessDenied; }
+        }
+
+        public static String FormatPage(String filename)
+        {
+            return "~/" + CoreFileNames.FormatPage + "?path=" + filename;
+        }
+    }
+
+    /// <summary>
+    /// Defines essentially CSS-names for the core functionality.
+    /// </summary>
+    public static class CoreCssStyles
+    {
+        #region Nested type: Attributes
+
+        public static class Attributes
+        {
+            public static String Class
+            {
+                get { return "class"; }
+            }
+        }
+
+        #endregion
+
+        #region Nested type: Links
+
+        public static class Links
+        {
+            public static String Here
+            {
+                get { return "here"; }
+            }
+
+            public static String FirstHere
+            {
+                get { return "firstHere"; }
+            }
+        }
+
+        #endregion
+    }
+
+    /// <summary>
+    /// Defines essentially parameter names for the core functionality.
+    /// </summary>
+    public static class CoreQueryStrings
+    {
+        #region Nested type: DateTime
+
+        public static class DateTime
+        {
+            public static String Date
+            {
+                get { return "date"; }
+            }
+        }
+
+        #endregion
+    }
+
+    /// <summary>
+    /// Defines essentially security names for the core functionality.
+    /// </summary>
+    public static class CoreSecurity
+    {
+        #region Nested type: Roles
+
+        public static class Roles
+        {
+            public static String Admin
+            {
+                get { return "admin"; }
+            }
+
+            public static String Contributor
+            {
+                get { return "contributor"; }
+            }
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/SiteSecurity.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/SiteSecurity.cs	2008-01-13 12:44:28 UTC (rev 798)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/SiteSecurity.cs	2008-01-13 15:31:18 UTC (rev 799)
@@ -50,7 +50,7 @@
 using System.Xml.Serialization;
 using newtelligence.DasBlog.Runtime;
 
-namespace newtelligence.DasBlog.Web
+namespace newtelligence.DasBlog.Web.Core
 {
     public class SiteSecurity
     {
@@ -59,6 +59,18 @@
             return HttpContext.Current.User.IsInRole(role);
         }
 
+        /// <summary>
+        /// Redirects to the a file if the user is not in role administrator.
+        /// </summary>
+        /// <param name="httpResponse">The response which can be redirected.</param>
+        public static void IfIsNotAdminRedirect(HttpResponse httpResponse)
+        {
+            if (!IsInRole(CoreSecurity.Roles.Admin) && httpResponse != null)
+            {
+                httpResponse.Redirect(CoreFilePaths.FormatPage(CoreFileNames.AccessDenied));
+            }
+        }
+
         public static void SetSecurity(SiteSecurityConfig ssc)
         {
             XmlSerializer ser = new XmlSerializer(typeof (SiteSecurityConfig));
@@ -551,8 +563,6 @@
         }
     }
 
-    #region UserCollection
-
     /// <summary>
     /// A collection of elements of type User
     /// </summary>
@@ -750,6 +760,4 @@
 
         #endregion
     }
-
-    #endregion
 }
\ No newline at end of file

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/newtelligence.DasBlog.Web.Core.csproj
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/newtelligence.DasBlog.Web.Core.csproj	2008-01-13 12:44:28 UTC (rev 798)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/newtelligence.DasBlog.Web.Core.csproj	2008-01-13 15:31:18 UTC (rev 799)
@@ -146,6 +146,7 @@
     <Compile Include="CategoryList.cs">
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Config.cs" />
     <Compile Include="EditControlAdapter.cs">
       <SubType>Code</SubType>
     </Compile>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/MicrosummaryHandler.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/MicrosummaryHandler.cs	2008-01-13 12:44:28 UTC (rev 798)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Services/MicrosummaryHandler.cs	2008-01-13 15:31:18 UTC (rev 799)
@@ -1,6 +1,7 @@
 using System;
 using System.Web;
 using newtelligence.DasBlog.Runtime;
+using newtelligence.DasBlog.Web.Core;
 
 namespace newtelligence.DasBlog.Web.Services
 {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Dasblogce-cvs] SF.net SVN: dasblogce: [800] branches/refactoring_architecture/source/ newtelligence.DasBlog.Web

From: <sfcaus@us...> - 2008-01-13 16:47

Revision: 800
          http://dasblogce.svn.sourceforge.net/dasblogce/?rev=800&view=rev
Author:   sfcaus
Date:     2008-01-13 08:47:46 -0800 (Sun, 13 Jan 2008)

Log Message:
-----------


Modified Paths:
--------------
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ActivityBox.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AdminNavBar.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AggBugs.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AggBugsBox.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ApplicationResourceTable.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Archives.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ArchivesControl.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/BlogRollControl.ascx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Blogroll.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ClickThroughs.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/CommentView.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/StringTables/StringTables.resx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/newtelligence.DasBlog.Web.csproj
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Config.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/SiteSecurity.cs

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ActivityBox.ascx.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ActivityBox.ascx.cs	2008-01-13 15:31:18 UTC (rev 799)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ActivityBox.ascx.cs	2008-01-13 16:47:46 UTC (rev 800)
@@ -52,11 +52,11 @@
 {
     public partial class ActivityBox : UserControl
     {
+        protected static ResourceManager resmgr;
+        protected static SiteConfig siteConfig;
         protected HtmlGenericControl editCrossPostSites;
         protected HtmlGenericControl editNavigatorLinks;
         protected Label labelTitle;
-        protected ResourceManager resmgr;
-        protected SiteConfig siteConfig;
 
         protected void Page_Load(object sender, EventArgs e)
         {

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AdminNavBar.ascx.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AdminNavBar.ascx.cs	2008-01-13 15:31:18 UTC (rev 799)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AdminNavBar.ascx.cs	2008-01-13 16:47:46 UTC (rev 800)
@@ -50,8 +50,8 @@
 {
     public partial class AdminNavBar : UserControl
     {
-        protected ResourceManager resmgr;
-        protected SiteConfig siteConfig;
+        protected static ResourceManager resmgr;
+        protected static SiteConfig siteConfig;
 
         protected override void OnInit(EventArgs e)
         {
@@ -118,7 +118,7 @@
 
             // the only tab that should be visible for a contributor is the
             // "Add Entry" and "User Settings" tab
-            if (SiteSecurity.IsInRole(CoreSecurity.Roles.Contributor))
+            if (SiteSecurity.IsInRole(CoreSecurityNames.Roles.Contributor))
             {
                 editConfig.Visible = false;
                 editCrossPostSites.Visible = false;

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AggBugs.aspx.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AggBugs.aspx.cs	2008-01-13 15:31:18 UTC (rev 799)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AggBugs.aspx.cs	2008-01-13 16:47:46 UTC (rev 800)
@@ -72,7 +72,7 @@
 
         protected void AggBugs_Load(object sender, EventArgs e)
         {
-            CategoryName = CoreSecurity.Roles.Admin;
+            CategoryName = CoreSecurityNames.Roles.Admin;
             SiteSecurity.IfIsNotAdminRedirect(Response);
         }
 

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AggBugsBox.ascx.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AggBugsBox.ascx.cs	2008-01-13 15:31:18 UTC (rev 799)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/AggBugsBox.ascx.cs	2008-01-13 16:47:46 UTC (rev 800)
@@ -60,7 +60,6 @@
         private static void BuildAggBugsRow(TableRow row, StatisticsItem item, object objDataService)
         {
             IBlogDataService dataService = objDataService as IBlogDataService;
-
             HyperLink link = new HyperLink();
 
             string text = SiteUtilities.ClipString(item.identifier, 80);

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ApplicationResourceTable.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ApplicationResourceTable.cs	2008-01-13 15:31:18 UTC (rev 799)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ApplicationResourceTable.cs	2008-01-13 16:47:46 UTC (rev 800)
@@ -9,7 +9,7 @@
     /// </summary>
     public class ApplicationResourceTable
     {
-        private static ResourceManager rm;
+        private static readonly ResourceManager rm;
 
         static ApplicationResourceTable()
         {

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Archives.aspx.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Archives.aspx.cs	2008-01-13 15:31:18 UTC (rev 799)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Archives.aspx.cs	2008-01-13 16:47:46 UTC (rev 800)
@@ -1,3 +1,5 @@
+// NOTE: refactored, iteration 1
+
 using System;
 using System.Web.UI;
 using System.Web.UI.WebControls;
@@ -17,21 +19,21 @@
 
         public Control Bodytext
         {
-            get { return LoadControl("ArchivesControl.ascx"); }
+            get { return LoadControl(CoreControlNames.ArchivesControl); }
         }
 
         #endregion
 
+        private void InitializeComponent()
+        {
+        }
+
         protected override void OnInit(EventArgs e)
         {
             InitializeComponent();
             base.OnInit(e);
         }
 
-        private void InitializeComponent()
-        {
-        }
-
         protected override EntryCollection LoadEntries()
         {
             TitleOverride = "Archives";

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ArchivesControl.ascx.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ArchivesControl.ascx.cs	2008-01-13 15:31:18 UTC (rev 799)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ArchivesControl.ascx.cs	2008-01-13 16:47:46 UTC (rev 800)
@@ -8,98 +8,105 @@
 using newtelligence.DasBlog.Runtime;
 using newtelligence.DasBlog.Web.Core;
 
-namespace newtelligence.DasBlog.Web {
-    public partial class ArchivesControl : UserControl {
-        private SharedBasePage requestPage;
+namespace newtelligence.DasBlog.Web
+{
+    public partial class ArchivesControl : UserControl
+    {
+        private const string NoCategory = "NOCATEGORY";
+        private readonly List<string> categories = new List<string>();
 
+        private readonly Dictionary<string, List<Entry>> sorted =
+            new Dictionary<string, List<Entry>>(StringComparer.InvariantCultureIgnoreCase);
 
-        // temp storage
-        private Dictionary<string, List<Entry>> sorted = new Dictionary<string, List<Entry>>(StringComparer.InvariantCultureIgnoreCase);
-        private List<string> categories = new List<string>();
+        private SharedBasePage requestPage;
 
-        const string NoCategory = "NOCATEGORY";
-
-        public ArchivesControl()
-            : base() {
-        }
-
-        private void EnsureCategory(string category) {
-
-            if (!categories.Contains(category)) {
+        private void EnsureCategory(string category)
+        {
+            if (!categories.Contains(category))
+            {
                 categories.Add(category);
                 sorted.Add(category, new List<Entry>());
             }
         }
 
-
-        protected override void OnLoad(EventArgs e) {
+        protected override void OnLoad(EventArgs e)
+        {
             base.OnLoad(e);
+            requestPage = Page as SharedBasePage;
 
-            requestPage = this.Page as SharedBasePage;
-
             // get lite-entries
             EntryCollection entries = requestPage.DataService.GetEntries(false);
 
             // sort entries
-            foreach (Entry entry in entries) {
-
-                if (!entry.IsPublic) {
+            foreach (Entry entry in entries)
+            {
+                if (!entry.IsPublic)
+                {
                     continue;
                 }
 
-                if (entry.Categories == null || entry.Categories.Length == 0) {
+                if (entry.Categories == null || entry.Categories.Length == 0)
+                {
                     EnsureCategory(NoCategory);
                     sorted[NoCategory].Add(entry);
-                } else {
+                }
+                else
+                {
                     string[] catArray = entry.GetSplitCategories();
-                    foreach (string cat in catArray) {
+                    foreach (string cat in catArray)
+                    {
                         EnsureCategory(cat);
                         sorted[cat].Add(entry);
                     }
                 }
             }
 
-
             categories.Sort(StringComparer.InvariantCultureIgnoreCase);
 
             // Build the archive navigator
             StringBuilder catNav = new StringBuilder();
             catNav.Append("<p>");
 
-            foreach (string cat in categories) {
-                if (cat != NoCategory) {
-
-                    catNav.AppendFormat("<a href=\"archives.aspx#{0}\">{1} ({2})</a> &#8226; ", HttpUtility.UrlEncode(cat), cat, sorted[cat].Count);
+            foreach (string cat in categories)
+            {
+                if (cat != NoCategory)
+                {
+                    catNav.AppendFormat("<a href=\"archives.aspx#{0}\">{1} ({2})</a> &#8226; ",
+                                        HttpUtility.UrlEncode(cat), cat, sorted[cat].Count);
                 }
             }
 
             // add the no-category category last
-            if (categories.Contains(NoCategory)) {
-                ResourceManager resmgr = ApplicationResourceTable.Get(); ;
+            if (categories.Contains(NoCategory))
+            {
+                ResourceManager resmgr = ApplicationResourceTable.Get();
+                ;
                 string translatedNone = resmgr.GetString("text_no_category");
-                catNav.AppendFormat("<a href=\"archives.aspx#{0}\">{1} ({2})</a> &#8226; ", NoCategory, translatedNone, sorted[NoCategory].Count);
+                catNav.AppendFormat("<a href=\"archives.aspx#{0}\">{1} ({2})</a> &#8226; ", NoCategory, translatedNone,
+                                    sorted[NoCategory].Count);
             }
+
             catNav.Append("</p>");
             contentPlaceHolder.Controls.Add(new LiteralControl(catNav.ToString()));
 
             // render the categories with the post titles
-
-            foreach (string cat in categories) {
-
+            foreach (string cat in categories)
+            {
                 // render No Category last
-                if (cat == NoCategory) {
+                if (cat == NoCategory)
+                {
                     continue;
                 }
 
                 contentPlaceHolder.Controls.Add(RenderCategoryHeader(cat));
-
                 contentPlaceHolder.Controls.Add(RenderCategory(sorted[cat]));
             }
 
-
             // "no category" category
-            if (categories.Contains(NoCategory)) {
-                ResourceManager resmgr = ApplicationResourceTable.Get(); ;
+            if (categories.Contains(NoCategory))
+            {
+                ResourceManager resmgr = ApplicationResourceTable.Get();
+                ;
                 string none = resmgr.GetString("text_no_category");
 
                 // no link, since it's not possible to subscribe to
@@ -111,35 +118,40 @@
             DataBind();
         }
 
-
-        private PlaceHolder RenderCategoryHeader(string cat) {
-            return this.RenderCategoryHeader(cat, cat, true);
+        private PlaceHolder RenderCategoryHeader(string cat)
+        {
+            return RenderCategoryHeader(cat, cat, true);
         }
 
-        private PlaceHolder RenderCategoryHeader(string cat, string displayName, bool renderLink) {
-
+        private PlaceHolder RenderCategoryHeader(string cat, string displayName, bool renderLink)
+        {
             PlaceHolder header = new PlaceHolder();
 
-                        // anchor for easy navigation
+            // anchor for easy navigation
             string anchor = String.Format("<a name=\"{0}\"></a>", HttpUtility.UrlEncode(cat));
             header.Controls.Add(new LiteralControl(anchor));
 
             // category link
-            if (renderLink) {
+            if (renderLink)
+            {
                 HyperLink catLink = new HyperLink();
                 catLink.CssClass = "date";
                 catLink.Text = String.Format("{0} ({1})", displayName, sorted[cat].Count);
                 catLink.NavigateUrl = SiteUtilities.GetCategoryViewUrl(requestPage.SiteConfig, cat);
                 header.Controls.Add(catLink);
-            } else {
-                header.Controls.Add(new LiteralControl(String.Format("<span class=\"date\">{0} ({1})</span>", displayName, sorted[cat].Count)));
             }
+            else
+            {
+                header.Controls.Add(
+                    new LiteralControl(
+                        String.Format("<span class=\"date\">{0} ({1})</span>", displayName, sorted[cat].Count)));
+            }
 
 
-
             header.Controls.Add(new LiteralControl("&nbsp;"));
 
-            if (renderLink) {
+            if (renderLink)
+            {
                 // category feed
                 HyperLink rssLink = new HyperLink();
                 rssLink.CssClass = "categoryListXmlLinkStyle";
@@ -155,35 +167,33 @@
             return header;
         }
 
-        private PlaceHolder RenderCategory(List<Entry> entries) {
-
+        private static PlaceHolder RenderCategory(List<Entry> entries)
+        {
             // sort entries newest first
-            entries.Sort(delegate(Entry x, Entry y) {
-                return -1 * x.CreatedUtc.CompareTo(y.CreatedUtc);
-            });
+            entries.Sort(delegate(Entry x, Entry y) { return -1*x.CreatedUtc.CompareTo(y.CreatedUtc); });
 
             PlaceHolder placeHolder = new PlaceHolder();
 
             placeHolder.Controls.Add(new LiteralControl("<table>"));
 
-            foreach (Entry entry in entries) {
+            foreach (Entry entry in entries)
+            {
                 placeHolder.Controls.Add(new LiteralControl("<tr><td>"));
-
-
                 // render the post date
-
                 placeHolder.Controls.Add(new LiteralControl(entry.CreatedUtc.ToString("d")));
-               
                 placeHolder.Controls.Add(new LiteralControl("</td><td>"));
-                
                 // render the entry title as link to the article
                 HyperLink hl = new HyperLink();
-                if (entry.Link != null) {
+
+                if (entry.Link != null)
+                {
                     hl.NavigateUrl = entry.Link;
-                } else {
+                }
+                else
+                {
                     hl.NavigateUrl = SiteUtilities.GetPermaLinkUrl(entry);
                 }
-    
+
                 hl.Text = entry.Title;
                 hl.CssClass = "TitleLinkStyle";
                 placeHolder.Controls.Add(hl);
@@ -196,6 +206,5 @@
 
             return placeHolder;
         }
-
     }
-}
+}
\ No newline at end of file

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/BlogRollControl.ascx.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/BlogRollControl.ascx.cs	2008-01-13 15:31:18 UTC (rev 799)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/BlogRollControl.ascx.cs	2008-01-13 16:47:46 UTC (rev 800)
@@ -1,3 +1,5 @@
+// NOTE: refactored, iteration 1
+
 using System;
 using System.IO;
 using System.Web.UI;
@@ -11,23 +13,14 @@
     {
         protected void Page_Load(object sender, EventArgs e)
         {
-            // Load up the OPML
-
-            // TODO: fix hardcoded paths
-            string opmlPath = SiteUtilities.MapPath("siteconfig\\blogroll.opml");
-            string xsltPath = SiteUtilities.MapPath("siteconfig\\opml.xslt");
-
-            XPathDocument xmlOpml = new XPathDocument(opmlPath);
+            XPathDocument xmlOpml = new XPathDocument(CoreFilePaths.BlogrollOpml);
             XslCompiledTransform xmlTransform = new XslCompiledTransform();
+            xmlTransform.Load(CoreFilePaths.BlogrollXslt);
 
-            // Load up the files
-            xmlTransform.Load(xsltPath);
-
-            // Transform
+            // transform the opml
             using (StringWriter sw = new StringWriter())
             {
                 xmlTransform.Transform(xmlOpml, null, sw);
-
                 contentPlaceHolder.Controls.Add(new LiteralControl(sw.ToString()));
             }
 

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Blogroll.aspx.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Blogroll.aspx.cs	2008-01-13 15:31:18 UTC (rev 799)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/Blogroll.aspx.cs	2008-01-13 16:47:46 UTC (rev 800)
@@ -1,4 +1,7 @@
+// NOTE: refactored, iteration 1
+
 using System;
+using System.Resources;
 using System.Web.UI;
 using System.Web.UI.WebControls;
 using newtelligence.DasBlog.Runtime;
@@ -8,6 +11,8 @@
 {
     public partial class Blogroll : SharedBasePage, IPageFormatInfo
     {
+        protected static ResourceManager resmgr;
+
         public Blogroll()
         {
             errorHandlingOff = true;
@@ -22,25 +27,26 @@
 
         public Control Bodytext
         {
-            get { return LoadControl("BlogRollControl.ascx"); }
+            get { return LoadControl(CoreControlNames.BlogRollControl); }
         }
 
         #endregion
 
-        protected override void OnInit(EventArgs e)
+        protected override EntryCollection LoadEntries()
         {
-            InitializeComponent();
-            base.OnInit(e);
+            TitleOverride = resmgr.GetString("titles_blogroll");
+
+            return new EntryCollection();
         }
 
         private void InitializeComponent()
         {
         }
 
-        protected override EntryCollection LoadEntries()
+        protected override void OnInit(EventArgs e)
         {
-            TitleOverride = "Blogroll";
-            return new EntryCollection();
+            InitializeComponent();
+            base.OnInit(e);
         }
     }
 }
\ No newline at end of file

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ClickThroughs.aspx.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ClickThroughs.aspx.cs	2008-01-13 15:31:18 UTC (rev 799)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/ClickThroughs.aspx.cs	2008-01-13 16:47:46 UTC (rev 800)
@@ -1,3 +1,5 @@
+// NOTE: refactored, iteration 1
+
 #region Copyright (c) 2003, newtelligence AG. All rights reserved.
 
 /*
@@ -60,17 +62,17 @@
         {
             get
             {
-                ClickThroughsBox ClickThroughsBox = LoadControl("ClickThroughsBox.ascx") as ClickThroughsBox;
+                ClickThroughsBox ClickThroughsBox = LoadControl(CoreControlNames.ClickThroughsBox) as ClickThroughsBox;
                 return ClickThroughsBox;
             }
         }
 
         #endregion
 
-        protected override void OnInit(EventArgs e)
+        protected void ClickThroughs_Load(object sender, EventArgs e)
         {
-            InitializeComponent();
-            base.OnInit(e);
+            CategoryName = CoreSecurityNames.Roles.Admin;
+            SiteSecurity.IfIsNotAdminRedirect(Response);
         }
 
         private void InitializeComponent()
@@ -78,19 +80,15 @@
             Load += ClickThroughs_Load;
         }
 
-        protected void ClickThroughs_Load(object sender, EventArgs e)
+        protected override EntryCollection LoadEntries()
         {
-            CategoryName = "admin";
-
-            if (SiteSecurity.IsInRole("admin") == false)
-            {
-                Response.Redirect("~/FormatPage.aspx?path=SiteConfig/accessdenied.format.html");
-            }
+            return new EntryCollection();
         }
 
-        protected override EntryCollection LoadEntries()
+        protected override void OnInit(EventArgs e)
         {
-            return new EntryCollection();
+            InitializeComponent();
+            base.OnInit(e);
         }
     }
 }
\ No newline at end of file

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/CommentView.aspx.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/CommentView.aspx.cs	2008-01-13 15:31:18 UTC (rev 799)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/CommentView.aspx.cs	2008-01-13 16:47:46 UTC (rev 800)
@@ -1,3 +1,5 @@
+// NOTE: refactored, iteration 1
+
 #region Copyright (c) 2003, newtelligence AG. All rights reserved.
 
 /*
@@ -68,7 +70,7 @@
             get
             {
                 PlaceHolder bodyPlaceHolder = new PlaceHolder();
-                bodyPlaceHolder.Controls.Add(LoadControl("CommentViewBox.ascx"));
+                bodyPlaceHolder.Controls.Add(LoadControl(CoreControlNames.CommentViewBox));
                 return bodyPlaceHolder;
             }
         }
@@ -98,22 +100,22 @@
                 if (SiteConfig.EnableCommentApi &&
                     Request.ContentType == "text/xml" &&
                     Request.RequestType == "POST" &&
-                    Request.QueryString["guid"] != null)
+                    Request.QueryString[CoreQueryStrings.Identify.Guid] != null)
                 {
                     CommentAPI commentAPI = new CommentAPI();
                     commentAPI.ProcessRequest(Context);
                 }
 
-                //Setup the Live Comment Preview with an allowed tags array "'a', 'b', 'p', 'strong', 'blockquote', 'i', 'em', 'u', 'strike', 'sup', 'sub', 'code'"
+                // setup the Live Comment Preview with an allowed tags array "'a', 'b', 'p', 'strong', 'blockquote', 'i', 'em', 'u', 'strike', 'sup', 'sub', 'code'"
                 Page.ClientScript.RegisterClientScriptBlock(GetType(), "allowedHtmlTags", String.Format(
               @"<script type=""text/javascript"">var allowedHtmlTags = [{0}];</script>
-				<script type=""text/javascript"" src=""scripts/LiveCommentPreview.js"" defer=""defer""></script>",
+				<script type=""text/javascript"" src=" + CoreFilePaths.LiveComments + @""" defer=""defer""></script>",
                 SiteConfig.AllowedTags.ToJavaScriptArray()));
                 base.OnLoad(e);
             }
             else
             {
-                Redirect(SiteUtilities.GetPermaLinkUrl(Request.QueryString["guid"]));
+                Redirect(SiteUtilities.GetPermaLinkUrl(Request.QueryString[CoreQueryStrings.Identify.Guid]));
             }
         }
     }

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/StringTables/StringTables.resx
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/StringTables/StringTables.resx	2008-01-13 15:31:18 UTC (rev 799)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/StringTables/StringTables.resx	2008-01-13 16:47:46 UTC (rev 800)
@@ -1017,4 +1017,7 @@
   <data name="text_show_map" xml:space="preserve">
     <value>Show Map</value>
   </data>
+  <data name="titels_blogroll" xml:space="preserve">
+    <value>Blogroll</value>
+  </data>
 </root>
\ No newline at end of file

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/newtelligence.DasBlog.Web.csproj
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/newtelligence.DasBlog.Web.csproj	2008-01-13 15:31:18 UTC (rev 799)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/newtelligence.DasBlog.Web.csproj	2008-01-13 16:47:46 UTC (rev 800)
@@ -612,6 +612,7 @@
     </Compile>
     <Compile Include="AdminNavBar.ascx.cs">
       <DependentUpon>AdminNavBar.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="AdminNavBar.ascx.designer.cs">
       <DependentUpon>AdminNavBar.ascx</DependentUpon>
@@ -624,6 +625,7 @@
     </Compile>
     <Compile Include="AggBugsBox.ascx.cs">
       <DependentUpon>AggBugsBox.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="AggBugsBox.ascx.designer.cs">
       <DependentUpon>AggBugsBox.ascx</DependentUpon>
@@ -840,7 +842,6 @@
     </Compile>
     <Compile Include="Email.aspx.cs">
       <DependentUpon>Email.aspx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="Email.aspx.designer.cs">
       <DependentUpon>Email.aspx</DependentUpon>
@@ -861,7 +862,6 @@
     </Compile>
     <Compile Include="EventlogBox.ascx.cs">
       <DependentUpon>EventlogBox.ascx</DependentUpon>
-      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="EventlogBox.ascx.designer.cs">
       <DependentUpon>EventlogBox.ascx</DependentUpon>

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Config.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Config.cs	2008-01-13 15:31:18 UTC (rev 799)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Config.cs	2008-01-13 16:47:46 UTC (rev 800)
@@ -7,87 +7,241 @@
     /// </summary>
     public static class CoreControlNames
     {
+        /// <summary>
+        /// Name of the AggBugsBox-control.
+        /// </summary>
         public static String AggBugsBox
         {
             get { return "AggBugsBox.ascx"; }
         }
+
+        /// <summary>
+        /// Name of the ArchivesControl-control.
+        /// </summary>
+        public static String ArchivesControl
+        {
+            get { return "ArchivesControl.ascx"; }
+        }
+
+        /// <summary>
+        /// Name of the BlogRoll-control.
+        /// </summary>
+        public static String BlogRollControl
+        {
+            get { return "BlogRollControl.ascx"; }
+        }
+
+        /// <summary>
+        /// Name of the ClickThroughsBox-control.
+        /// </summary>
+        public static String ClickThroughsBox
+        {
+            get { return "ClickThroughsBox.ascx"; }
+        }
+
+        /// <summary>
+        /// Name of the CommentViewBox-control.
+        /// </summary>
+        public static String CommentViewBox
+        {
+            get { return "CommentViewBox.ascx"; }
+        }
     }
 
     /// <summary>
+    /// Defines essentially CSS-names for the core functionality.
+    /// </summary>
+    public static class CoreCssStyles
+    {
+        #region Nested type: Attributes
+
+        /// <summary>
+        /// Defines CSS-attribute names.
+        /// </summary>
+        public static class Attributes
+        {
+            /// <summary>
+            /// Attribute name of a class.
+            /// </summary>
+            public static String Class
+            {
+                get { return "class"; }
+            }
+        }
+
+        #endregion
+
+        #region Nested type: Links
+
+        /// <summary>
+        /// Defines CSS-names for links.
+        /// </summary>
+        public static class Links
+        {
+            /// <summary>
+            /// CSS-name for link "here".
+            /// </summary>
+            public static String Here
+            {
+                get { return "here"; }
+            }
+
+            /// <summary>
+            /// CSS-names for link "firstHere".
+            /// </summary>
+            public static String FirstHere
+            {
+                get { return "firstHere"; }
+            }
+        }
+
+        #endregion
+    }
+
+    /// <summary>
     /// Defines essentially filenames for the core functionality.
     /// </summary>
     public static class CoreFileNames
     {
+        /// <summary>
+        /// Filename of the "Access Denied"-Page.
+        /// </summary>
         public static String AccessDenied
         {
             get { return "accessdenied.format.html"; }
         }
 
+        /// <summary>
+        /// Filename of the AggBugs-page.
+        /// </summary>
         public static String AggBugs
         {
             get { return "AggBugs.aspx"; }
         }
 
+        /// <summary>
+        /// Filename of the opml-file for the blogroll.
+        /// </summary>
+        public static String BlogrollOpmlFile
+        {
+            get { return "blogroll.opml"; }
+        }
+
+        /// <summary>
+        /// Filename of the xslt-file for the transformation of the blogroll-opml-file.
+        /// </summary>
+        public static String BlogrollXsltFile
+        {
+            get { return "opml.xslt"; }
+        }
+
+        /// <summary>
+        /// Filename of the ClickThroughs-page.
+        /// </summary>
         public static String ClickThroughs
         {
             get { return "ClickThroughs.aspx"; }
         }
 
+        /// <summary>
+        /// Filename of the CrosspostReferrers-page.
+        /// </summary>
         public static String CrosspostReferrers
         {
             get { return "CrosspostReferrers.aspx"; }
         }
 
+        /// <summary>
+        /// Filename of the FormatPage-page.
+        /// </summary>
         public static String FormatPage
         {
             get { return "FormatPage.aspx"; }
         }
 
+        /// <summary>
+        /// Filename of the EditBlogRoll-page.
+        /// </summary>
         public static String EditBlogRoll
         {
             get { return "EditBlogRoll.aspx"; }
         }
 
+        /// <summary>
+        /// Filename of the EditConfig-page.
+        /// </summary>
         public static String EditConfig
         {
             get { return "EditConfig.aspx"; }
         }
 
+        /// <summary>
+        /// Filename of the EditContentFilters-page.
+        /// </summary>
         public static String EditContentFilters
         {
             get { return "EditContentFilters.aspx"; }
         }
 
+        /// <summary>
+        /// Filename of the EditCrossPostSites-page.
+        /// </summary>
         public static String EditCrossPostSites
         {
             get { return "EditCrossPostSites.aspx"; }
         }
 
+        /// <summary>
+        /// Filename of the EditEntry-page.
+        /// </summary>
         public static String EditEntry
         {
             get { return "EditEntry.aspx"; }
         }
 
+        /// <summary>
+        /// Filename of the EditUser-page.
+        /// </summary>
         public static String EditUser
         {
             get { return "EditUser.aspx"; }
         }
 
+        /// <summary>
+        /// Filename of the EditNavigatorLinks-page.
+        /// </summary>
         public static String EditNavigatorLinks
         {
             get { return "EditNavigatorLinks.aspx"; }
         }
 
+        /// <summary>
+        /// Filename of the Eventlog-page.
+        /// </summary>
         public static String Eventlog
         {
             get { return "Eventlog.aspx"; }
         }
 
+        /// <summary>
+        /// Filename of the LiveCommentPreview-Javascript.
+        /// </summary>
+        public static String LiveCommentPreview
+        {
+            get { return "LiveCommentPreview.js"; }
+        }
+
+        /// <summary>
+        /// Filename of the UserClickThroughs-page.
+        /// </summary>
         public static String UserClickThroughs
         {
             get { return "UserClickThroughs.aspx"; }
         }
 
+        /// <summary>
+        /// Filename of the Referrers-page.
+        /// </summary>
         public static String Referrers
         {
             get { return "Referrers.aspx"; }
@@ -95,17 +249,6 @@
     }
 
     /// <summary>
-    /// Defines essentially foldernames for the core functionality.
-    /// </summary>
-    public static class CoreFolderNames
-    {
-        public static String SiteConfig
-        {
-            get { return "SiteConfig"; }
-        }
-    }
-
-    /// <summary>
     /// Defines essentially filepaths and methods for the core functionality.
     /// </summary>
     public static class CoreFilePaths
@@ -118,45 +261,61 @@
             get { return CoreFolderNames.SiteConfig + "/" + CoreFileNames.AccessDenied; }
         }
 
+        /// <summary>
+        /// Returns a string with the path to the blogroll-opml-file.
+        /// </summary>
+        public static String BlogrollOpml
+        {
+            get { return SiteUtilities.MapPath(CoreFolderNames.SiteConfig + "\\" + CoreFileNames.BlogrollOpmlFile); }
+        }
+
+        /// <summary>
+        /// Returns a string with the path to the blogroll-xslt-file.
+        /// </summary>
+        public static String BlogrollXslt
+        {
+            get { return SiteUtilities.MapPath(CoreFolderNames.SiteConfig + "\\" + CoreFileNames.BlogrollXsltFile); }
+        }
+
+        /// <summary>
+        /// Returns a string for the FormatPage-functionality.
+        /// </summary>
+        /// <param name="filename">The filename of the page for FormatPage.</param>
+        /// <returns>A string with the path to the FormatPage and the filename as parameter.</returns>
         public static String FormatPage(String filename)
         {
             return "~/" + CoreFileNames.FormatPage + "?path=" + filename;
         }
+
+        /// <summary>
+        /// Returns a string with the path to the LiveCommentPreview-Javascript.
+        /// </summary>
+        public static String LiveComments
+        {
+            get { return CoreFolderNames.Scripts + "/" + CoreFileNames.LiveCommentPreview; }
+        }
     }
 
     /// <summary>
-    /// Defines essentially CSS-names for the core functionality.
+    /// Defines essentially foldernames for the core functionality.
     /// </summary>
-    public static class CoreCssStyles
+    public static class CoreFolderNames
     {
-        #region Nested type: Attributes
-
-        public static class Attributes
+        /// <summary>
+        /// Foldername of the Javascripts-folder of DasBlog.
+        /// </summary>
+        public static String Scripts
         {
-            public static String Class
-            {
-                get { return "class"; }
-            }
+            get { return "scripts"; }
         }
 
-        #endregion
-
-        #region Nested type: Links
-
-        public static class Links
+        /// <summary>
+        /// Foldername of the SiteConfig-folder of DasBlog.
+        /// </summary>
+        public static String SiteConfig
         {
-            public static String Here
-            {
-                get { return "here"; }
-            }
-
-            public static String FirstHere
-            {
-                get { return "firstHere"; }
-            }
+            get { return "SiteConfig"; }
         }
-
-        #endregion
     }
 
     /// <summary>
@@ -166,8 +325,14 @@
     {
         #region Nested type: DateTime
 
+        /// <summary>
+        /// Defines parameter names in a DateTime-context.
+        /// </summary>
         public static class DateTime
         {
+            /// <summary>
+            /// Parameter name of a date.
+            /// </summary>
             public static String Date
             {
                 get { return "date"; }
@@ -175,22 +340,49 @@
         }
 
         #endregion
+
+        #region Nested type: Identify
+
+        /// <summary>
+        /// Defines parameter names in a Identify-contect.
+        /// </summary>
+        public static class Identify
+        {
+            /// <summary>
+            /// Parameter name of a Guid.
+            /// </summary>
+            public static String Guid
+            {
+                get { return "guid"; }
+            }
+        }
+
+        #endregion
     }
 
     /// <summary>
     /// Defines essentially security names for the core functionality.
     /// </summary>
-    public static class CoreSecurity
+    public static class CoreSecurityNames
     {
         #region Nested type: Roles
 
+        /// <summary>
+        /// Defines role names.
+        /// </summary>
         public static class Roles
         {
+            /// <summary>
+            /// Admin role.
+            /// </summary>
             public static String Admin
             {
                 get { return "admin"; }
             }
 
+            /// <summary>
+            /// Contributor role.
+            /// </summary>
             public static String Contributor
             {
                 get { return "contributor"; }

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/SiteSecurity.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/SiteSecurity.cs	2008-01-13 15:31:18 UTC (rev 799)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/SiteSecurity.cs	2008-01-13 16:47:46 UTC (rev 800)
@@ -65,7 +65,7 @@
         /// <param name="httpResponse">The response which can be redirected.</param>
         public static void IfIsNotAdminRedirect(HttpResponse httpResponse)
         {
-            if (!IsInRole(CoreSecurity.Roles.Admin) && httpResponse != null)
+            if (!IsInRole(CoreSecurityNames.Roles.Admin) && httpResponse != null)
             {
                 httpResponse.Redirect(CoreFilePaths.FormatPage(CoreFileNames.AccessDenied));
             }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Dasblogce-cvs] SF.net SVN: dasblogce: [805] branches/refactoring_architecture/source/ newtelligence.DasBlog.Web

From: <sfcaus@us...> - 2008-01-15 21:54

Revision: 805
          http://dasblogce.svn.sourceforge.net/dasblogce/?rev=805&view=rev
Author:   sfcaus
Date:     2008-01-15 13:54:35 -0800 (Tue, 15 Jan 2008)

Log Message:
-----------
- minor fix: LiveCommentPreview.js-path

Modified Paths:
--------------
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/CommentView.aspx.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/newtelligence.DasBlog.Web.csproj

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/CommentView.aspx.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/CommentView.aspx.cs	2008-01-15 08:49:00 UTC (rev 804)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/CommentView.aspx.cs	2008-01-15 21:54:35 UTC (rev 805)
@@ -111,7 +111,7 @@
                 // setup the Live Comment Preview with an allowed tags array "'a', 'b', 'p', 'strong', 'blockquote', 'i', 'em', 'u', 'strike', 'sup', 'sub', 'code'"
                 Page.ClientScript.RegisterClientScriptBlock(GetType(), "allowedHtmlTags", String.Format(
               @"<script type=""text/javascript"">var allowedHtmlTags = [{0}];</script>
-				<script type=""text/javascript"" src=" + CoreFilePaths.LiveComments + @""" defer=""defer""></script>",
+				<script type=""text/javascript"" src=""" + CoreFilePaths.LiveComments + @""" defer=""defer""></script>",
                 SiteConfig.AllowedTags.ToJavaScriptArray()));
                 base.OnLoad(e);
             }

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/newtelligence.DasBlog.Web.csproj
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/newtelligence.DasBlog.Web.csproj	2008-01-15 08:49:00 UTC (rev 804)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/newtelligence.DasBlog.Web.csproj	2008-01-15 21:54:35 UTC (rev 805)
@@ -738,6 +738,7 @@
     </Compile>
     <Compile Include="EditBlogRollEditItem.ascx.cs">
       <DependentUpon>EditBlogRollEditItem.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="EditBlogRollEditItem.ascx.designer.cs">
       <DependentUpon>EditBlogRollEditItem.ascx</DependentUpon>
@@ -789,6 +790,7 @@
     </Compile>
     <Compile Include="EditCrosspostSitesBox.ascx.cs">
       <DependentUpon>EditCrosspostSitesBox.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="EditCrosspostSitesBox.ascx.designer.cs">
       <DependentUpon>EditCrosspostSitesBox.ascx</DependentUpon>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Dasblogce-cvs] SF.net SVN: dasblogce: [804] trunk/source/newtelligence.DasBlog.Web

From: <alexandergross@us...> - 2008-01-15 08:49

Revision: 804
          http://dasblogce.svn.sourceforge.net/dasblogce/?rev=804&view=rev
Author:   alexandergross
Date:     2008-01-15 00:49:00 -0800 (Tue, 15 Jan 2008)

Log Message:
-----------
Changing "dasBlog" capitalization

Modified Paths:
--------------
    trunk/source/newtelligence.DasBlog.Web/SiteConfig/navigatorLinks.xml
    trunk/source/newtelligence.DasBlog.Web/SiteConfig/setuperror.html
    trunk/source/newtelligence.DasBlog.Web/SiteConfig/site.config.deploy
    trunk/source/newtelligence.DasBlog.Web/content/2005-07-20.dayentry.xml.deploy

Modified: trunk/source/newtelligence.DasBlog.Web/SiteConfig/navigatorLinks.xml
===================================================================
--- trunk/source/newtelligence.DasBlog.Web/SiteConfig/navigatorLinks.xml	2008-01-14 01:17:15 UTC (rev 803)
+++ trunk/source/newtelligence.DasBlog.Web/SiteConfig/navigatorLinks.xml	2008-01-15 08:49:00 UTC (rev 804)
@@ -5,7 +5,7 @@
 		<url>default.aspx</url>
 	</link>
 	<link>
-		<name>DasBlog</name>
+		<name>dasBlog</name>
 		<url>http://dasblog.info/</url>
 	</link>
 	<link>

Modified: trunk/source/newtelligence.DasBlog.Web/SiteConfig/setuperror.html
===================================================================
--- trunk/source/newtelligence.DasBlog.Web/SiteConfig/setuperror.html	2008-01-14 01:17:15 UTC (rev 803)
+++ trunk/source/newtelligence.DasBlog.Web/SiteConfig/setuperror.html	2008-01-15 08:49:00 UTC (rev 804)
@@ -13,7 +13,7 @@
 	</head>
 	<body>
 		<h1>
-			DasBlog Configuration Error</h1>
+			dasBlog Configuration Error</h1>
 		<h2>
 			Summary</h2>
 		<P>

Modified: trunk/source/newtelligence.DasBlog.Web/SiteConfig/site.config.deploy
===================================================================
--- trunk/source/newtelligence.DasBlog.Web/SiteConfig/site.config.deploy	2008-01-14 01:17:15 UTC (rev 803)
+++ trunk/source/newtelligence.DasBlog.Web/SiteConfig/site.config.deploy	2008-01-15 08:49:00 UTC (rev 804)
@@ -97,7 +97,7 @@
   <ContentFilters>
     <ContentFilter find="\$g\((?&lt;expr&gt;[\w\s\d]+)\)" replace="&lt;a href=&quot;http://www.google.com/search?q=$url(${expr})&quot;&gt;${expr}&lt;/a&gt;" isregex="true" />
     <ContentFilter find="\$d\((?&lt;expr&gt;[\w\s\d]+)\)" replace="&lt;a href=&quot;http://dictionary.reference.com/search?q=$url(${expr})&quot;&gt;${expr}&lt;/a&gt;" isregex="true" />
-    <ContentFilter find="dasBlog" replace="&lt;a href=&quot;http://dasblog.info&quot;&gt;DasBlog&lt;/a&gt;" isregex="false" />
+    <ContentFilter find="dasBlog" replace="&lt;a href=&quot;http://dasblog.info&quot;&gt;dasBlog&lt;/a&gt;" isregex="false" />
     <ContentFilter find=":-o" replace="&lt;img alt=&quot;:-o&quot; src=&quot;~/smilies/openmouth.gif&quot;&gt;" isregex="false" />
     <ContentFilter find=":-S" replace="&lt;img alt=&quot;:-S&quot; src=&quot;~/smilies/frown.gif&quot;&gt;" isregex="false" />
     <ContentFilter find=":-D" replace="&lt;img alt=&quot;:-D&quot; src=&quot;~/smilies/veryhappy.gif&quot;&gt;" isregex="false" />

Modified: trunk/source/newtelligence.DasBlog.Web/content/2005-07-20.dayentry.xml.deploy
===================================================================
--- trunk/source/newtelligence.DasBlog.Web/content/2005-07-20.dayentry.xml.deploy	2008-01-14 01:17:15 UTC (rev 803)
+++ trunk/source/newtelligence.DasBlog.Web/content/2005-07-20.dayentry.xml.deploy	2008-01-15 08:49:00 UTC (rev 804)
@@ -11,7 +11,7 @@
       <Modified>2005-07-20T23:10:18.9161264-07:00</Modified>
       <EntryId>b705c37b-b47f-4e8d-8f8b-091efc4cb684</EntryId>
       <Description />
-      <Title>Congratulations, you've installed DasBlog!</Title>
+      <Title>Congratulations, you've installed dasBlog!</Title>
       <Categories>dasBlog</Categories>
       <Author>admin</Author>
       <IsPublic>true</IsPublic>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Dasblogce-cvs] SF.net SVN: dasblogce: [803] branches/refactoring_architecture/source/ newtelligence.DasBlog.Web.Core/Macros

From: <sfcaus@us...> - 2008-01-14 01:17

Revision: 803
          http://dasblogce.svn.sourceforge.net/dasblogce/?rev=803&view=rev
Author:   sfcaus
Date:     2008-01-13 17:17:15 -0800 (Sun, 13 Jan 2008)

Log Message:
-----------
- IfAdminRawText macro for hometemplates added

Modified Paths:
--------------
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Macros/ItemMacros.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Macros/Macros.cs

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Macros/ItemMacros.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Macros/ItemMacros.cs	2008-01-14 00:39:27 UTC (rev 802)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Macros/ItemMacros.cs	2008-01-14 01:17:15 UTC (rev 803)
@@ -329,6 +329,7 @@
                 if (requestPage.SiteConfig.EnableGeoRss)
                 {
                     Nullable<double> latitude = new Nullable<double>();
+
                     if (entry.Latitude.HasValue)
                     {
                         latitude = entry.Latitude;
@@ -630,7 +631,7 @@
         /// <param name="quotRegEx">Regular expression. If it matches, the match will be replaced with an ".</param>
         /// <returns>The output is localized raw text.</returns>
         public virtual Control IfParamRawText(String paramName, String paramValue, String expression,
-                                              String elsewiseExpression, string quotRegEx)
+                                              String elsewiseExpression, String quotRegEx)
         {
             string rawText;
 

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Macros/Macros.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Macros/Macros.cs	2008-01-14 00:39:27 UTC (rev 802)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Macros/Macros.cs	2008-01-14 01:17:15 UTC (rev 803)
@@ -50,6 +50,7 @@
 using System.Web.UI.WebControls;
 using newtelligence.DasBlog.Runtime;
 using newtelligence.DasBlog.Util;
+using newtelligence.DasBlog.Web.Core.Config;
 
 namespace newtelligence.DasBlog.Web.Core.Macros
 {
@@ -1446,6 +1447,62 @@
             return true;
         }
 
+        #region IfElse
+
+        /// <summary>
+        /// Shows a localized raw text, if the user is in admin role.
+        /// Corresponds to the macro: &lt;%IfAdminRawText(...)%&gt;
+        /// </summary>
+        /// <example>&lt;% IfAdminRawText("Administration area|DE: Administration", "Reader area|DE: Leser") %&gt;</example>
+        /// <param name="ifIsAdminExpression">Text that will be displayed if the user is in admin role.</param>
+        /// <param name="elsewiseExpression">Text that will be displayed f the user is in admin role.</param>
+        /// <returns>The output is localized raw text.</returns>
+        public virtual Control IfAdminRawText(String ifIsAdminExpression, String elsewiseExpression)
+        {
+            return IfAdminRawText(ifIsAdminExpression, elsewiseExpression, null);
+        }
+
+        /// <summary>
+        /// Shows a localized raw text, if the user is in admin role.
+        /// Corresponds to the macro: &lt;%IfAdminRawText(...)%&gt;
+        /// </summary>
+        /// <example>&lt;% IfAdminRawText("Administration area|DE: Administration", "Reader area|DE: Leser") %&gt;</example>
+        /// <param name="ifIsAdminExpression">Text that will be displayed if the user is in admin role.</param>
+        /// <param name="elsewiseExpression">Text that will be displayed f the user is in admin role.</param>
+        /// <param name="quotRegEx">Regular expression. If it matches, the match will be replaced with an ".</param>
+        /// <returns>The output is localized raw text.</returns>
+        public virtual Control IfAdminRawText(String ifIsAdminExpression, String elsewiseExpression, string quotRegEx)
+        {
+            string rawText;
+
+            if (SiteSecurity.IsInRole(CoreSecurityNames.Roles.Admin))
+            {
+                if (!String.IsNullOrEmpty(quotRegEx))
+                {
+                    rawText = Util.ReplaceViaRegEx(ifIsAdminExpression, quotRegEx, "\"");
+                }
+                else
+                {
+                    rawText = ifIsAdminExpression;
+                }
+            }
+            else
+            {
+                if (!String.IsNullOrEmpty(quotRegEx))
+                {
+                    rawText = Util.ReplaceViaRegEx(elsewiseExpression, quotRegEx, "\"");
+                }
+                else
+                {
+                    rawText = elsewiseExpression;
+                }
+            }
+
+            return new LiteralControl(rawText);
+        }
+
+        #endregion
+
         #region Nested type: PopularSorter
 
         public class PopularSorter : IComparer<Entry>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Dasblogce-cvs] SF.net SVN: dasblogce: [801] branches/refactoring_architecture/source/ newtelligence.DasBlog.Web/newtelligence.DasBlog.Web.csproj

From: <sfcaus@us...> - 2008-01-13 16:49

Revision: 801
          http://dasblogce.svn.sourceforge.net/dasblogce/?rev=801&view=rev
Author:   sfcaus
Date:     2008-01-13 08:49:20 -0800 (Sun, 13 Jan 2008)

Log Message:
-----------
Ver?\195?\164ndert  branches/refactoring_architecture/source/newtelligence.DasBlog.Web/newtelligence.DasBlog.Web.csproj

Modified Paths:
--------------
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web/newtelligence.DasBlog.Web.csproj

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web/newtelligence.DasBlog.Web.csproj
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web/newtelligence.DasBlog.Web.csproj	2008-01-13 16:47:46 UTC (rev 800)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web/newtelligence.DasBlog.Web.csproj	2008-01-13 16:49:20 UTC (rev 801)
@@ -619,6 +619,7 @@
     </Compile>
     <Compile Include="AggBugs.aspx.cs">
       <DependentUpon>AggBugs.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="AggBugs.aspx.designer.cs">
       <DependentUpon>AggBugs.aspx</DependentUpon>
@@ -842,6 +843,7 @@
     </Compile>
     <Compile Include="Email.aspx.cs">
       <DependentUpon>Email.aspx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="Email.aspx.designer.cs">
       <DependentUpon>Email.aspx</DependentUpon>
@@ -862,6 +864,7 @@
     </Compile>
     <Compile Include="EventlogBox.ascx.cs">
       <DependentUpon>EventlogBox.ascx</DependentUpon>
+      <SubType>ASPXCodeBehind</SubType>
     </Compile>
     <Compile Include="EventlogBox.ascx.designer.cs">
       <DependentUpon>EventlogBox.ascx</DependentUpon>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Dasblogce-cvs] SF.net SVN: dasblogce: [796] branches/refactoring_architecture/source/ newtelligence.DasBlog.Web.Core/SideBarOpmlList.cs

From: <sfcaus@us...> - 2008-01-12 15:43

Revision: 796
          http://dasblogce.svn.sourceforge.net/dasblogce/?rev=796&view=rev
Author:   sfcaus
Date:     2008-01-12 07:43:20 -0800 (Sat, 12 Jan 2008)

Log Message:
-----------
- XHTML fix (<br/> to <br />)

Modified Paths:
--------------
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/SideBarOpmlList.cs

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/SideBarOpmlList.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/SideBarOpmlList.cs	2008-01-12 12:20:36 UTC (rev 795)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/SideBarOpmlList.cs	2008-01-12 15:43:20 UTC (rev 796)
@@ -1,3 +1,5 @@
+// NOTE: Refactored
+
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -12,21 +14,14 @@
 
 namespace newtelligence.DasBlog.Web.Core
 {
-    /// <summary>
-    /// Summary description for SideBarOpmlList.
-    /// </summary>
-    [DefaultProperty("FileName"),
-     ToolboxData("<{0}:SideBarOpmlList runat=server></{0}:SideBarOpmlList>")]
+    [DefaultProperty("FileName"), ToolboxData("<{0}:SideBarOpmlList runat=server></{0}:SideBarOpmlList>")]
     public class SideBarOpmlList : WebControl
     {
         private string fileName;
         private bool renderDescription;
         private string unresolvedFileName;
 
-
-        [Bindable(true),
-         Category("Data"),
-         DefaultValue("")]
+        [Bindable(true), Category("Data"), DefaultValue("")]
         public string FileName
         {
             get { return unresolvedFileName; }
@@ -43,6 +38,7 @@
                                              bool renderDescription)
         {
             SharedBasePage requestPage = Page as SharedBasePage;
+
             foreach (OpmlOutline outline in outlines)
             {
                 TableRow row = new TableRow();
@@ -77,21 +73,21 @@
                         switch (outline.type != null ? outline.type.ToLower() : "")
                         {
                             case "rss":
-                                img.ImageUrl = requestPage.GetThemedImageUrl("feedButton");
-                                img.AlternateText = "RSS: " + outline.title;
-                                break;
+                                    img.ImageUrl = requestPage.GetThemedImageUrl("feedButton");
+                                    img.AlternateText = "RSS: " + outline.title;
+                                    break;
                             case "atom":
-                                img.ImageUrl = requestPage.GetThemedImageUrl("atomButton");
-                                img.AlternateText = "Atom: " + outline.title;
-                                break;
+                                    img.ImageUrl = requestPage.GetThemedImageUrl("atomButton");
+                                    img.AlternateText = "Atom: " + outline.title;
+                                    break;
                             case "opml":
-                                img.ImageUrl = requestPage.GetThemedImageUrl("opmlButton");
-                                img.AlternateText = "OPML: " + outline.title;
-                                break;
+                                    img.ImageUrl = requestPage.GetThemedImageUrl("opmlButton");
+                                    img.AlternateText = "OPML: " + outline.title;
+                                    break;
                             default:
-                                img.ImageUrl = requestPage.GetThemedImageUrl("feedButton");
-                                img.AlternateText = "RSS: " + outline.title;
-                                break;
+                                    img.ImageUrl = requestPage.GetThemedImageUrl("feedButton");
+                                    img.AlternateText = "RSS: " + outline.title;
+                                    break;
                         }
 
                         xmlLink.Controls.Add(img);
@@ -112,7 +108,7 @@
                             HtmlGenericControl outlineDesc = new HtmlGenericControl("div");
                             outlineDesc.Attributes.Add("class", "blogRollDescriptionStyle");
                             outlineDesc.InnerText = outline.description;
-                            cell.Controls.Add(new LiteralControl("<br/>"));
+                            cell.Controls.Add(new LiteralControl("<br />"));
                             cell.Controls.Add(outlineDesc);
                         }
                     }
@@ -183,6 +179,7 @@
             SharedBasePage requestPage = Page as SharedBasePage;
 
             base.OnPreRender(e);
+
             if (!Page.ClientScript.IsClientScriptBlockRegistered(GetType(), "script"))
             {
                 string prefix =
@@ -199,11 +196,13 @@
                 {
                     script = rs.ReadToEnd();
                 }
+
                 Page.ClientScript.RegisterClientScriptBlock(GetType(), "script",
                                                             String.Format(
                                                                 "<script type=\"text/javascript\">\n{0}\n{1}//]]></script>",
                                                                 prefix, script));
             }
+
             if (!Page.ClientScript.IsClientScriptBlockRegistered(GetType(), "style"))
             {
                 string script;
@@ -215,6 +214,7 @@
                 {
                     script = rs.ReadToEnd();
                 }
+
                 Page.ClientScript.RegisterClientScriptBlock(GetType(), "style",
                                                             String.Format("<style type=\"text/css\">{0}</style>", script));
             }
@@ -233,16 +233,12 @@
             Table list = new Table();
             list.CssClass = "blogRollTableStyle";
 
-
             section.Controls.Add(list);
-
-
             //TODO: restructure: code-reuse != copy+paste
 
             try
             {
                 bool foundOpml = false;
-
                 Opml nav = null;
                 string fullPath;
 
@@ -280,15 +276,20 @@
                 if (foundOpml == false)
                 {
                     if (File.Exists(unresolvedFileName))
+                    {
                         fullPath = unresolvedFileName;
+                    }
                     else
+                    {
                         fullPath = SiteUtilities.MapPath(unresolvedFileName);
+                    }
 
-                    if ((File.Exists(fullPath)) && (foundOpml == false))
+                    if (File.Exists(fullPath))
                     {
                         foundOpml = true;
                         fileName = fullPath;
                         XmlSerializer ser;
+
                         using (Stream s = File.OpenRead(fileName))
                         {
                             ser = new XmlSerializer(typeof (Opml));
@@ -300,12 +301,13 @@
                 if (foundOpml == false)
                 {
                     fullPath = SiteUtilities.MapPath("~/SiteConfig/blogroll.opml");
+
                     if ((File.Exists(fullPath)))
                     {
                         foundOpml = true;
                         fileName = fullPath;
+                        XmlSerializer ser;
 
-                        XmlSerializer ser;
                         using (Stream s = File.OpenRead(fullPath))
                         {
                             ser = new XmlSerializer(typeof (Opml));
@@ -317,6 +319,7 @@
                 if (foundOpml == false)
                 {
                     string urlPath = SiteUtilities.MapPath("~/SiteConfig/opml.txt");
+
                     if ((File.Exists(urlPath)))
                     {
                         foundOpml = true;
@@ -329,6 +332,7 @@
                         }
 
                         WebRequest wq = WebRequest.Create(url);
+
                         using (WebResponse wr = wq.GetResponse())
                         {
                             XmlSerializer ser;
@@ -341,14 +345,13 @@
                     }
                 }
 
-
-                if (foundOpml == true)
+                if (foundOpml)
                 {
                     RenderOutlinesIntoTable(list, nav.body.outline, 0, renderDescription);
                 }
                 else
                 {
-                    section.Controls.Add(new LiteralControl("Add 'blogroll.opml' to your SiteConfig directory<br />"));
+                    section.Controls.Add(new LiteralControl("Add 'blogroll.opml' to your SiteConfig directory" + DasBlog.Web.Rendering.NewLine));
                 }
             }
             catch (Exception exc)
@@ -356,6 +359,7 @@
                 ErrorTrace.Trace(TraceLevel.Error, exc);
                 section.Controls.Add(new LiteralControl("There was an error processing '" + fileName + "'<br />"));
             }
+
             section.RenderControl(output);
         }
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Dasblogce-cvs] SF.net SVN: dasblogce: [789] branches/refactoring_architecture/source/ newtelligence.DasBlog.Web.Core

From: <sfcaus@us...> - 2008-01-10 21:09

Revision: 789
          http://dasblogce.svn.sourceforge.net/dasblogce/?rev=789&view=rev
Author:   sfcaus
Date:     2008-01-10 13:09:13 -0800 (Thu, 10 Jan 2008)

Log Message:
-----------
- new macros CommentsCount, IfCommentsRawText, IfItemRawText, IfViewPermalinkUrlRaw, IfParamRawText added
- refactoring of LocalString to LocalString and LocalStringBlank for localization-compatibility for every macro
- some XHTML compatibility problems fixed
- refactoring OnPageHomeLink for ReplaceViaRegEx-function

Modified Paths:
--------------
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Macros.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/StringTables/StringTables.DE.resx
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/StringTables/StringTables.resx

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Macros.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Macros.cs	2008-01-10 19:35:14 UTC (rev 788)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Macros.cs	2008-01-10 21:09:13 UTC (rev 789)
@@ -2072,6 +2072,23 @@
         /// <returns></returns>
         public virtual Control LocalString(string expression)
         {
+            return new LiteralControl(LocalStringBlank(expression));
+        }
+
+        /// <summary>
+        /// The localString macro allows to define language/culture dependend string
+        /// expressions in a template. An example for the format for the string is
+        /// "English Expression|DE-CH:Schweizerisches Ausdr\xFCckli|DE:Deutscher Ausdruck"
+        /// The default expression (usually English) always goes first and is used for
+        /// all cultures than are not contained in the string. The following expressions
+        /// are prefixed by their culture code followed by a colon. The substrings are 
+        /// separated from each other by the pipe-symbol. The pipe-symbol itself can't be
+        /// used in localString expressions.
+        /// </summary>
+        /// <param name="expression"></param>
+        /// <returns>A localized raw text.</returns>
+        public virtual String LocalStringBlank(string expression)
+        {
             string[] localStrings = expression.Split('|');
             string cultureId = Thread.CurrentThread.CurrentCulture.Name;
 
@@ -2080,10 +2097,11 @@
                 string culturePrefix = localStrings[i].Split(':')[0];
                 if (cultureId.ToUpper().StartsWith(culturePrefix.ToUpper()))
                 {
-                    return new LiteralControl(localStrings[i].Substring(culturePrefix.Length + 1));
+                    return localStrings[i].Substring(culturePrefix.Length + 1);
                 }
             }
-            return new LiteralControl(localStrings[0]);
+
+            return localStrings[0];
         }
 
         public virtual Control DrawTagCloud()
@@ -2808,6 +2826,25 @@
             return new LiteralControl("");
         }
 
+        public virtual Control OnPageHomeLink(string navigationText)
+        {
+            return OnPageHomeLink(navigationText, "home", null);
+        }
+
+        public virtual Control OnPageHomeLink(string navigationText, string cssClass, string removeUrlFragmentRegex)
+        {
+            if (requestPage.WeblogEntries.Count == 1)
+            {
+                HyperLink homeLink = new HyperLink();
+                homeLink.Controls.Add(LocalString(navigationText));
+                homeLink.NavigateUrl = homeLink.NavigateUrl = String.Format("{0}", GetClientUrl(SiteUtilities.GetStartPageUrl(requestPage.SiteConfig), removeUrlFragmentRegex));
+                homeLink.CssClass = cssClass;
+                return homeLink;
+            }
+
+            return new PlaceHolder();
+        }
+
 		public virtual Control OnPagePreviousLink(string navigationText)
 		{
 			return OnPagePreviousLink(navigationText, "previous", null);
@@ -2882,7 +2919,7 @@
     			                    RegexOptions.Compiled | RegexOptions.Singleline | RegexOptions.IgnoreCase);
     		}
 
-    		return url;
+            return ReplaceViaRegEx(url, removeUrlFragmentRegex, String.Empty);
     	}
 
     	/// <summary>
@@ -3010,7 +3047,7 @@
         {
             get
             {
-                string controlString = String.Format("<script language=\"javascript\">fmtDate = new Date();fmtDate.setTime(Date.parse('{0}'));" + "document.write( fmtDate.toLocaleString() )</script>", entry.CreatedUtc.ToString("r", CultureInfo.InvariantCulture));
+                string controlString = String.Format("<script type=\"text/javascript\">fmtDate = new Date();fmtDate.setTime(Date.parse('{0}'));" + "document.write( fmtDate.toLocaleString() )</script>", entry.CreatedUtc.ToString("r", CultureInfo.InvariantCulture));
                 return new LiteralControl(controlString);
             }
         }
@@ -3147,7 +3184,6 @@
             get { return new LiteralControl(SiteUtilities.GetPermaLinkUrl(entry)); }
         }
 
-
         /// <summary>
         /// The unique guid of the item.
         /// Corresponds to the macro: &lt;%itemGuid%&gt;
@@ -3203,6 +3239,230 @@
         }
 
         /// <summary>
+        /// Counts the comments on weblog entries.
+        /// Corresponds to the macro: &lt;%CommentsCount(...)%&gt;
+        /// </summary>
+        /// <example>&lt;% CommentsCount("&nbsp;") %&gt;&lt;% IfCommentsRawText("Comments, give one|DE:Kommentare, einen verfasssen", "Comment|DE:Kommentar", "Comments|DE:Kommentare") %&gt;</example>
+        /// <param name="separatorText">Text that will be displayed as the separator (after the sum).
+        /// </param>
+        /// <remarks>
+        /// The output is raw text.
+        /// </remarks>
+        public virtual Control CommentsCount(string separatorText)
+        {
+            if (requestPage.SiteConfig.EnableComments)
+            {
+                bool allComments = SiteSecurity.IsValidContributor();
+                CommentCollection comments = requestPage.DataService.GetCommentsFor(entry.EntryId, allComments);
+                return new LiteralControl(comments.Count + separatorText);
+            }
+            else
+            {
+                return new PlaceHolder();
+            }
+        }
+
+        /// <summary>
+        /// Shows a localized raw text, if there is at least one comment.
+        /// Corresponds to the macro: &lt;%IfCommentsRawText(...)%&gt;
+        /// </summary>
+        /// <example>&lt;% CommentsCount("&nbsp;") %&gt;&lt;% IfCommentsRawText("Comments, give one|DE:Kommentare, einen verfasssen", "Comment|DE:Kommentar", "Comments|DE:Kommentare") %&gt;</example>
+        /// <param name="commentTextSingular">Text that will be displayed if there is no or one comment.</param>
+        /// <param name="commentTextPlural">Text that will be displayed if there is more than one comment.</param>
+        /// </param>
+        /// <remarks>
+        /// The output is localized raw text.
+        /// </remarks>
+        public virtual Control IfCommentsRawText(String commentTextZero, String commentTextSingular, String commentTextPlural)
+        {
+            if (requestPage.SiteConfig.EnableComments)
+            {
+                bool allComments = SiteSecurity.IsValidContributor();
+                CommentCollection comments = requestPage.DataService.GetCommentsFor(entry.EntryId, allComments);
+                String returnText = String.Empty;
+
+                if (comments != null)
+                {
+                    if (comments.Count == 1)
+                    {
+                        returnText = commentTextSingular;
+                    }
+                    else if (comments.Count > 1)
+                    {
+                        returnText = commentTextPlural;
+                    }
+                    else if (comments.Count == 0)
+                    {
+                        returnText = commentTextZero;
+                    }
+                }
+
+                return new LiteralControl(LocalStringBlank(returnText));
+            }
+            else
+            {
+                return new PlaceHolder();
+            }
+        }
+
+        /// <summary>
+        /// Replace something in a expression via a regular expression.
+        /// </summary>
+        /// <param name="expression">The expression.</param>
+        /// <param name="replaceRegex">The regular expression.</param>
+        /// <param name="replaceExpression">The replacement.</param>
+        /// <returns>A string. If the regular expression does'nt match, the string is the expression.</returns>
+        static String ReplaceViaRegEx(string expression, string replaceRegex, string replaceExpression)
+        {
+            if (!String.IsNullOrEmpty(replaceRegex))
+            {
+                return Regex.Replace(expression,
+                                    replaceRegex,
+                                    replaceExpression,
+                                    RegexOptions.Compiled | RegexOptions.Singleline | RegexOptions.IgnoreCase);
+            }
+            else
+            {
+                return expression;
+            }
+        }
+
+        /// <summary>
+        /// Shows a localized raw text, if the page is not an aggregated view.
+        /// Corresponds to the macro: &lt;%IfItemRawText(...)%&gt;
+        /// </summary>
+        /// <example>&lt;% LocalRawTextIfItem("This is a blog entry|DE: Das ist ein Eintrag", "This is a view|DE: Das ist eine Ansicht") %&gt;</example>
+        /// <param name="ifIsItemExpression">Text that will be displayed if the page is not an aggregated view.</param>
+        /// <param name="elsewiseExpression">Text that will be displayed if the page is an aggregated view.</param>
+        /// <returns>The output is localized raw text.</returns>
+        public virtual Control IfItemRawText(String ifIsItemExpression, String elsewiseExpression)
+        {
+            return IfItemRawText(ifIsItemExpression, elsewiseExpression, null);
+        }
+
+        /// <summary>
+        /// Shows a localized raw text, if the page is not an aggregated view.
+        /// Corresponds to the macro: &lt;%IfItemRawText(...)%&gt;
+        /// </summary>
+        /// <example>&lt;% LocalRawTextIfItem("This is a blog entry|DE: Das ist ein Eintrag", "This is a view|DE: Das ist eine Ansicht") %&gt;</example>
+        /// <param name="ifIsItemExpression">Text that will be displayed if the page is not an aggregated view.</param>
+        /// <param name="elsewiseExpression">Text that will be displayed if the page is an aggregated view.</param>
+        /// <param name="quotRegEx">Regular expression. If it matches, the match will be replaced with an ".</param>
+        /// <returns>The output is localized raw text.</returns>
+        public virtual Control IfItemRawText(String ifIsItemExpression, String elsewiseExpression, string quotRegEx)
+        {
+            string rawText = String.Empty;
+
+            if (!requestPage.IsAggregatedView)
+            {
+                if (!String.IsNullOrEmpty(quotRegEx))
+                {
+                    rawText = ReplaceViaRegEx(ifIsItemExpression, quotRegEx, "\"");
+                }
+                else
+                {
+                    rawText = ifIsItemExpression;
+                }
+            }
+            else
+            {
+                if (!String.IsNullOrEmpty(quotRegEx))
+                {
+                    rawText = ReplaceViaRegEx(elsewiseExpression, quotRegEx, "\"");
+                }
+                else
+                {
+                    rawText = elsewiseExpression;
+                }
+            }
+
+            return new LiteralControl(rawText);
+        }
+
+        /// <summary>
+        /// Shows a localized raw text if the obtained param has the expected value.
+        /// Corresponds to the macro: &lt;%IfParamRawText(...)%&gt;
+        /// </summary>
+        /// <example>&lt;% LocalRawTextIfParam("showComments", "true", "style=display: none;", "style=display: block;") %&gt;</example>
+        /// <param name="paramName">A param name.</param>
+        /// <param name="paramValue">The obtained value of the param.</param>
+        /// <param name="expression">Text that will be displayed if the param has the obtained value.</param>
+        /// <param name="elsewiseExpression">Text that will be displayed otherwise.</param>
+        /// <returns>The output is localized raw text.</returns>
+        public virtual Control IfParamRawText(String paramName, String paramValue, String expression, String elsewiseExpression)
+        {
+            return IfParamRawText(paramName, paramValue, expression, elsewiseExpression, null);
+        }
+
+        /// <summary>
+        /// Shows a localized raw text if the obtained param has the expected value.
+        /// Corresponds to the macro: &lt;%IfParamRawText(...)%&gt;
+        /// </summary>
+        /// <example>&lt;% LocalRawTextIfParam("showComments", "true", "style=display: none;", "style=display: block;") %&gt;</example>
+        /// <param name="paramName">A param name.</param>
+        /// <param name="paramValue">The obtained value of the param.</param>
+        /// <param name="expression">Text that will be displayed if the param has the obtained value.</param>
+        /// <param name="elsewiseExpression">Text that will be displayed otherwise.</param>
+        /// <param name="quotRegEx">Regular expression. If it matches, the match will be replaced with an ".</param>
+        /// <returns>The output is localized raw text.</returns>
+        public virtual Control IfParamRawText(String paramName, String paramValue, String expression, String elsewiseExpression, string quotRegEx)
+        {
+            string rawText = String.Empty;
+
+            if (String.IsNullOrEmpty(paramName) || paramValue == null)
+            {
+                return new PlaceHolder();
+            }
+
+            if (requestPage.Request.Params[paramName] == paramValue)
+            {
+                if (!String.IsNullOrEmpty(quotRegEx))
+                {
+                    rawText = ReplaceViaRegEx(expression, quotRegEx, "\"");
+                }
+                else
+                {
+                    rawText = expression;
+                }
+            }
+            else
+            {
+                if (!String.IsNullOrEmpty(quotRegEx))
+                {
+                    rawText = ReplaceViaRegEx(elsewiseExpression, quotRegEx, "\"");
+                }
+                else
+                {
+                    rawText = elsewiseExpression;
+                }
+            }
+
+            return new LiteralControl(rawText);
+        }
+
+        /// <summary>
+        /// A placeholder for rendering a raw permalink for each single weblog entry if the page is an aggregated view.
+        /// Corresponds to the macro: &lt;%IfViewPermalinkUrlRaw%&gt;
+        /// </summary>
+        /// <remarks>
+        /// The output is raw text, url encoded.
+        /// </remarks>
+        public virtual Control IfViewPermalinkUrlRaw
+        {
+            get
+            {
+                if (requestPage.IsAggregatedView)
+                {
+                    return new LiteralControl(SiteUtilities.GetPermaLinkUrl(entry));
+                }
+                else
+                {
+                    return new PlaceHolder();
+                }
+            }
+        }
+
+        /// <summary>
         /// An HTML hyperlink.
         /// Corresponds to the macro: &lt;%trackbackLink%&gt;
         /// </summary>
@@ -3299,7 +3559,7 @@
                                     trkSpan.Controls.Add(hl);
                                 }
 
-                                trkSpan.Controls.Add(new LiteralControl("&nbsp;[" + trk.TrackingType.ToString() + "]<br>"));
+                                trkSpan.Controls.Add(new LiteralControl("&nbsp;[" + trk.TrackingType.ToString() + "]<br/>"));
                             }
                         }
 
@@ -3359,7 +3619,7 @@
 
                 if (trackings.Count > 0)
                 {
-                    placeHolder.Controls.Add(new LiteralControl("<br>"));
+                    placeHolder.Controls.Add(new LiteralControl("<br/>"));
                     HtmlGenericControl referralSpan = new HtmlGenericControl("span");
                     HtmlGenericControl referralSpanHidden = new HtmlGenericControl("span");
                     referralSpanHidden.Style.Add("display", "none");
@@ -3370,7 +3630,7 @@
 
                     placeHolder.Controls.Add(referralSpan);
                     referralSpan.Controls.Add(anchor);
-                    referralSpan.Controls.Add(new LiteralControl("Referred by:<br>"));
+                    referralSpan.Controls.Add(new LiteralControl("Referred by:<br/>"));
                     referralSpan.Controls.Add(referralSpanHidden);
 
                     int count = 0;
@@ -3439,13 +3699,13 @@
                             {
                                 referralSpanHidden.Controls.Add(hl);
                                 if (deleteHyperlink != null) referralSpanHidden.Controls.Add(deleteHyperlink);
-                                referralSpanHidden.Controls.Add(new LiteralControl("&nbsp;[" + trk.TrackingType.ToString() + "]<br>"));
+                                referralSpanHidden.Controls.Add(new LiteralControl("&nbsp;[" + trk.TrackingType.ToString() + "]<br/>"));
                             }
                             else
                             {
                                 referralSpan.Controls.Add(hl);
                                 if (deleteHyperlink != null) referralSpan.Controls.Add(deleteHyperlink);
-                                referralSpan.Controls.Add(new LiteralControl("&nbsp;[" + trk.TrackingType.ToString() + "]<br>"));
+                                referralSpan.Controls.Add(new LiteralControl("&nbsp;[" + trk.TrackingType.ToString() + "]<br/>"));
                                 count++;
                             }
                         }
@@ -3459,7 +3719,7 @@
                         // to change the getElementById() call to search for elements that ENDWITH what we are
                         // looking for. Until then this code below won't work in CommentView.aspx.
                         //OmarS: 2005-01-30. I fixed this by looping through the elements
-                        referralSpan.Controls.Add(new LiteralControl("<br>"));
+                        referralSpan.Controls.Add(new LiteralControl("<br/>"));
                         HyperLink hl = new HyperLink();
                         referralSpan.Controls.Add(hl);
                         hl.Text = requestPage.CoreStringTables.GetString("text_referrallist_more");
@@ -3544,7 +3804,7 @@
                                 link.NavigateUrl = SiteUtilities.GetPermaLinkUrl(relatedPost);
                             }
                             relatedPosts.Controls.Add(link);
-                            relatedPosts.Controls.Add(new LiteralControl("<br>"));
+                            relatedPosts.Controls.Add(new LiteralControl("<br/>"));
                         }
 
                         return placeHolder;
@@ -3686,6 +3946,7 @@
                     img.CssClass = "editLinkImageStyle";
                     img.ImageUrl = new Uri(new Uri(SiteUtilities.GetBaseUrl(requestPage.SiteConfig)), requestPage.GetThemedImageUrl("editbutton")).ToString();
                     img.BorderWidth = 0;
+                    img.AlternateText = requestPage.CoreStringTables.GetString("alttext_editbutton");
                     hl.Controls.Add(img);
                     hl.NavigateUrl = SiteUtilities.GetEditViewUrl(entry.EntryId);
                     hl.ToolTip = HttpUtility.HtmlEncode("Edit " + entry.Title);
@@ -3698,6 +3959,7 @@
                     img.CssClass = "deleteLinkImageStyle";
                     img.ImageUrl = new Uri(new Uri(SiteUtilities.GetBaseUrl(requestPage.SiteConfig)), requestPage.GetThemedImageUrl("deletebutton")).ToString();
                     img.BorderWidth = 0;
+                    img.AlternateText = requestPage.CoreStringTables.GetString("alttext_deletebutton");
                     hl.Controls.Add(img);
                     hl.NavigateUrl = String.Format("javascript:deleteEntry(\"{0}\", \"{1}\")", entry.EntryId, entry.Title.Replace("\"", "\\\""));
                     placeHolder.Controls.Add(hl);

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/StringTables/StringTables.DE.resx
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/StringTables/StringTables.DE.resx	2008-01-10 19:35:14 UTC (rev 788)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/StringTables/StringTables.DE.resx	2008-01-10 21:09:13 UTC (rev 789)
@@ -1,129 +1,213 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
-	<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-		<xsd:element name="root" msdata:IsDataSet="true">
-			<xsd:complexType>
-				<xsd:choice maxOccurs="unbounded">
-					<xsd:element name="data">
-						<xsd:complexType>
-							<xsd:sequence>
-								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-								<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-							</xsd:sequence>
-							<xsd:attribute name="name" type="xsd:string" />
-							<xsd:attribute name="type" type="xsd:string" />
-							<xsd:attribute name="mimetype" type="xsd:string" />
-						</xsd:complexType>
-					</xsd:element>
-					<xsd:element name="resheader">
-						<xsd:complexType>
-							<xsd:sequence>
-								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-							</xsd:sequence>
-							<xsd:attribute name="name" type="xsd:string" use="required" />
-						</xsd:complexType>
-					</xsd:element>
-				</xsd:choice>
-			</xsd:complexType>
-		</xsd:element>
-	</xsd:schema>
-	<resheader name="ResMimeType">
-		<value>text/microsoft-resx</value>
-	</resheader>
-	<resheader name="Version">
-		<value>1.0.0.0</value>
-	</resheader>
-	<resheader name="Reader">
-		<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-	</resheader>
-	<resheader name="Writer">
-		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-	</resheader>
-	<data name="text_comments">
-		<value>Kommentare</value>
-	</data>
-	<data name="text_subscribe">
-		<value>Abonnieren</value>
-	</data>
-	<data name="text_send_mail">
-		<value>E-Mail an den Autor</value>
-	</data>
-	<data name="text_read_more">
-		<value>Mehr zum Thema...</value>
-	</data>
-	<data name="text_permalink">
-		<value>Benutzen Sie die URL dieses Links, um dauerhafte Referenzen zu diesem Artikel zu schlagen.</value>
-	</data>
-	<data name="text_trackback">
-		<value>Trackback</value>
-	</data>
-	<data name="tooltip_trackback">
-		<value>Benutzen Sie die URL dieses Eintrages, um einen Trackback für den Artikel zu senden. Wenn Sie nicht wissen, was Trackback ist - halb so schlimm. </value>
-	</data>
-	<data name="tooltip_expand">
-		<value>Klicken Sie hier, um diesen Zweig zu erweiteren oder zu schließen.</value>
-	</data>
-	<data name="text_item_lang_note">
-		<value>Anmerkung: Dieser Eintrag wird nur für die folgende Sprache dargestellt:</value>
-	</data>
-	<data name="text_item_cat_note">
-		<value>Anmerkung: Sie haben einen Kategorienfilter für die Startseite festlegt. Dieser Eintrag hat keine Kategorien und wird deshalb nicht auf dem Weblog dargestellt.</value>
-	</data>
-	<data name="tooltip_disclaimer">
-		<value>Klicken Sie hier um den Haftungsausschluss zu lesen</value>
-	</data>
-	<data name="text_disclaimer">
-		<value>Haftungsausschluss</value>
-	</data>
-	<data name="text_log_on">
-		<value>Anmelden</value>
-	</data>
-	<data name="text_referrallist_more">
-		<value>Mehr...</value>
-	</data>
-	<data name="text_blogstats_totalposts">
-		<value>Gesamte Posts:</value>
-	</data>
-	<data name="text_blogstats_thisweek">
-		<value>Diese Woche:</value>
-	</data>
-	<data name="text_blogstats_thismonth">
-		<value>Dieser Monat:</value>
-	</data>
-	<data name="text_blogstats_thisyear">
-		<value>Dieses Jahr:</value>
-	</data>
-	<data name="text_blogstats_comments">
-		<value>Kommentare:</value>
-	</data>
-	<data name="text_delete_confirm">
-		<value>Sind Sie sicher dass Sie diesen Eintrag löschen möchten?</value>
-	</data>
-	<data name="text_blogtopposters_totalposts">
-		<value>Gesamte Posts</value>
-	</data>
-	<data name="text_blogtopposters_comments">
-		<value>Kommentare</value>
-	</data>
-	<data name="text_trackings">
-		<value>Verfolgt von:</value>
-	</data>
-	<data name="text_related_posts">
-		<value>Verwandte Themen:</value>
-	</data>
-	<data name="text_category_nextpage">
-		<value>Nächste Seite</value>
-	</data>
-	<data name="text_category_previouspage">
-		<value>Vorherige Seite</value>
-	</data>
-	<data name="text_category_pagexofy">
-		<value>Seite {0} von {1} in der Kategorie {2}</value>
-	</data>
-	<data name="text_previous_posts">
-		<value>Vorherige Einträge</value>
-	</data>
-	<data name="text_next_posts">
-		<value>Nächste Einträge</value>
-	</data>
-</root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="text_comments" xml:space="preserve">
+    <value>Kommentare</value>
+  </data>
+  <data name="text_subscribe" xml:space="preserve">
+    <value>Abonnieren</value>
+  </data>
+  <data name="text_send_mail" xml:space="preserve">
+    <value>E-Mail an den Autor</value>
+  </data>
+  <data name="text_read_more" xml:space="preserve">
+    <value>Mehr zum Thema...</value>
+  </data>
+  <data name="text_permalink" xml:space="preserve">
+    <value>Benutzen Sie die URL dieses Links, um dauerhafte Referenzen zu diesem Artikel zu schlagen.</value>
+  </data>
+  <data name="text_trackback" xml:space="preserve">
+    <value>Trackback</value>
+  </data>
+  <data name="tooltip_trackback" xml:space="preserve">
+    <value>Benutzen Sie die URL dieses Eintrages, um einen Trackback für den Artikel zu senden. Wenn Sie nicht wissen, was Trackback ist - halb so schlimm. </value>
+  </data>
+  <data name="tooltip_expand" xml:space="preserve">
+    <value>Klicken Sie hier, um diesen Zweig zu erweiteren oder zu schließen.</value>
+  </data>
+  <data name="text_item_lang_note" xml:space="preserve">
+    <value>Anmerkung: Dieser Eintrag wird nur für die folgende Sprache dargestellt:</value>
+  </data>
+  <data name="text_item_cat_note" xml:space="preserve">
+    <value>Anmerkung: Sie haben einen Kategorienfilter für die Startseite festlegt. Dieser Eintrag hat keine Kategorien und wird deshalb nicht auf dem Weblog dargestellt.</value>
+  </data>
+  <data name="tooltip_disclaimer" xml:space="preserve">
+    <value>Klicken Sie hier um den Haftungsausschluss zu lesen</value>
+  </data>
+  <data name="text_disclaimer" xml:space="preserve">
+    <value>Haftungsausschluss</value>
+  </data>
+  <data name="text_log_on" xml:space="preserve">
+    <value>Anmelden</value>
+  </data>
+  <data name="text_referrallist_more" xml:space="preserve">
+    <value>Mehr...</value>
+  </data>
+  <data name="text_blogstats_totalposts" xml:space="preserve">
+    <value>Gesamte Posts:</value>
+  </data>
+  <data name="text_blogstats_thisweek" xml:space="preserve">
+    <value>Diese Woche:</value>
+  </data>
+  <data name="text_blogstats_thismonth" xml:space="preserve">
+    <value>Dieser Monat:</value>
+  </data>
+  <data name="text_blogstats_thisyear" xml:space="preserve">
+    <value>Dieses Jahr:</value>
+  </data>
+  <data name="text_blogstats_comments" xml:space="preserve">
+    <value>Kommentare:</value>
+  </data>
+  <data name="text_delete_confirm" xml:space="preserve">
+    <value>Sind Sie sicher dass Sie diesen Eintrag löschen möchten?</value>
+  </data>
+  <data name="text_blogtopposters_totalposts" xml:space="preserve">
+    <value>Gesamte Posts</value>
+  </data>
+  <data name="text_blogtopposters_comments" xml:space="preserve">
+    <value>Kommentare</value>
+  </data>
+  <data name="text_trackings" xml:space="preserve">
+    <value>Verfolgt von:</value>
+  </data>
+  <data name="text_related_posts" xml:space="preserve">
+    <value>Verwandte Themen:</value>
+  </data>
+  <data name="text_category_nextpage" xml:space="preserve">
+    <value>Nächste Seite</value>
+  </data>
+  <data name="text_category_previouspage" xml:space="preserve">
+    <value>Vorherige Seite</value>
+  </data>
+  <data name="text_category_pagexofy" xml:space="preserve">
+    <value>Seite {0} von {1} in der Kategorie {2}</value>
+  </data>
+  <data name="text_previous_posts" xml:space="preserve">
+    <value>Vorherige Einträge</value>
+  </data>
+  <data name="text_next_posts" xml:space="preserve">
+    <value>Nächste Einträge</value>
+  </data>
+  <data name="alttext_deletebutton" xml:space="preserve">
+    <value>Hier klicken, um diesen Eintrag zu löschen</value>
+  </data>
+  <data name="alttext_editbutton" xml:space="preserve">
+    <value>Hier klicken, um diesen Eintrag zu bearbeiten</value>
+  </data>
+</root>
\ No newline at end of file

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/StringTables/StringTables.resx
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/StringTables/StringTables.resx	2008-01-10 19:35:14 UTC (rev 788)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/StringTables/StringTables.resx	2008-01-10 21:09:13 UTC (rev 789)
@@ -1,129 +1,213 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
-	<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-		<xsd:element name="root" msdata:IsDataSet="true">
-			<xsd:complexType>
-				<xsd:choice maxOccurs="unbounded">
-					<xsd:element name="data">
-						<xsd:complexType>
-							<xsd:sequence>
-								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-								<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-							</xsd:sequence>
-							<xsd:attribute name="name" type="xsd:string" />
-							<xsd:attribute name="type" type="xsd:string" />
-							<xsd:attribute name="mimetype" type="xsd:string" />
-						</xsd:complexType>
-					</xsd:element>
-					<xsd:element name="resheader">
-						<xsd:complexType>
-							<xsd:sequence>
-								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-							</xsd:sequence>
-							<xsd:attribute name="name" type="xsd:string" use="required" />
-						</xsd:complexType>
-					</xsd:element>
-				</xsd:choice>
-			</xsd:complexType>
-		</xsd:element>
-	</xsd:schema>
-	<resheader name="ResMimeType">
-		<value>text/microsoft-resx</value>
-	</resheader>
-	<resheader name="Version">
-		<value>1.0.0.0</value>
-	</resheader>
-	<resheader name="Reader">
-		<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-	</resheader>
-	<resheader name="Writer">
-		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-	</resheader>
-	<data name="text_comments">
-		<value>Comments</value>
-	</data>
-	<data name="text_subscribe">
-		<value>Subscribe to this weblog's RSS feed with SharpReader, Radio Userland, NewsGator or any other aggregator listening on port 5335 by clicking this button.</value>
-	</data>
-	<data name="text_send_mail">
-		<value>Send mail to the author(s)</value>
-	</data>
-	<data name="text_read_more">
-		<value>Read more ...</value>
-	</data>
-	<data name="text_permalink">
-		<value>Use the link of this item to make permanent references to this entry.</value>
-	</data>
-	<data name="text_trackback">
-		<value>Trackback</value>
-	</data>
-	<data name="tooltip_trackback">
-		<value>Use the URL of this link to use track back on this entry. If you don't know what trackback is, don't worry about it.</value>
-	</data>
-	<data name="tooltip_expand">
-		<value>Click to collapse or expand this item</value>
-	</data>
-	<data name="text_item_lang_note">
-		<value>Note: For visitors of your site, this entry is only displayed for users with the preselected language </value>
-	</data>
-	<data name="text_item_cat_note">
-		<value>Note: You have specified a category filter for the front page and this entry has no categories specified. It will therefore not be visible to visitors of your site.</value>
-	</data>
-	<data name="tooltip_disclaimer">
-		<value>Click here to view the Disclaimer for posts</value>
-	</data>
-	<data name="text_disclaimer">
-		<value>Disclaimer</value>
-	</data>
-	<data name="text_log_on">
-		<value>Sign In</value>
-	</data>
-	<data name="text_referrallist_more">
-		<value>More...</value>
-	</data>
-	<data name="text_blogstats_totalposts">
-		<value>Total Posts:</value>
-	</data>
-	<data name="text_blogstats_thisweek">
-		<value>This Week:</value>
-	</data>
-	<data name="text_blogstats_thismonth">
-		<value>This Month:</value>
-	</data>
-	<data name="text_blogstats_thisyear">
-		<value>This Year:</value>
-	</data>
-	<data name="text_blogstats_comments">
-		<value>Comments:</value>
-	</data>
-	<data name="text_delete_confirm">
-		<value>Are you sure you want to delete this item?</value>
-	</data>
-	<data name="text_blogtopposters_totalposts">
-		<value>Total Posts</value>
-	</data>
-	<data name="text_blogtopposters_comments">
-		<value>Comments</value>
-	</data>
-	<data name="text_trackings">
-		<value>Tracked by:</value>
-	</data>
-	<data name="text_related_posts">
-		<value>Related posts:</value>
-	</data>
-	<data name="text_category_nextpage">
-		<value>Next Page</value>
-	</data>
-	<data name="text_category_previouspage">
-		<value>Previous Page</value>
-	</data>
-	<data name="text_category_pagexofy">
-		<value>Page {0} of {1} in the {2} category</value>
-	</data>
-	<data name="text_previous_posts">
-		<value>Older Posts</value>
-	</data>
-	<data name="text_next_posts">
-		<value>Newer Posts</value>
-	</data>
-</root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="text_comments" xml:space="preserve">
+    <value>Comments</value>
+  </data>
+  <data name="text_subscribe" xml:space="preserve">
+    <value>Subscribe to this weblog's RSS feed with SharpReader, Radio Userland, NewsGator or any other aggregator listening on port 5335 by clicking this button.</value>
+  </data>
+  <data name="text_send_mail" xml:space="preserve">
+    <value>Send mail to the author(s)</value>
+  </data>
+  <data name="text_read_more" xml:space="preserve">
+    <value>Read more ...</value>
+  </data>
+  <data name="text_permalink" xml:space="preserve">
+    <value>Use the link of this item to make permanent references to this entry.</value>
+  </data>
+  <data name="text_trackback" xml:space="preserve">
+    <value>Trackback</value>
+  </data>
+  <data name="tooltip_trackback" xml:space="preserve">
+    <value>Use the URL of this link to use track back on this entry. If you don't know what trackback is, don't worry about it.</value>
+  </data>
+  <data name="tooltip_expand" xml:space="preserve">
+    <value>Click to collapse or expand this item</value>
+  </data>
+  <data name="text_item_lang_note" xml:space="preserve">
+    <value>Note: For visitors of your site, this entry is only displayed for users with the preselected language </value>
+  </data>
+  <data name="text_item_cat_note" xml:space="preserve">
+    <value>Note: You have specified a category filter for the front page and this entry has no categories specified. It will therefore not be visible to visitors of your site.</value>
+  </data>
+  <data name="tooltip_disclaimer" xml:space="preserve">
+    <value>Click here to view the Disclaimer for posts</value>
+  </data>
+  <data name="text_disclaimer" xml:space="preserve">
+    <value>Disclaimer</value>
+  </data>
+  <data name="text_log_on" xml:space="preserve">
+    <value>Sign In</value>
+  </data>
+  <data name="text_referrallist_more" xml:space="preserve">
+    <value>More...</value>
+  </data>
+  <data name="text_blogstats_totalposts" xml:space="preserve">
+    <value>Total Posts:</value>
+  </data>
+  <data name="text_blogstats_thisweek" xml:space="preserve">
+    <value>This Week:</value>
+  </data>
+  <data name="text_blogstats_thismonth" xml:space="preserve">
+    <value>This Month:</value>
+  </data>
+  <data name="text_blogstats_thisyear" xml:space="preserve">
+    <value>This Year:</value>
+  </data>
+  <data name="text_blogstats_comments" xml:space="preserve">
+    <value>Comments:</value>
+  </data>
+  <data name="text_delete_confirm" xml:space="preserve">
+    <value>Are you sure you want to delete this item?</value>
+  </data>
+  <data name="text_blogtopposters_totalposts" xml:space="preserve">
+    <value>Total Posts</value>
+  </data>
+  <data name="text_blogtopposters_comments" xml:space="preserve">
+    <value>Comments</value>
+  </data>
+  <data name="text_trackings" xml:space="preserve">
+    <value>Tracked by:</value>
+  </data>
+  <data name="text_related_posts" xml:space="preserve">
+    <value>Related posts:</value>
+  </data>
+  <data name="text_category_nextpage" xml:space="preserve">
+    <value>Next Page</value>
+  </data>
+  <data name="text_category_previouspage" xml:space="preserve">
+    <value>Previous Page</value>
+  </data>
+  <data name="text_category_pagexofy" xml:space="preserve">
+    <value>Page {0} of {1} in the {2} category</value>
+  </data>
+  <data name="text_previous_posts" xml:space="preserve">
+    <value>Older Posts</value>
+  </data>
+  <data name="text_next_posts" xml:space="preserve">
+    <value>Newer Posts</value>
+  </data>
+  <data name="alttext_deletebutton" xml:space="preserve">
+    <value>Click here to delete this item</value>
+  </data>
+  <data name="alttext_editbutton" xml:space="preserve">
+    <value>Click here to edit this item</value>
+  </data>
+</root>
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Dasblogce-cvs] SF.net SVN: dasblogce: [791] branches/refactoring_architecture/source/ newtelligence.DasBlog.Web.Core

From: <sfcaus@us...> - 2008-01-11 14:26

Revision: 791
          http://dasblogce.svn.sourceforge.net/dasblogce/?rev=791&view=rev
Author:   sfcaus
Date:     2008-01-11 06:26:21 -0800 (Fri, 11 Jan 2008)

Log Message:
-----------
- automated code formatting
- some minor fixes

Modified Paths:
--------------
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Macros.cs
    branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/SiteConfig.cs

Modified: branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Macros.cs
===================================================================
--- branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Macros.cs	2008-01-10 21:14:17 UTC (rev 790)
+++ branches/refactoring_architecture/source/newtelligence.DasBlog.Web.Core/Macros.cs	2008-01-11 14:26:21 UTC (rev 791)
@@ -1,4 +1,5 @@
 #region Copyright (c) 2003, newtelligence AG. All rights reserved.
+
 /*
 // Copyright (c) 2003, newtelligence AG. (http://www.newtelligence.com)
 // Original BlogX Source Code: Copyright (c) 2003, Chris Anderson (http://simplegeek.com)
@@ -35,10 +36,12 @@
 // or following this notice. 
 //
 */
+
 #endregion
 
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.Configuration;
 using System.Globalization;
@@ -52,7 +55,6 @@
 using System.Web.UI.WebControls;
 using newtelligence.DasBlog.Runtime;
 using newtelligence.DasBlog.Util;
-using System.Collections.Generic;
 
 namespace newtelligence.DasBlog.Web.Core
 {
@@ -69,10 +71,6 @@
             get { return "newtelligence.DasBlog.Macros"; }
         }
 
-        public MacroSectionHandler()
-        {
-        }
-
         protected override string KeyAttributeName
         {
             get { return "macro"; }
@@ -88,114 +86,123 @@
     {
         public static RadioProperties CreateRadioPropertiesInstance(SharedBasePage page)
         {
-            string typeName = typeof(RadioProperties).AssemblyQualifiedName;
-            NameValueCollection macroMap = ConfigurationManager.GetSection(MacroSectionHandler.ConfigSectionName) as NameValueCollection;
+            string typeName = typeof (RadioProperties).AssemblyQualifiedName;
+            NameValueCollection macroMap =
+                ConfigurationManager.GetSection(MacroSectionHandler.ConfigSectionName) as NameValueCollection;
             if (macroMap != null && macroMap["radioprops"] != null)
             {
                 typeName = macroMap["radioprops"];
             }
-            return (RadioProperties)Activator.CreateInstance(Type.GetType(typeName), new object[] { page });
+            return (RadioProperties) Activator.CreateInstance(Type.GetType(typeName), new object[] {page});
         }
 
         public static EditRadioProperties CreateEditRadioPropertiesInstance(SharedBasePage page)
         {
-            string typeName = typeof(EditRadioProperties).AssemblyQualifiedName;
-            NameValueCollection macroMap = ConfigurationManager.GetSection(MacroSectionHandler.ConfigSectionName) as NameValueCollection;
+            string typeName = typeof (EditRadioProperties).AssemblyQualifiedName;
+            NameValueCollection macroMap =
+                ConfigurationManager.GetSection(MacroSectionHandler.ConfigSectionName) as NameValueCollection;
             if (macroMap != null && macroMap["editradioprops"] != null)
             {
                 typeName = macroMap["editradioprops"];
             }
-            return (EditRadioProperties)Activator.CreateInstance(Type.GetType(typeName), new object[] { page });
+            return (EditRadioProperties) Activator.CreateInstance(Type.GetType(typeName), new object[] {page});
         }
 
         public static NewtelligenceProperties CreateNewtelligencePropertiesInstance(SharedBasePage page)
         {
-            string typeName = typeof(NewtelligenceProperties).AssemblyQualifiedName;
-            NameValueCollection macroMap = ConfigurationManager.GetSection(MacroSectionHandler.ConfigSectionName) as NameValueCollection;
+            string typeName = typeof (NewtelligenceProperties).AssemblyQualifiedName;
+            NameValueCollection macroMap =
+                ConfigurationManager.GetSection(MacroSectionHandler.ConfigSectionName) as NameValueCollection;
             if (macroMap != null && macroMap["newtelligenceprops"] != null)
             {
                 typeName = macroMap["newtelligenceprops"];
             }
-            return (NewtelligenceProperties)Activator.CreateInstance(Type.GetType(typeName), new object[] { page });
+            return (NewtelligenceProperties) Activator.CreateInstance(Type.GetType(typeName), new object[] {page});
         }
 
         public static RadioMacros CreateRadioMacrosInstance(SharedBasePage page)
         {
-            string typeName = typeof(RadioMacros).AssemblyQualifiedName;
-            NameValueCollection macroMap = ConfigurationManager.GetSection(MacroSectionHandler.ConfigSectionName) as NameValueCollection;
+            string typeName = typeof (RadioMacros).AssemblyQualifiedName;
+            NameValueCollection macroMap =
+                ConfigurationManager.GetSection(MacroSectionHandler.ConfigSectionName) as NameValueCollection;
             if (macroMap != null && macroMap["radiomacros"] != null)
             {
                 typeName = macroMap["radiomacros"];
             }
-            return (RadioMacros)Activator.CreateInstance(Type.GetType(typeName), new object[] { page });
+            return (RadioMacros) Activator.CreateInstance(Type.GetType(typeName), new object[] {page});
         }
 
         public static EditRadioMacros CreateEditRadioMacrosInstance(SharedBasePage page)
         {
-            string typeName = typeof(EditRadioMacros).AssemblyQualifiedName;
-            NameValueCollection macroMap = ConfigurationManager.GetSection(MacroSectionHandler.ConfigSectionName) as NameValueCollection;
+            string typeName = typeof (EditRadioMacros).AssemblyQualifiedName;
+            NameValueCollection macroMap =
+                ConfigurationManager.GetSection(MacroSectionHandler.ConfigSectionName) as NameValueCollection;
             if (macroMap != null && macroMap["editradiomacros"] != null)
             {
                 typeName = macroMap["editradiomacros"];
             }
-            return (EditRadioMacros)Activator.CreateInstance(Type.GetType(typeName), new object[] { page });
+            return (EditRadioMacros) Activator.CreateInstance(Type.GetType(typeName), new object[] {page});
         }
 
         public static EditMacros CreateEditMacrosInstance(SharedBasePage page)
         {
-            string typeName = typeof(EditMacros).AssemblyQualifiedName;
-            NameValueCollection macroMap = ConfigurationManager.GetSection(MacroSectionHandler.ConfigSectionName) as NameValueCollection;
+            string typeName = typeof (EditMacros).AssemblyQualifiedName;
+            NameValueCollection macroMap =
+                ConfigurationManager.GetSection(MacroSectionHandler.ConfigSectionName) as NameValueCollection;
             if (macroMap != null && macroMap["Editmacros"] != null)
             {
                 typeName = macroMap["Editmacros"];
             }
-            return (EditMacros)Activator.CreateInstance(Type.GetType(typeName), new object[] { page });
+            return (EditMacros) Activator.CreateInstance(Type.GetType(typeName), new object[] {page});
         }
 
         public static WeblogMacros CreateWeblogMacrosInstance(SharedBasePage page)
         {
-            string typeName = typeof(WeblogMacros).AssemblyQualifiedName;
-            NameValueCollection macroMap = ConfigurationManager.GetSection(MacroSectionHandler.ConfigSectionName) as NameValueCollection;
+            string typeName = typeof (WeblogMacros).AssemblyQualifiedName;
+            NameValueCollection macroMap =
+                ConfigurationManager.GetSection(MacroSectionHandler.ConfigSectionName) as NameValueCollection;
             if (macroMap != null && macroMap["weblogmacros"] != null)
             {
                 typeName = macroMap["weblogmacros"];
             }
-            return (WeblogMacros)Activator.CreateInstance(Type.GetType(typeName), new object[] { page });
+            return (WeblogMacros) Activator.CreateInstance(Type.GetType(typeName), new object[] {page});
         }
 
         public static Macros CreateMacrosInstance(SharedBasePage page)
         {
-            string typeName = typeof(Macros).AssemblyQualifiedName;
-            NameValueCollection macroMap = ConfigurationManager.GetSection(MacroSectionHandler.ConfigSectionName) as NameValueCollection;
+            string typeName = typeof (Macros).AssemblyQualifiedName;
+            NameValueCollection macroMap =
+                ConfigurationManager.GetSection(MacroSectionHandler.ConfigSectionName) as NameValueCollection;
             if (macroMap != null && macroMap["macros"] != null)
             {
                 typeName = macroMap["macros"];
             }
-            return (Macros)Activator.CreateInstance(Type.GetType(typeName), new object[] { page });
+            return (Macros) Activator.CreateInstance(Type.GetType(typeName), new object[] {page});
         }
 
         public static DayMacros CreateDayMacrosInstance(SharedBasePage page)
         {
-            string typeName = typeof(DayMacros).AssemblyQualifiedName;
-            NameValueCollection macroMap = ConfigurationManager.GetSection(MacroSectionHandler.ConfigSectionName) as NameValueCollection;
+            string typeName = typeof (DayMacros).AssemblyQualifiedName;
+            NameValueCollection macroMap =
+                ConfigurationManager.GetSection(MacroSectionHandler.ConfigSectionName) as NameValueCollection;
             if (macroMap != null && macroMap["daymacros"] != null)
             {
                 typeName = macroMap["daymacros"];
             }
-            return (DayMacros)Activator.CreateInstance(Type.GetType(typeName), new object[] { page });
+            return (DayMacros) Activator.CreateInstance(Type.GetType(typeName), new object[] {page});
         }
 
         public static object CreateCustomMacrosInstance(SharedBasePage page, Entry item, string name)
         {
-            NameValueCollection macroMap = ConfigurationManager.GetSection(MacroSectionHandler.ConfigSectionName) as NameValueCollection;
+            NameValueCollection macroMap =
+                ConfigurationManager.GetSection(MacroSectionHandler.ConfigSectionName) as NameValueCollection;
             if (macroMap != null && macroMap[name] != null)
             {
                 string typeName = macroMap[name];
-                return Activator.CreateInstance(Type.GetType(typeName), new object[] { page, item });
+                return Activator.CreateInstance(Type.GetType(typeName), new object[] {page, item});
             }
             return null;
         }
-
     }
 
     /// <summary>
@@ -223,25 +230,33 @@
         /// <returns></returns>
         public virtual Control ImageUrl(string img)
         {
-            return new LiteralControl(new Uri(new Uri(SiteUtilities.GetBaseUrl(requestPage.SiteConfig)), requestPage.BlogTheme.ImageDirectory).ToString() + "/" + img);
+            return new LiteralControl(new Uri(new Uri(SiteUtilities.GetBaseUrl(requestPage.SiteConfig)),
+                                              requestPage.BlogTheme.ImageDirectory) + "/" + img);
         }
 
+        // TODO: Documentation for args
         /// <summary>
         /// Returns an absolute URL to an image based on a partial URL 
         /// contained in a design template.
         /// </summary>
         /// <param name="img">Relative URL to image.</param>
+        /// <param name="args"></param>
         /// <returns></returns>
         public virtual Control ImageUrl(string img, params string[] args)
         {
-            return new LiteralControl(new Uri(new Uri(SiteUtilities.GetBaseUrl(requestPage.SiteConfig)), requestPage.BlogTheme.ImageDirectory).ToString() + "/" + img);
+            return
+                new LiteralControl(
+                    new Uri(new Uri(SiteUtilities.GetBaseUrl(requestPage.SiteConfig)),
+                            requestPage.BlogTheme.ImageDirectory) + "/" + img);
         }
 
+        // TODO: Documentation for args
         /// <summary>
         /// Returns an absolute URL to an image based on a partial URL 
         /// relative to the Radio system path. 
         /// </summary>
         /// <param name="img">Relative URL to image.</param>
+        /// <param name="args"></param>
         /// <returns></returns>
         /// <remarks>
         /// Renders one &lt;img&gt; tag with CSS class "simpleImageStyle"
@@ -250,7 +265,9 @@
         {
             Image imgCtl = new Image();
             imgCtl.CssClass = "simpleImageStyle";
-            imgCtl.ImageUrl = new Uri(new Uri(SiteUtilities.GetBaseUrl(requestPage.SiteConfig)), requestPage.BlogTheme.ImageDirectory).ToString() + "/" + img;
+            imgCtl.ImageUrl =
+                new Uri(new Uri(SiteUtilities.GetBaseUrl(requestPage.SiteConfig)), requestPage.BlogTheme.ImageDirectory) +
+                "/" + img;
             return imgCtl;
         }
 
@@ -336,7 +353,7 @@
             // will handle what is visible for the type of role.
             if ((!requestPage.HideAdminTools) && SiteSecurity.IsValidContributor())
             {
-                return this.requestPage.LoadControl("AdminNavBar.ascx");
+                return requestPage.LoadControl("AdminNavBar.ascx");
             }
             else
             {
@@ -378,9 +395,10 @@
             HyperLink xmlLink = new HyperLink();
             xmlLink.CssClass = "mailToStyle";
 
-            string messageSubject = (requestPage.TitleOverride != null && requestPage.TitleOverride.Length > 0) ? requestPage.SiteConfig.Title + " - " + requestPage.TitleOverride : requestPage.SiteConfig.Title;
+            string messageSubject = (requestPage.TitleOverride != null && requestPage.TitleOverride.Length > 0)
+                                        ? requestPage.SiteConfig.Title + " - " + requestPage.TitleOverride
+                                        : requestPage.SiteConfig.Title;
             messageSubject = messageSubject.Replace("'", @"\'");
-
             string emailAddress = requestPage.SiteConfig.Contact;
 
             if (requestPage.SiteConfig.ObfuscateEmail)
@@ -389,7 +407,8 @@
             }
             else
             {
-                xmlLink.NavigateUrl = String.Format("mailto:{0}?Subject={1}", requestPage.SiteConfig.Contact, messageSubject);
+                xmlLink.NavigateUrl =
+                    String.Format("mailto:{0}?Subject={1}", requestPage.SiteConfig.Contact, messageSubject);
             }
 
             Image img = new Image();
@@ -400,9 +419,6 @@
             return xmlLink;
         }
 
-
-
-
         /// <summary>
         /// Renders the time of the last site update, expressed in GMT
         /// </summary>
@@ -412,7 +428,10 @@
         {
             if (requestPage.SiteConfig.AdjustDisplayTimeZone)
             {
-                return new LiteralControl(requestPage.SiteConfig.GetConfiguredTimeZone().FormatAdjustedUniversalTime(requestPage.DataService.GetLastEntryUpdate()));
+                return
+                    new LiteralControl(
+                        requestPage.SiteConfig.GetConfiguredTimeZone().FormatAdjustedUniversalTime(
+                            requestPage.DataService.GetLastEntryUpdate()));
             }
             else
             {
@@ -546,24 +565,24 @@
             weblogMacros = InitWeblogMacros();
         }
 
-        public virtual RadioMacros InitRadioMacros()
+        public RadioMacros macros
         {
-            return MacrosFactory.CreateRadioMacrosInstance(requestPage);
+            get { return radioMacros; }
         }
 
-        public virtual WeblogMacros InitWeblogMacros()
+        public WeblogMacros weblog
         {
-            return MacrosFactory.CreateWeblogMacrosInstance(requestPage);
+            get { return weblogMacros; }
         }
 
-        public RadioMacros macros
+        public virtual RadioMacros InitRadioMacros()
         {
-            get { return radioMacros; }
+            return MacrosFactory.CreateRadioMacrosInstance(requestPage);
         }
 
-        public WeblogMacros weblog
+        public virtual WeblogMacros InitWeblogMacros()
         {
-            get { return weblogMacros; }
+            return MacrosFactory.CreateWeblogMacrosInstance(requestPage);
         }
     }
 
@@ -629,8 +648,6 @@
         }
 
 
-
-
         public virtual Control DrawCategoriesWithoutFeed()
         {
             return InternalDrawCategories(false);
@@ -677,9 +694,7 @@
         {
             if (!requestPage.HideAdminTools && SiteSecurity.IsValidContributor())
             {
-
-
-                return this.requestPage.LoadControl("AdminNavBar.ascx");
+                return requestPage.LoadControl("AdminNavBar.ascx");
             }
             else
             {
@@ -695,7 +710,7 @@
             }
 
             string fullpath = SiteUtilities.MapPath(disclaimerPath);
-            string value = "";
+            string value;
             using (StreamReader reader = new StreamReader(fullpath))
             {
                 value = reader.ReadToEnd();
@@ -705,35 +720,13 @@
 
         public virtual Control LoginBox()
         {
-            // OmarS: we no longer allow the LoginBox on the main page for a number of reasons
-            /*
-            if (!requestPage.HideAdminTools && !requestPage.Request.IsAuthenticated && !requestPage.Request.Path.EndsWith("login.aspx"))
+            if (!requestPage.HideAdminTools && requestPage.Request.IsAuthenticated &&
+                !requestPage.Request.Path.ToLower().EndsWith("login.aspx"))
             {
-                return this.requestPage.LoadControl("SignIn.ascx");
+                return requestPage.LoadControl("Logout.ascx");
             }
-            else if (!requestPage.HideAdminTools && requestPage.Request.IsAuthenticated)
-            {
-                return this.requestPage.LoadControl("Logout.ascx");
-            }
-            else if (requestPage.HideAdminTools)
-            {
-                HyperLink hl = new HyperLink();
-                hl.Text = requestPage.CoreStringTables.GetString("text_log_on");
-                hl.NavigateUrl = "Login.aspx";
-                return hl;
-            }
             else
             {
-                return new LiteralControl("");
-            }
-            */
-
-            if (!requestPage.HideAdminTools && requestPage.Request.IsAuthenticated && !requestPage.Request.Path.ToLower().EndsWith("login.aspx"))
-            {
-                return this.requestPage.LoadControl("Logout.ascx");
-            }
-            else
-            {
                 HyperLink hl = new HyperLink();
                 hl.Text = requestPage.CoreStringTables.GetString("text_log_on");
                 hl.NavigateUrl = "Login.aspx";
@@ -745,7 +738,7 @@
         {
             if (!requestPage.HideAdminTools && requestPage.Request.IsAuthenticated)
             {
-                return this.requestPage.LoadControl("Logout.ascx");
+                return requestPage.LoadControl("Logout.ascx");
             }
             else
             {
@@ -755,7 +748,7 @@
 
         public virtual Control Search()
         {
-            return this.requestPage.LoadControl("Search.ascx");
+            return requestPage.LoadControl("Search.ascx");
         }
 
         /// <summary>
@@ -767,7 +760,7 @@
         {
             if (!requestPage.HideAdminTools && requestPage.Request.IsAuthenticated && SiteSecurity.IsInRole("admin"))
             {
-                return this.requestPage.LoadControl(controlName);
+                return requestPage.LoadControl(controlName);
             }
             else
             {
@@ -784,7 +777,7 @@
         {
             if (!requestPage.HideAdminTools && requestPage.Request.IsAuthenticated)
             {
-                return this.requestPage.LoadControl(controlName);
+                return requestPage.LoadControl(controlName);
             }
             else
             {
@@ -794,7 +787,7 @@
 
         public virtual Control ASPNETControl(string controlName)
         {
-            return this.requestPage.LoadControl(controlName);
+            return requestPage.LoadControl(controlName);
         }
     }
 
@@ -803,8 +796,11 @@
     /// </summary>
     public class Macros
     {
+        private static object blogStatsLock = new object();
+        private static object blogTopPostersLock = new object();
+        private static object popularListLock = new object();
+        protected NewtelligenceProperties _newtelligence;
         protected RadioProperties _radio;
-        protected NewtelligenceProperties _newtelligence;
         protected SharedBasePage requestPage;
 
         public Macros(SharedBasePage page)
@@ -814,96 +810,6 @@
             _newtelligence = MacrosFactory.CreateNewtelligencePropertiesInstance(page);
         }
 
-        public virtual RadioProperties InitRadioProperties()
-        {
-            return MacrosFactory.CreateRadioPropertiesInstance(requestPage);
-        }
-
-        public virtual Control StyleSheet(string styleSheetName, string media)
-        {
-            PlaceHolder placeHolder = new PlaceHolder();
-            HtmlGenericControl linkTag = new HtmlGenericControl("link");
-            linkTag.Attributes.Add("media", media);
-            linkTag.Attributes.Add("rel", "stylesheet");
-            linkTag.Attributes.Add("type", "text/css");
-            string url = new Uri(new Uri(SiteUtilities.GetBaseUrl(requestPage.SiteConfig)), requestPage.BlogTheme.TemplateDirectory).ToString() + "/" + styleSheetName;
-            linkTag.Attributes.Add("href", url);
-            placeHolder.Controls.Add(linkTag);
-            return placeHolder;
-        }
-
-        public virtual Control StyleSheet(string styleSheetName)
-        {
-            return StyleSheet(styleSheetName, "all");
-        }
-
-        public virtual Control BaseUrl()
-        {
-            return new LiteralControl(SiteUtilities.GetBaseUrl());
-        }
-
-        public virtual Control DrawPostPagingNext()
-        {
-            if (requestPage.IsAggregatedView &&
-                requestPage.CategoryName.Equals("Frontpage") &&
-                requestPage.TitleOverride == null && // != null if category, date, month, title or guid query strings have been passed.
-                requestPage.Request.QueryString["q"] == null && // Don't display paging for SearchView.aspx.
-                requestPage.WeblogEntries.Count > 0 &&
-                requestPage.PageIndex > 0)
-            {
-                HyperLink lnkNext = new HyperLink();
-
-                if (requestPage.PageIndex > 1)
-                {
-                    lnkNext.NavigateUrl = SiteUtilities.GetPagedViewUrl(requestPage.PageIndex - 1);
-                }
-                else if (requestPage.PageIndex == 1)
-                {
-                    lnkNext.NavigateUrl = SiteUtilities.GetStartPageUrl();
-                }
-
-                LiteralControl litNext = new LiteralControl(requestPage.CoreStringTables.GetString("text_next_posts"));
-
-                HtmlGenericControl spanNextSign = new HtmlGenericControl("span");
-                spanNextSign.InnerHtml = "&raquo;";
-
-                // Build control hierarchy.
-                lnkNext.Controls.Add(litNext);
-                lnkNext.Controls.Add(spanNextSign);
-
-                return lnkNext;
-            }
-
-            return new LiteralControl(String.Empty);
-        }
-
-        public virtual Control DrawPostPagingPrevious()
-        {
-            if (!requestPage.IsLastPage &&
-                requestPage.IsAggregatedView &&
-                requestPage.CategoryName.Equals("Frontpage") &&
-                requestPage.TitleOverride == null && // != null if category, date, month, title or guid query strings have been passed.
-                requestPage.Request.QueryString["q"] == null && // Don't display paging for SearchView.aspx.
-                requestPage.WeblogEntries.Count > 0)
-            {
-                HyperLink lnkPrevious = new HyperLink();
-                lnkPrevious.NavigateUrl = SiteUtilities.GetPagedViewUrl(requestPage.PageIndex + 1);
-
-                LiteralControl litPrevious = new LiteralControl(requestPage.CoreStringTables.GetString("text_previous_posts"));
-
-                HtmlGenericControl spanPreviousSign = new HtmlGenericControl("span");
-                spanPreviousSign.InnerHtml = "&laquo;";
-
-                // Build control hierarchy.
-                lnkPrevious.Controls.Add(spanPreviousSign);
-                lnkPrevious.Controls.Add(litPrevious);
-
-                return lnkPrevious;
-            }
-
-            return new LiteralControl(String.Empty);
-        }
-
         /// <summary>
         /// Weblog 'Title' as defined through the tag &lt;Title&gt;
         /// in the configuration file of the Web application.
@@ -963,6 +869,7 @@
             {
                 HyperLink xmlLink = new HyperLink();
                 xmlLink.CssClass = "rssLinkStyle";
+
                 if (requestPage.SiteConfig.UseFeedSchemeForSyndication)
                 {
                     xmlLink.NavigateUrl = SiteUtilities.GetFeedUrl();
@@ -971,6 +878,7 @@
                 {
                     xmlLink.NavigateUrl = SiteUtilities.GetRssUrl();
                 }
+
                 Image img = new Image();
                 img.ImageUrl = requestPage.GetThemedImageUrl("feed-icon-16x16");
                 img.CssClass = "rssLinkImageStyle";
@@ -981,56 +889,6 @@
         }
 
         /// <summary>
-        /// Hyperlink to the main RSS feed.
-        /// Corresponds to the macro: &lt;%rssLinkUrl(linktext,tooltip)%&gt;
-        /// </summary>
-        /// <param name="text">Provide a text you want as the link text, e.g. "XML". Default will be "RSS".</param>
-        /// <param name="titleText">link title text (tooltip)</param>
-        /// <remarks>The output is HTML hyperlinked HTML. Default link text is "RSS".</remarks>
-        public virtual Control RssLinkUrl(string text, string titleText)
-        {
-            HyperLink xmlLink = new HyperLink();
-            xmlLink.ID = "rssLinkUrl";
-            xmlLink.CssClass = "rssLinkStyle";
-            xmlLink.NavigateUrl = SiteUtilities.GetRssUrl();
-            xmlLink.Text = (text == null || text.Length == 0 ? "RSS" : text);
-            xmlLink.ToolTip = (titleText == null || titleText.Length == 0 ? "RSS 2.0" : titleText);
-            return xmlLink;
-        }
-
-        /// <summary>
-        /// Provides just the RSS feed url that can be used in HTML code from inside the template.
-        /// </summary>
-        /// <returns>Outputs a literal control with the URL for the RSS feed.</returns>
-        public virtual Control RssUrl()
-        {
-            LiteralControl rssUrl = new LiteralControl();
-            rssUrl.Text = SiteUtilities.GetRssUrl();
-            return rssUrl;
-        }
-
-        /// <summary>
-        /// Hyperlink to the main RSS feed.
-        /// Corresponds to the macro: &lt;%rssLinkUrl()%&gt;
-        /// </summary>
-        /// <remarks>The output is HTML hyperlinked HTML. Default link text is "RSS".</remarks>
-        public virtual Control RssLinkUrl()
-        {
-            return this.RssLinkUrl(null, null);
-        }
-
-        /// <summary>
-        /// Hyperlink to the main RSS feed.
-        /// Corresponds to the macro: &lt;%rssLinkUrl(linktext)%&gt;
-        /// </summary>
-        /// <param name="text">Provide a text you want as the link text, e.g. "XML". Default will be "RSS".</param>
-        /// <remarks>The output is HTML hyperlinked HTML. Default link text is "RSS".</remarks>
-        public virtual Control RssLinkUrl(string text)
-        {
-            return this.RssLinkUrl(text, null);
-        }
-
-        /// <summary>
         /// Hyperlink to the main RSS feed, but with protocol scheme "feed".
         /// Corresponds to the macro: &lt;%feedLink%&gt;
         /// </summary>
@@ -1041,12 +899,14 @@
             {
                 HyperLink xmlLink = new HyperLink();
                 xmlLink.CssClass = "feedLinkStyle";
+
                 if (requestPage.SiteConfig.UseFeedSchemeForSyndication)
                 {
                     xmlLink.NavigateUrl = SiteUtilities.GetFeedUrl();
                 }
                 else
                 {
+                    
                     xmlLink.NavigateUrl = SiteUtilities.GetRssUrl();
                 }
                 Image img = new Image();
@@ -1054,50 +914,12 @@
                 img.CssClass = "feedLinkImageStyle";
                 img.ToolTip = img.AlternateText = "Feed your aggregator (RSS 2.0)";
                 xmlLink.Controls.Add(img);
+
                 return xmlLink;
             }
         }
 
         /// <summary>
-        /// Hyperlink to the main RSS feed, but with protocol scheme "feed".
-        /// Corresponds to the macro: &lt;%feedLinkUrl(linktext,tooltip)%&gt;
-        /// </summary>
-        /// <param name="text">Provide a text you want as the link text</param>
-        /// <param name="titleText">link title text (tooltip)</param>
-        /// <remarks>The output is HTML hyperlinked HTML.</remarks>
-        public virtual Control FeedLinkUrl(string text, string titleText)
-        {
-            HyperLink xmlLink = new HyperLink();
-            xmlLink.ID = "feedLinkUrl";
-            xmlLink.CssClass = "feedLinkStyle";
-            xmlLink.NavigateUrl = SiteUtilities.GetFeedUrl();
-            xmlLink.Text = (text == null || text.Length == 0 ? "FEED" : text);
-            xmlLink.ToolTip = (titleText == null || titleText.Length == 0 ? "Feed your aggregator (RSS 2.0)" : titleText);
-            return xmlLink;
-        }
-
-        /// <summary>
-        /// Hyperlink to the main RSS feed, but with protocol scheme "feed".
-        /// Corresponds to the macro: &lt;%feedLinkUrl()%&gt;
-        /// </summary>
-        /// <remarks>The output is HTML hyperlinked HTML.</remarks>
-        public virtual Control FeedLinkUrl()
-        {
-            return this.FeedLinkUrl(null, null);
-        }
-
-        /// <summary>
-        /// Hyperlink to the main RSS feed, but with protocol scheme "feed".
-        /// Corresponds to the macro: &lt;%feedLinkUrl(linktext)%&gt;
-        /// </summary>
-        /// <param name="text">Provide a text you want as the link text</param>
-        /// <remarks>The output is HTML hyperlinked HTML.</remarks>
-        public virtual Control FeedLinkUrl(string text)
-        {
-            return this.FeedLinkUrl(text, null);
-        }
-
-        /// <summary>
         /// Hyperlink to the (Atom) feed.
         /// Corresponds to the macro: &lt;%atomLink%&gt;
         /// </summary>
@@ -1115,62 +937,12 @@
                 img.CssClass = "rssLinkImageStyle";
                 img.ToolTip = img.AlternateText = "Atom 1.0";
                 xmlLink.Controls.Add(img);
+
                 return xmlLink;
             }
         }
 
         /// <summary>
-        /// Hyperlink to the main (Atom) feed.
-        /// Corresponds to the macro: &lt;%atomLinkUrl(linktext,tooltip)%&gt;
-        /// </summary>
-        /// <param name="text">Provide a text you want as the link text. Default will be "ATOM".</param>
-        /// <param name="titleText">link title text (tooltip)</param>
-        /// <remarks>The output is HTML hyperlinked HTML. Default link text is "ATOM".</remarks>
-        public virtual Control AtomLinkUrl(string text, string titleText)
-        {
-            HyperLink xmlLink = new HyperLink();
-            xmlLink.ID = "atomLinkUrl";
-            xmlLink.CssClass = "atomLinkStyle";
-            xmlLink.NavigateUrl = SiteUtilities.GetAtomUrl();
-            xmlLink.Text = (text == null || text.Length == 0 ? "ATOM" : text);
-            xmlLink.ToolTip = (titleText == null || titleText.Length == 0 ? "Atom 1.0" : titleText);
-            return xmlLink;
-        }
-
-        /// <summary>
-        /// Hyperlink to the main (Atom) feed.
-        /// Corresponds to the macro: &lt;%atomLinkUrl()%&gt;
-        /// </summary>
-        /// <remarks>The output is HTML hyperlinked HTML. Default link text is "ATOM".</remarks>
-        public virtual Control AtomLinkUrl()
-        {
-            return this.AtomLinkUrl(null, null);
-        }
-
-        /// <summary>
-        /// Hyperlink to the main (Atom) feed.
-        /// Corresponds to the macro: &lt;%atomLinkUrl(linktext)%&gt;
-        /// </summary>
-        /// <param name="text">Provide a text you want as the link text. Default will be "ATOM".</param>
-        /// <remarks>The output is HTML hyperlinked HTML. Default link text is "ATOM".</remarks>
-        public virtual Control AtomLinkUrl(string text)
-        {
-            return this.AtomLinkUrl(text, null);
-        }
-
-        /// <summary>
-        /// Returns just the URL for the ATOM feed for the current blog.
-        /// </summary>
-        /// <returns>The output is just the literal URL for the ATOM feed</returns>
-        public virtual Control AtomUrl()
-        {
-            LiteralControl atomUrl = new LiteralControl();
-            atomUrl.Text = SiteUtilities.GetAtomUrl();
-
-            return atomUrl;
-        }
-
-        /// <summary>
         /// Hyperlink to the main RSS feed.
         /// Corresponds to the macro: &lt;%cdfLink%&gt;
         /// </summary>
@@ -1221,11 +993,13 @@
             get
             {
                 DateTime dt = DateTime.Now.ToUniversalTime();
+
                 if (requestPage.SiteConfig.AdjustDisplayTimeZone)
                 {
                     WindowsTimeZone tz = requestPage.SiteConfig.GetConfiguredTimeZone();
                     dt = tz.ToLocalTime(dt);
                 }
+
                 return new LiteralControl(dt.Month.ToString());
             }
         }
@@ -1240,11 +1014,13 @@
             get
             {
                 DateTime dt = DateTime.Now.ToUniversalTime();
+
                 if (requestPage.SiteConfig.AdjustDisplayTimeZone)
                 {
                     WindowsTimeZone tz = requestPage.SiteConfig.GetConfiguredTimeZone();
                     dt = tz.ToLocalTime(dt);
                 }
+
                 return new LiteralControl(dt.Day.ToString());
             }
         }
@@ -1259,11 +1035,13 @@
             get
             {
                 DateTime dt = DateTime.Now.ToUniversalTime();
+
                 if (requestPage.SiteConfig.AdjustDisplayTimeZone)
                 {
                     WindowsTimeZone tz = requestPage.SiteConfig.GetConfiguredTimeZone();
                     dt = tz.ToLocalTime(dt);
                 }
+
                 return new LiteralControl(dt.ToString("d"));
             }
         }
@@ -1279,7 +1057,10 @@
             {
                 if (requestPage.SiteConfig.AdjustDisplayTimeZone)
                 {
-                    return new LiteralControl(requestPage.SiteConfig.GetConfiguredTimeZone().FormatAdjustedUniversalTime(DateTime.Now.ToUniversalTime()));
+                    return
+                        new LiteralControl(
+                            requestPage.SiteConfig.GetConfiguredTimeZone().FormatAdjustedUniversalTime(
+                                DateTime.Now.ToUniversalTime()));
                 }
                 else
                 {
@@ -1298,11 +1079,13 @@
             get
             {
                 DateTime dt = DateTime.Now.ToUniversalTime();
+
                 if (requestPage.SiteConfig.AdjustDisplayTimeZone)
                 {
                     WindowsTimeZone tz = requestPage.SiteConfig.GetConfiguredTimeZone();
                     dt = tz.ToLocalTime(dt);
                 }
+
                 return new LiteralControl(dt.ToString("T"));
             }
         }
@@ -1324,16 +1107,12 @@
         /// in the configuration file of the Web application.
         /// Corresponds to the macro: &lt;%hCardAuthorName%&gt;
         /// </summary>
+        /// <example>&lt;%span class="vcard"&gt&lt;%a class="url fn" href="http://localhost/dasblog"&gtCopyright owner&lt;%/a&gt&lt;%/span&gt</example>
         /// <remarks>See http://microformats.org/wiki/hcard</remarks>
         public virtual Control hCardAuthor
         {
             get
             {
-                // <span class="vcard">
-                //		<a class="url fn" href="http://localhost/dasblog">Copyright owner</a>
-
-                // </span>
-
                 HtmlGenericControl div = new HtmlGenericControl("span");
                 div.Attributes.Add("class", "vcard");
 
@@ -1349,49 +1128,6 @@
         }
 
         /// <summary>
-        /// Control for paging in the category view. 
-        /// Draws previous link, x of y page and next link; where appropiate.
-        /// </summary>
-        /// <returns></returns>
-        public virtual Control DrawCategoryPaging()
-        {
-            if (this.requestPage.CategoryName != String.Empty && SiteConfig.GetSiteConfig().CategoryAllEntries == false)
-            {
-                if (HttpContext.Current.Items.Contains("page") == true && HttpContext.Current.Items.Contains("maxpage") == true)
-                {
-                    HtmlGenericControl div = new HtmlGenericControl("span");
-                    div.Attributes.Add("class", "categoryPaging");
-
-                    int page = (int)HttpContext.Current.Items["page"];
-                    int maxpage = (int)HttpContext.Current.Items["maxpage"];
-
-                    if (page != 1)
-                    {
-                        HtmlAnchor previous = new HtmlAnchor();
-                        previous.HRef = SiteUtilities.GetCategoryViewUrl(this.requestPage.CategoryName, page - 1);
-                        previous.InnerText = requestPage.CoreStringTables.GetString("text_category_previouspage");
-                        div.Controls.Add(previous);
-                        div.Controls.Add(new LiteralControl(" "));
-                    }
-
-                    string pagexofy = requestPage.CoreStringTables.GetString("text_category_pagexofy");
-                    div.Controls.Add(new LiteralControl(String.Format(pagexofy, page, maxpage, requestPage.CategoryName)));
-
-                    if (page != maxpage)
-                    {
-                        div.Controls.Add(new LiteralControl(" "));
-                        HtmlAnchor next = new HtmlAnchor();
-                        next.HRef = SiteUtilities.GetCategoryViewUrl(this.requestPage.CategoryName, page + 1);
-                        next.InnerText = requestPage.CoreStringTables.GetString("text_category_nextpage");
-                        div.Controls.Add(next);
-                    }
-                    return div;
-                }
-            }
-            return new LiteralControl(String.Empty);
-        }
-
-        /// <summary>
         /// Placeholder for rendering page content
         /// Corresponds to the macro: &lt;%bodytext%&gt;
         /// </summary>
@@ -1401,6 +1137,7 @@
             get
             {
                 IPageFormatInfo formatInfo = requestPage as IPageFormatInfo;
+
                 if (formatInfo != null)
                 {
                     return formatInfo.Bodytext;
@@ -1408,8 +1145,8 @@
                 else
                 {
                     PlaceHolder bodyPlaceHolder = new PlaceHolder();
+                    EntryCollection entries = requestPage.WeblogEntries;
 
-                    EntryCollection entries = requestPage.WeblogEntries;
                     if (entries != null)
                     {
                         ArrayList al = new ArrayList();
@@ -1429,17 +1166,507 @@
                                 al.Add(currentDay);
                             }
                         }
+
                         al.Sort();
+
                         for (int i = al.Count - 1; i >= 0; i--)
                         {
-                            requestPage.ProcessDayTemplate((DateTime)al[i], bodyPlaceHolder);
+                            requestPage.ProcessDayTemplate((DateTime) al[i], bodyPlaceHolder);
                         }
                     }
+
                     return bodyPlaceHolder;
                 }
             }
         }
 
+        /// <summary>
+        /// List of entry titles that appear on the current front page.
+        /// Corresponds to the macro: &lt;%frontPageTitleList%&gt;
+        /// </summary>
+        /// <remarks>The output is HTML. Uses the same CSS classes as TitleList.</remarks>
+        public virtual Control FrontPageTitleList
+        {
+            get
+            {
+                Table list = new Table();
+                list.BorderWidth = Unit.Pixel(0);
+                list.CellPadding = 0;
+                list.CellSpacing = 0;
+                list.CssClass = "titleListStyle";
+
+                foreach (Entry entry in requestPage.GetFrontPageEntries())
+                {
+                    if (entry.CreatedUtc <= DateTime.UtcNow)
+                    {
+                        if (entry.Title != null & entry.Title.Length > 0)
+                        {
+                            TableRow row = new TableRow();
+                            TableCell cell = new TableCell();
+                            //cell.CssClass = "titleListCellStyle";
+                            //cell.HorizontalAlign = HorizontalAlign.Center;
+                            list.Rows.Add(row);
+                            row.Cells.Add(cell);
+
+                            HyperLink titleLink = new HyperLink();
+                            //titleLink.CssClass = "titleListLinkStyle";
+                            titleLink.Text = entry.Title;
+                            titleLink.NavigateUrl = SiteUtilities.GetStartPageUrl(requestPage.SiteConfig) + "#a" +
+                                                    entry.EntryId;
+                            cell.Controls.Add(titleLink);
+                        }
+                    }
+                }
+                return list;
+            }
+        }
+
+        /// <summary>
+        /// This is similar to <see>FrontPageTitleList</see>, with two key differences:
+        /// 1) This is rendered as a unordered list, rather than a table - for all those who prefer to use 
+        /// CSS-based layouts for flexibility (don't you?).
+        /// 2) The links do not point to the front page anchor entries - instead, they link to the permalinked
+        /// single entry.
+        /// Corresponds to the macro: &lt;%RecentEntries%&gt;
+        /// </summary>
+        public virtual Control RecentEntries
+        {
+            get
+            {
+                // We're doing this the brute force way given the lack of a corresponding HTML
+                // control.
+                StringBuilder sb = new StringBuilder();
+                sb.Append("<ul class='titleListStyle'>");
+
+                foreach (Entry entry in requestPage.GetFrontPageEntries())
+                {
+                    if (entry.CreatedUtc <= DateTime.UtcNow)
+                    {
+                        if (entry.Title != null & entry.Title.Length > 0)
+                        {
+                            sb.Append("<li>");
+                            sb.AppendFormat("<a class='titleListLinkStyle' href='{0}'>{1}</a>",
+                                            SiteUtilities.GetPermaLinkUrl(entry),
+                                            entry.Title);
+                            sb.Append("</li>");
+                        }
+                    }
+                }
+
+                sb.Append("</ul>");
+
+                return new LiteralControl(sb.ToString());
+            }
+        }
+
+        /// <summary>
+        /// Behaves as RecentEntries does, only it formats as a table (for those who prefer not to futz with CSS).
+        /// Possibly redundant given that RecentEntries is a better method for rendering?
+        /// Corresponds to the macro: &lt;%RecentEntriesAsTable%&gt;
+        /// </summary>
+        public virtual Control RecentEntriesAsTable
+        {
+            get
+            {
+                Table list = new Table();
+                list.BorderWidth = Unit.Pixel(0);
+                list.CellPadding = 0;
+                list.CellSpacing = 0;
+                list.CssClass = "titleListStyle";
+
+                foreach (Entry entry in requestPage.GetFrontPageEntries())
+                {
+                    if (entry.CreatedUtc <= DateTime.UtcNow)
+                    {
+                        if (entry.Title != null & entry.Title.Length > 0)
+                        {
+                            TableRow row = new TableRow();
+                            TableCell cell = new TableCell();
+                            cell.CssClass = "titleListCellStyle";
+                            list.Rows.Add(row);
+                            row.Cells.Add(cell);
+
+                            HyperLink titleLink = new HyperLink();
+                            titleLink.CssClass = "titleListLinkStyle";
+                            titleLink.Text = entry.Title;
+                            if (entry.Link != null)
+                            {
+                                titleLink.NavigateUrl = entry.Link;
+                            }
+                            else
+                            {
+                                titleLink.NavigateUrl = SiteUtilities.GetPermaLinkUrl(entry);
+                            }
+                            cell.Controls.Add(titleLink);
+                        }
+                    }
+                }
+
+                return list;
+            }
+        }
+
+        /// <summary>
+        /// Weblog 'Title' as defined through the tag &lt;Title&gt;
+        /// in the configuration file of the Web application.
+        /// Corresponds to the macro: &lt;%title%&gt;
+        /// Not the same as <see cref="Macros.Title"/>.
+        /// <seealso cref="Macros.Title"/> which is the web page
+        /// title as rendered in the title html tag.
+        /// </summary>
+        /// <remarks>The output is plain text.</remarks>
+        public virtual Control SiteName
+        {
+            get { return new LiteralControl(requestPage.SiteConfig.Title); }
+        }
+
+        /// <summary>
+        /// Provides a Hyperlink with the sitename and link
+        /// to the root homepage as defined in SiteConfig.
+        /// Corresponds to the macro: &lt;%siteNameLink%&gt;
+        /// </summary>
+        /// <remarks>The output is a hyperlink.</remarks>
+        public virtual Control SiteNameLink
+        {
+            get
+            {
+                return
+                    new LiteralControl(
+                        String.Format("<a href=\"{0}\">{1}</a>", SiteUtilities.GetStartPageUrl(requestPage.SiteConfig),
+                                      requestPage.SiteConfig.Title));
+            }
+        }
+
+        /// <summary>
+        /// Site description as defined through the tag &lt;Description&gt;
+        /// in the configuration file of the Web application.
+        /// Corresponds to the macro: &lt;%description%&gt;
+        /// </summary>
+        /// <remarks>The output is plain text.</remarks>
+        public virtual Control Description
+        {
+            get { return new LiteralControl(requestPage.SiteConfig.Description); }
+        }
+
+        /// <summary>
+        /// Renders a list of user-definable hyperlinks.
+        /// Corresponds to the macro: &lt;%navigatorLinks%&gt;
+        /// </summary>
+        /// <remarks>
+        /// The output is HTML.
+        /// <P/>
+        /// List can be edited in the configuration file 'navigatorLinks.xml'.
+        /// </remarks>
+        public virtual Control NavigatorLinks
+        {
+            get { return new SideBarList(false); }
+        }
+
+        /// <summary>
+        /// Renders a list of user-definable hyperlinks.
+        /// Corresponds to the macro: &lt;%navigatorLinksList%&gt;
+        /// </summary>
+        /// <remarks>
+        /// The output is HTML.
+        /// <P/>
+        /// List can be edited in the configuration file 'navigatorLinks.xml'.
+        /// </remarks>
+        public virtual Control NavigatorLinksList
+        {
+            get { return new SideBarList(true); }
+        }
+
+        public virtual RadioProperties Radio
+        {
+            get { return _radio; }
+        }
+
+        public virtual NewtelligenceProperties Newtelligence
+        {
+            get { return _newtelligence; }
+        }
+
+        public virtual RadioProperties InitRadioProperties()
+        {
+            return MacrosFactory.CreateRadioPropertiesInstance(requestPage);
+        }
+
+        public virtual Control StyleSheet(string styleSheetName, string media)
+        {
+            PlaceHolder placeHolder = new PlaceHolder();
+            HtmlGenericControl linkTag = new HtmlGenericControl("link");
+            linkTag.Attributes.Add("media", media);
+            linkTag.Attributes.Add("rel", "stylesheet");
+            linkTag.Attributes.Add("type", "text/css");
+            string url =
+                new Uri(new Uri(SiteUtilities.GetBaseUrl(requestPage.SiteConfig)),
+                        requestPage.BlogTheme.TemplateDirectory) + "/" + styleSheetName;
+            linkTag.Attributes.Add("href", url);
+            placeHolder.Controls.Add(linkTag);
+            return placeHolder;
+        }
+
+        public virtual Control StyleSheet(string styleSheetName)
+        {
+            return StyleSheet(styleSheetName, "all");
+        }
+
+        public virtual Control BaseUrl()
+        {
+            return new LiteralControl(SiteUtilities.GetBaseUrl());
+        }
+
+        public virtual Control DrawPostPagingNext()
+        {
+            if (requestPage.IsAggregatedView &&
+                requestPage.CategoryName.Equals("Frontpage") &&
+                requestPage.TitleOverride == null &&
+                // != null if category, date, month, title or guid query strings have been passed.
+                requestPage.Request.QueryString["q"] == null && // Don't display paging for SearchView.aspx.
+                requestPage.WeblogEntries.Count > 0 &&
+                requestPage.PageIndex > 0)
+            {
+                HyperLink lnkNext = new HyperLink();
+
+                if (requestPage.PageIndex > 1)
+                {
+                    lnkNext.NavigateUrl = SiteUtilities.GetPagedViewUrl(requestPage.PageIndex - 1);
+                }
+                else if (requestPage.PageIndex == 1)
+                {
+                    lnkNext.NavigateUrl = SiteUtilities.GetStartPageUrl();
+                }
+
+                LiteralControl litNext = new LiteralControl(requestPage.CoreStringTables.GetString("text_next_posts"));
+                HtmlGenericControl spanNextSign = new HtmlGenericControl("span");
+                spanNextSign.InnerHtml = "&raquo;";
+
+                // Build control hierarchy.
+                lnkNext.Controls.Add(litNext);
+                lnkNext.Controls.Add(spanNextSign);
+
+                return lnkNext;
+            }
+
+            return new LiteralControl(String.Empty);
+        }
+
+        public virtual Control DrawPostPagingPrevious()
+        {
+            if (!requestPage.IsLastPage &&
+                requestPage.IsAggregatedView &&
+                requestPage.CategoryName.Equals("Frontpage") &&
+                requestPage.TitleOverride == null &&
+                // != null if category, date, month, title or guid query strings have been passed.
+                requestPage.Request.QueryString["q"] == null && // Don't display paging for SearchView.aspx.
+                requestPage.WeblogEntries.Count > 0)
+            {
+                HyperLink lnkPrevious = new HyperLink();
+                lnkPrevious.NavigateUrl = SiteUtilities.GetPagedViewUrl(requestPage.PageIndex + 1);
+
+                LiteralControl litPrevious =
+                    new LiteralControl(requestPage.CoreStringTables.GetString("text_previous_posts"));
+
+                HtmlGenericControl spanPreviousSign = new HtmlGenericControl("span");
+                spanPreviousSign.InnerHtml = "&laquo;";
+
+                // Build control hierarchy.
+                lnkPrevious.Controls.Add(spanPreviousSign);
+                lnkPrevious.Controls.Add(litPrevious);
+
+                return lnkPrevious;
+            }
+
+            return new LiteralControl(String.Empty);
+        }
+
+        /// <summary>
+        /// Hyperlink to the main RSS feed.
+        /// Corresponds to the macro: &lt;%rssLinkUrl(linktext,tooltip)%&gt;
+        /// </summary>
+        /// <param name="text">Provide a text you want as the link text, e.g. "XML". Default will be "RSS".</param>
+        /// <param name="titleText">link title text (tooltip)</param>
+        /// <remarks>The output is HTML hyperlinked HTML. Default link text is "RSS".</remarks>
+        public virtual Control RssLinkUrl(string text, string titleText)
+        {
+            HyperLink xmlLink = new HyperLink();
+            xmlLink.ID = "rssLinkUrl";
+            xmlLink.CssClass = "rssLinkStyle";
+            xmlLink.NavigateUrl = SiteUtilities.GetRssUrl();
+            xmlLink.Text = (text == null || text.Length == 0 ? "RSS" : text);
+            xmlLink.ToolTip = (titleText == null || titleText.Length == 0 ? "RSS 2.0" : titleText);
+            return xmlLink;
+        }
+
+        /// <summary>
+        /// Provides just the RSS feed url that can be used in HTML code from inside the template.
+        /// </summary>
+        /// <returns>Outputs a literal control with the URL for the RSS feed.</returns>
+        public virtual Control RssUrl()
+        {
+            LiteralControl rssUrl = new LiteralControl();
+            rssUrl.Text = SiteUtilities.GetRssUrl();
+            return rssUrl;
+        }
+
+        /// <summary>
+        /// Hyperlink to the main RSS feed.
+        /// Corresponds to the macro: &lt;%rssLinkUrl()%&gt;
+        /// </summary>
+        /// <remarks>The output is HTML hyperlinked HTML. Default link text is "RSS".</remarks>
+        public virtual Control RssLinkUrl()
+        {
+            return RssLinkUrl(null, null);
+        }
+
+        /// <summary>
+        /// Hyperlink to the main RSS feed.
+        /// Corresponds to the macro: &lt;%rssLinkUrl(linktext)%&gt;
+        /// </summary>
+        /// <param name="text">Provide a text you want as the link text, e.g. "XML". Default will be "RSS".</param>
+        /// <remarks>The output is HTML hyperlinked HTML. Default link text is "RSS".</remarks>
+        public virtual Control RssLinkUrl(string text)
+        {
+            return RssLinkUrl(text, null);
+        }
+
+        /// <summary>
+        /// Hyperlink to the main RSS feed, but with protocol scheme "feed".
+        /// Corresponds to the macro: &lt;%feedLinkUrl(linktext,tooltip)%&gt;
+        /// </summary>
+        /// <param name="text">Provide a text you want as the link text</param>
+        /// <param name="titleText">link title text (tooltip)</param>
+        /// <remarks>The output is HTML hyperlinked HTML.</remarks>
+        public virtual Control FeedLinkUrl(string text, string titleText)
+        {
+            HyperLink xmlLink = new HyperLink();
+            xmlLink.ID = "feedLinkUrl";
+            xmlLink.CssClass = "feedLinkStyle";
+            xmlLink.NavigateUrl = SiteUtilities.GetFeedUrl();
+            xmlLink.Text = (text == null || text.Length == 0 ? "FEED" : text);
+            xmlLink.ToolTip = (titleText == null || titleText.Length == 0 ? "Feed your aggregator (RSS 2.0)" : titleText);
+            return xmlLink;
+        }
+
+        /// <summary>
+        /// Hyperlink to the main RSS feed, but with protocol scheme "feed".
+        /// Corresponds to the macro: &lt;%feedLinkUrl()%&gt;
+        /// </summary>
+        /// <remarks>The output is HTML hyperlinked HTML.</remarks>
+        public virtual Control FeedLinkUrl()
+        {
+            return FeedLinkUrl(null, null);
+        }
+
+        /// <summary>
+        /// Hyperlink to the main RSS feed, but with protocol scheme "feed".
+        /// Corresponds to the macro: &lt;%feedLinkUrl(linktext)%&gt;
+        /// </summary>
+        /// <param name="text">Provide a text you want as the link text</param>
+        /// <remarks>The output is HTML hyperlinked HTML.</remarks>
+        public virtual Control FeedLinkUrl(string text)
+        {
+            return FeedLinkUrl(text, null);
+        }
+
+        /// <summary>
+        /// Hyperlink to the main (Atom) feed.
+        /// Corresponds to the macro: &lt;%atomLinkUrl(linktext,tooltip)%&gt;
+        /// </summary>
+        /// <param name="text">Provide a text you want as the link text. Default will be "ATOM".</param>
+        /// <param name="titleText">link title text (tooltip)</param>
+        /// <remarks>The output is HTML hyperlinked HTML. Default link text is "ATOM".</remarks>
+        public virtual Control AtomLinkUrl(string text, string titleText)
+        {
+            HyperLink xmlLink = new HyperLink();
+            xmlLink.ID = "atomLinkUrl";
+            xmlLink.CssClass = "atomLinkStyle";
+            xmlLink.NavigateUrl = SiteUtilities.GetAtomUrl();
+            xmlLink.Text = (text == null || text.Length == 0 ? "ATOM" : text);
+            xmlLink.ToolTip = (titleText == null || titleText.Length == 0 ? "Atom 1.0" : titleText);
+            return xmlLink;
+        }
+
+        /// <summary>
+        /// Hyperlink to the main (Atom) feed.
+        /// Corresponds to the macro: &lt;%atomLinkUrl()%&gt;
+        /// </summary>
+        /// <remarks>The output is HTML hyperlinked HTML. Default link text is "ATOM".</remarks>
+        public virtual Control AtomLinkUrl()
+        {
+            return AtomLinkUrl(null, null);
+        }
+
+        /// <summary>
+        /// Hyperlink to the main (Atom) feed.
+        /// Corresponds to the macro: &lt;%atomLinkUrl(linktext)%&gt;
+        /// </summary>
+        /// <param name="text">Provide a text you want as the link text. Default will be "ATOM".</param>
+        /// <remarks>The output is HTML hyperlinked HTML. Default link text is "ATOM".</remarks>
+        public virtual Control AtomLinkUrl(string text)
+        {
+            return AtomLinkUrl(text, null);
+        }
+
+        /// <summary>
+        /// Returns just the URL for the ATOM feed for the current blog.
+        /// </summary>
+        /// <returns>The output is just the literal URL for the ATOM feed</returns>
+        public virtual Control AtomUrl()
+        {
+            LiteralControl atomUrl = new LiteralControl();
+            atomUrl.Text = SiteUtilities.GetAtomUrl();
+
+            return atomUrl;
+        }
+
+        /// <summary>
+        /// Control for paging in the category view. 
+        /// Draws previous link, x of y page and next link; where appropiate.
+        /// </summary>
+        /// <returns></returns>
+        public virtual Control DrawCategoryPaging()
+        {
+            if (requestPage.CategoryName != String.Empty && SiteConfig.GetSiteConfig().CategoryAllEntries == false)
+            {
+                if (HttpContext.Current.Items.Contains("page") &&
+                    HttpContext.Current.Items.Contains("maxpage"))
+                {
+                    HtmlGenericControl div = new HtmlGenericControl("span");
+                    div.Attributes.Add("class", "categoryPaging");
+
+                    int page = (int) HttpContext.Current.Items["page"];
+                    int maxpage = (int) HttpContext.Current.Items["maxpage"];
+
+                    if (page != 1)
+                    {
+                        HtmlAnchor previous = new HtmlAnchor();
+                        previous.HRef = SiteUtilities.GetCategoryViewUrl(requestPage.CategoryName, page - 1);
+                        previous.InnerText = requestPage.CoreStringTables.GetString("text_category_previouspage");
+                        div.Controls.Add(previous);
+                        div.Controls.Add(new LiteralControl(" "));
+                    }
+
+                    string pagexofy = requestPage.CoreStringTables.GetString("text_category_pagexofy");
+                    div.Controls.Add(
+                        new LiteralControl(String.Format(pagexofy, page, maxpage, requestPage.CategoryName)));
+
+                    if (page != maxpage)
+                    {
+                        div.Controls.Add(new LiteralControl(" "));
+                        HtmlAnchor next = new HtmlAnchor();
+                        next.HRef = SiteUtilities.GetCategoryViewUrl(requestPage.CategoryName, page + 1);
+                        next.InnerText = requestPage.CoreStringTables.GetString("text_category_nextpage");
+                        div.Controls.Add(next);
+                    }
+
+                    return div;
+                }
+            }
+
+            return new LiteralControl(String.Empty);
+        }
+
         public virtual Control TitleList()
         {
             return TitleList(int.MaxValue);
@@ -1473,38 +1700,10 @@
                     cell.Controls.Add(titleLink);
                 }
             }
+
             return list;
         }
 
-        public class PopularSorter : IComparer<Entry>
-        {
-            #region IComparer Members
-
-            public int Compare(Entry left, Entry right)
-            {
-
-                if (left == null) return -1;
-                if (right == null) return 1;
-                if (left.IsPublic == false) return -1;
-                if (right.IsPublic == false) return 1;
-
-                SiteConfig siteConfig = SiteConfig.GetSiteConfig();
-                ILoggingDataService logService = LoggingDataServiceFactory.GetService(SiteConfig.GetLogPathFromCurrentContext());
-                IBlogDataService dataService = BlogDataServiceFactory.GetService(SiteConfig.GetContentPathFromCurrentContext(), logService);
-
-                TrackingCollection leftTrackings = dataService.GetTrackingsFor(left.EntryId);
-                TrackingCollection rightTrackings = dataService.GetTrackingsFor(right.EntryId);
-
-                CommentCollection leftComments = dataService.GetPublicCommentsFor(left.EntryId);
-                CommentCollection rightComments = dataService.GetPublicCommentsFor(right.EntryId);
-                int leftCount = leftTrackings.Count + leftComments.Count;
-                int rightCount = rightTrackings.Count + rightComments.Count;
-                return leftCount.CompareTo(rightCount);
-            }
-            #endregion
-        }
-
-        private static object popularListLock = new object();
         /// <summary>
         /// This macro is used like this: %lt;%popularList(10,20)%&gt; and will return a list of Popular entries, 
         /// where Popular entries have more "Trackings" than non-Popular ones. Trackings include referrals, pingbacks, trackbacks and comments.
@@ -1521,6 +1720,7 @@
             if (numEntries == 0) numEntries = 10;
 
             Table list = HttpRuntime.Cache["PopularEntriesTable"] as Table;
+
             if (list == null)
             {
                 lock (popularListLock)
@@ -1533,14 +1733,15 @@
                         IBlogDataService dataService = requestPage.DataService;
 
                         EntryCollection popularEntries = new EntryCollection();
-                        DateTime[] daysWithEntries = dataService.GetDaysWithEntries(newtelligence.DasBlog.Util.UTCTimeZone.CurrentTimeZone);
-                        CommentCollection comments = dataService.GetAllComments();
+                        DateTime[] daysWithEntries = dataService.GetDaysWithEntries(UTCTimeZone.CurrentTimeZone);
+
                         foreach (DateTime day in daysWithEntries)
                         {
-                            EntryCollection entries = dataService.GetEntriesForDay(day, newtelligence.DasBlog.Util.UTCTimeZone.CurrentTimeZone, String.Empty, 1, int.MaxValue, String.Empty);
+                            EntryCollection entries =
+                                dataService.GetEntriesForDay(day, UTCTimeZone.CurrentTimeZone, String.Empty, 1,
+                                                             int.MaxValue, String.Empty);
                             foreach (Entry potentialEntry in entries)
                             {
-
                                 if (popularEntries.ContainsKey(potentialEntry.EntryId) == false)
                                 {
                                     popularEntries.Add(potentialEntry);
@@ -1548,7 +1749,6 @@
                             }
                         }
 
-
                         popularEntries.Sort(new PopularSorter());
                         popularEntries.Reverse();
                         popularEntries.RemoveRange(numEntries - 1, popularEntries.Count - numEntries);
@@ -1570,10 +1770,13 @@
                                 cell.Controls.Add(titleLink);
                             }
                         }
-                        HttpRuntime.Cache.Insert("PopularEntriesTable", list, null, DateTime.Now.AddHours(36), TimeSpan.Zero);
+
+                        HttpRuntime.Cache.Insert("PopularEntriesTable", list, null, DateTime.Now.AddHours(36),
+                                                 TimeSpan.Zero);
                     }
                 }
             }
+
             return list;
         }
 
@@ -1585,14 +1788,14 @@
         private static DateTime GetEndOfMonth(int Month, int Year)
         {
             return new DateTime(Year, Month,
-                DateTime.DaysInMonth(Year, Month), 23, 59, 59, 999);
+                                DateTime.DaysInMonth(Year, Month), 23, 59, 59, 999);
         }
 
         public static DateTime GetStartOfCurrentWeek()
         {
-            int DaysToSubtract = (int)DateTime.UtcNow.DayOfWeek;
+            int DaysToSubtract = (int) DateTime.UtcNow.DayOfWeek;
             DateTime dt = DateTime.UtcNow.Subtract(
-                System.TimeSpan.FromDays(DaysToSubtract));
+                TimeSpan.FromDays(DaysToSubtract));
             return new DateTime(dt.Year, dt.Month, dt.Day, 0, 0, 0, 0);
         }
 
@@ -1600,7 +1803,7 @@
         {
             DateTime dt = GetStartOfCurrentWeek().AddDays(6);
             return new DateTime(dt.Year, dt.Month, dt.Day, 23, 59, 59,
-                999);
+                                999);
         }
 
         public static DateTime GetStartOfYear(int Year)
@@ -1611,11 +1814,9 @@
         public static DateTime GetEndOfYear(int Year)
         {
             return new DateTime(Year, 12,
-                DateTime.DaysInMonth(Year, 12), 23, 59, 59, 999);
+                                DateTime.DaysInMonth(Year, 12), 23, 59, 59, 999);
         }
 
-        private static object blogStatsLock = new object();
-
         /// <summary>
         /// This macro is used like this: %lt;%BlogStats()%&gt; and will return a set of Blog statistics, 
         /// including totalPosts, totalComments, postsThisWeek, postsThisMonth
@@ -1630,6 +1831,7 @@
             const string key = "BlogStats";
 
             BlogStatistics blogstats = HttpRuntime.Cache[key] as BlogStatistics;
+
             if (blogstats == null)
             {
                 lock (blogStatsLock)
@@ -1638,25 +1840,28 @@
                     {
                         try
                         {
-
                             blogstats = new BlogStatistics();
 
                             IBlogDataService dataService = requestPage.DataService;
 
-                            DateTime monthFirst = Macros.GetStartOfMonth(DateTime.UtcNow.Month, DateTime.UtcNow.Year);
-                            DateTime monthLast = Macros.GetEndOfMonth(DateTime.UtcNow.Month, DateTime.UtcNow.Year);
+                            DateTime monthFirst = GetStartOfMonth(DateTime.UtcNow.Month, DateTime.UtcNow.Year);
+                            DateTime monthLast = GetEndOfMonth(DateTime.UtcNow.Month, DateTime.UtcNow.Year);
 
-                            DateTime weekFirst = Macros.GetStartOfCurrentWeek();
-                            DateTime weekLast = Macros.GetEndOfCurrentWeek();
+                            DateTime weekFirst = GetStartOfCurrentWeek();
+                            DateTime weekLast = GetEndOfCurrentWeek();
 
-                            DateTime yearFirst = Macros.GetStartOfYear(DateTime.UtcNow.Year);
-                            DateTime yearLast = Macros.GetEndOfYear(DateTime.UtcNow.Year);
+                            DateTime yearFirst = GetStartOfYear(DateTime.UtcNow.Year);
+                            DateTime yearLast = GetEndOfYear(DateTime.UtcNow.Year);
 
-                            DateTime[] daysWithEntries = dataService.GetDaysWithEntries(newtelligence.DasBlog.Util.UTCTimeZone.CurrentTimeZone);
+                            DateTime[] daysWithEntries = dataService.GetDaysWithEntries(UTCTimeZone.CurrentTimeZone);
+
                             foreach (DateTime day in daysWithEntries)
                             {
-                                EntryCollection entries = dataService.GetEntriesForDay(day, newtelligence.DasBlog.Util.UTCTimeZone.CurrentTimeZone, String.Empty, 1, int.MaxValue, String.Empty);
+                                EntryCollection entries =
+                                    dataService.GetEntriesForDay(day, UTCTimeZone.CurrentTimeZone, String.Empty, 1,
+                                                                 int.MaxValue, String.Empty);
                                 blogstats.AllEntriesCount += entries.Count;
+
                                 foreach (Entry potentialEntry in entries)
                                 {
                                     if (potentialEntry.CreatedUtc > monthFirst && potentialEntry.CreatedUtc <= monthLast)
@@ -1682,7 +1887,8 @@
                         }
                         catch (Exception ex)
                         {
-                            requestPage.LoggingService.AddEvent(new EventDataItem(EventCodes.Error, "BlogStats Error: " + ex.ToString(), String.Empty));
+                            requestPage.LoggingService.AddEvent(
+                                new EventDataItem(EventCodes.Error, "BlogStats Error: " + ex, String.Empty));
                         }
                     }
                 }
@@ -1702,65 +1908,11 @@
             sb.Append(thisMonthString + " " + blogstats.MonthPostCount + "<br />");
             sb.Append(thisWeekString + " " + blogstats.WeekPostCount + "<br />");
             sb.Append(commentsString + " " + blogstats.CommentCount + "<br />");
-            lit.Text = "<div class=\"blogStats\">" + sb.ToString() + "</div>";
+            lit.Text = "<div class=\"blogStats\">" + sb + "</div>";
 
             return lit;
         }
 
-        public class UserInfo : IComparable
-        {
-            private string name = string.Empty;
-            private string displayName = string.Empty;
-            private int noPosts = 0;
-
-            public string Name
-            {
-                get { return name; }
-                set { name = value; }
-            }
-
-            public string DisplayName
-            {
-                get { return displayName; }
-                set { displayName = value; }
-            }
-
-            public int NoPosts
-            {
-                get { return noPosts; }
-                set { noPosts = value; }
-            }
-
-            public string Author
-            {
-                get
-                {
-                    if (displayName != null && displayName.Length > 0)
-                        return displayName;
-                    else return name;
-                }
-            }
-
-            public UserInfo(string name, string displayName)
-            {
-                this.name = name;
-                this.displayName = displayName;
-            }
-
-            public int CompareTo(object obj)
-            {
-                UserInfo userInfo = (UserInfo)obj;
-
-                if (this.NoPosts > userInfo.NoPosts)
-                    return -1;
-                if (this.NoPosts < userInfo.NoPosts)
-                    return 1;
-                return 0;
-            }
-        }
-
-        private static object blogTopPostersLock = new object();
-
         public bool TopPostersDayEntryCriteria(DayEntry entry)
         {
             return true;
@@ -1785,8 +1937,10 @@
                     {
                         try
                         {
-                            string totalPostsString = requestPage.CoreStringTables.GetString("text_blogtopposters_totalposts");
-                            string commentsString = requestPage.CoreStringTables.GetString("text_blogtopposters_comments");
+                            string totalPostsString =
+                                requestPage.CoreStringTables.GetString("text_blogtopposters_totalposts");
+                            string commentsString =
+                                requestPage.CoreStringTables.GetString("text_blogtopposters_comments");
 
                             ArrayList userItems = new ArrayList();
                             Hashtable userKeys = new Hashtable();
@@ -1803,7 +1957,7 @@
                             {
                                 if (userKeys.Contains(potentialEntry.Author))
                                 {
-                                    ((UserInfo)userKeys[potentialEntry.Author]).NoPosts++;
+                                    ((UserInfo) userKeys[potentialEntry.Author]).NoPosts++;
                                 }
                                 else
                                 {
@@ -1830,9 +1984,9 @@
                             foreach (UserInfo userInfo in userItems)
                             {
                                 sb.AppendFormat("<tr><td><a href=\"{0}\">{1}</a></td><td>{2}</td></tr>",
-                                    SiteUtilities.GetUserViewUrl(userInfo.Name),
-                                    userInfo.Author,
-                                    userInfo.NoPosts);
+                                                SiteUtilities.GetUserViewUrl(userInfo.Name),
+                                                userInfo.Author,
+                                                userInfo.NoPosts);
                             }
 
                             sb.AppendFormat("<tr><td colspan=\"2\"><hr class=\"topPostersDivider\"></td></tr>");
@@ -1845,7 +1999,9 @@
                         }
                         catch (Exception ex)
                         {
-                            requestPage.LoggingService.AddEvent(new EventDataItem(EventCodes.Error, "BlogTopPosters Error: " + ex.ToString(), String.Empty));
+                            requestPage.LoggingService.AddEvent(
+                                new EventDataItem(EventCodes.Error, "BlogTopPosters Error: " + ex,
+                                                  String.Empty));
                         }
                     }
                 }
@@ -1855,7 +2011,7 @@
             return lit;
         }
 
-        protected string TruncateString(string s, int max)
+        protected static string TruncateString(string s, int max)
         {
             if (s == null)
             {
@@ -1869,196 +2025,11 @@
             {
                 return s.Substring(0, max) + "...";
             }
+
             return s;
         }
 
-
         /// <summary>
-        /// List of entry titles that appear on the current front page.
-        /// Corresponds to the macro: &lt;%frontPageTitleList%&gt;
-        /// </summary>
-        /// <remarks>The output is HTML. Uses the same CSS classes as TitleList.</remarks>
-        public virtual Control FrontPageTitleList
-        {
-            get
-            {
-                Table list = new Table();
-                list.BorderWidth = Unit.Pixel(0);
-                list.CellPadding = 0;
-                list.CellSpacing = 0;
-                list.CssClass = "titleListStyle";
-
-                foreach (Entry entry in requestPage.GetFrontPageEntries())
-                {
-                    if (entry.CreatedUtc <= DateTime.UtcNow)
-                    {
-                        if (entry.Title != null & entry.Title.Length > 0)
-                        {
-                            TableRow row = new TableRow();
-                            TableCell cell = new TableCell();
-                            //cell.CssClass = "titleListCellStyle";
-                            //cell.HorizontalAlign = HorizontalAlign.Center;
-                            list.Rows.Add(row);
-                            row.Cells.Add(cell);
-
-                            HyperLink titleLink = new HyperLink();
-                            //titleLink.CssClass = "titleListLinkStyle";
-                            titleLink.Text = entry.Title;
-                            titleLink.NavigateUrl = SiteUtilities.GetStartPageUrl(requestPage.SiteConfig) + "#a" + entry.EntryId;
-                            cell.Controls.Add(titleLink);
-                        }
-                    }
-                }
-                return list;
-            }
-        }
-
-        /// <summary>
-        /// This is similar to <see>FrontPageTitleList</see>, with two key differences:
-        /// 1) This is rendered as a unordered list, rather than a table - for all those who prefer to use 
-        /// CSS-based layouts for flexibility (don't you?).
-        /// 2) The links do not point to the front page anchor entries - instead, they link to the permalinked
-        /// single entry.
-        /// Corresponds to the macro: &lt;%RecentEntries%&gt;
-        /// </summary>
-        public virtual Control RecentEntries
-        {
-            get
-            {
-                // We're doing this the brute force way given the lack of a corresponding HTML
-                // control.
-                StringBuilder sb = new StringBuilder();
-                sb.Append("<ul class='titleListStyle'>");
-                foreach (Entry entry in requestPage.GetFrontPageEntries())
-                {
-                    if (entry.CreatedUtc <= DateTime.UtcNow)
-                    {
-                        if (entry.Title != null & entry.Title.Length > 0)
-                        {
-                            sb.Append("<li>");
-                            sb.AppendFormat("<a class='titleListLinkStyle' href='{0}'>{1}</a>",
-                                SiteUtilities.GetPermaLinkUrl(entry),
-                                entry.Title);
-                            sb.Append("</li>");
-                        }
-                    }
-                }
-                sb.Append("</ul>");
-                return new LiteralControl(sb.ToString());
-            }
-        }
-
-        /// <summary>
-        /// Behaves as RecentEntries does, only it formats as a table (for those who prefer not to futz with CSS).
-        /// Possibly redundant given that RecentEntries is a better method for rendering?
-        /// Corresponds to the macro: &lt;%RecentEntriesAsTable%&gt;
-        /// </summary>
-        public virtual Control RecentEntriesAsTable
-        {
-            get
-            {
-                Table list = new Table();
-                list.BorderWidth = Unit.Pixel(0);
-                list.CellPadding = 0;
-                list.CellSpacing = 0;
-                list.CssClass = "titleListStyle";
-
-                foreach (Entry entry in requestPage.GetFrontPageEntries())
-                {
-                    if (entry.CreatedUtc <= DateTime.UtcNow)
-                    {
-                        if (entry.Title != null & entry.Title.Length > 0)
-                        {
-                            TableRow row = new TableRow();
-                            TableCell cell = new TableCell();
-                            cell.CssClass = "titleListCellStyle";
-                            list.Rows.Add(row);
-                            row.Cells.Add(cell);
-
-                            HyperLink titleLink = new HyperLink();
-                            titleLink.CssClass = "titleListLinkStyle";
-                            titleLink.Text = entry.Title;
-                            if (entry.Link != null)
-                            {
-                                titleLink.NavigateUrl = entry.Link;
-                            }
-                            else
-                            {
-                                titleLink.NavigateUrl = SiteUtilities.GetPermaLinkUrl(entry);
-                            }
-                            cell.Controls.Add(titleLink);
-                        }
-                    }
-                }
-                return list;
-            }
-        }
-
-        /// <summary>
-        /// Weblog 'Title' as defined through the tag &lt;Title&gt;
-        /// in the configuration file of the Web application.
-        /// Corresponds to the macro: &lt;%title%&gt;
-        /// Not the same as <see cref="Macros.Title"/>.
-        /// <seealso cref="Macros.Title"/> which is the web page
-        /// title as rendered in the title html tag.
-        /// </summary>
-        /// <remarks>The output is plain text.</remarks>
-        public virtual Control SiteName
-        {
-            get { return new LiteralControl(requestPage.SiteConfig.Title); }
-        }
-
-        /// <summary>
-        /// Provides a Hyperlink with the sitename and link
-        /// to the root homepage as defined in SiteConfig.
-        /// Corresponds to the macro: &lt;%siteNameLink%&gt;
-        /// </summary>
-        /// <remarks>The output is a hyperlink.</remarks>
-        public virtual Control SiteNameLink
-        {
-            get { return new LiteralControl(String.Format("<a href=\"{0}\">{1}</a>", SiteUtilities.GetStartPageUrl(requestPage.SiteConfig), requestPage.SiteConfig.Title)); }
-        }
-
-        /// <summary>
-        /// Site description as defined through the tag &lt;Description&gt;
-        /// in the configuration file of the Web application.
-        /// Corresponds to the macro: &lt;%description%&gt;
-        /// </summary>
-        /// <remarks>The output is plain text.</remarks>
-        public virtual Control Description
-        {
-            get { return new LiteralControl(requestPage.SiteConfig.Description); }
-        }
-
-        /// <summary>
-        /// Renders a list of user-definable hyperlinks.
-        /// Corresponds to the macro: &lt;%navigatorLinks%&gt;
-        /// </summary>
-        /// <remarks>
-        /// The output is HTML.
-        /// <P/>
-        /// List can be edited in the configuration file 'navigatorLinks.xml'.
-        /// </remarks>
-        public virtual Control NavigatorLinks
-        {
-            get { return new SideBarList(false); }
-        }
-
-        /// <summary>
-        /// Renders a list of user-definable hyperlinks.
-        /// Corresponds to the macro: &lt;%navigatorLinksList%&gt;
-        /// </summary>
-        /// <remarks>
-        /// The output is HTML.
-        /// <P/>
-        /// List can be edited in the configuration file 'navigatorLinks.xml'.
-        /// </remarks>
-        public virtual Control NavigatorLinksList
-        {
-            get { return new SideBarList(true); }
-        }
-
-        /// <summary>
         /// The localString macro allows to define language/culture dependend string
         /// expressions in a template. An example for the format for the string is
         /// "English Expression|DE-CH:Schweizerisches Ausdr\xFCckli|DE:Deutscher Ausdruck"
@@ -2109,6 +2080,7 @@
             string languageFilter = HttpContext.Current.Request.Headers["Accept-Language"];
             string key = "TagCloud" + languageFilter;
             string control = HttpContext.Current.Cache[key] as string;
+
             if (control == null)
             {
                 StringBuilder sb = new StringBuilder();
@@ -2117,62 +2089,70 @@
                 Hashtable catEntryCount = new Hashtable();
                 sb.Append("<span class=\"tagCloud\">");
                 CategoryCacheEntryCollection categories = requestPage.DataService.GetCategories();
+
                 foreach (CategoryCacheEntry category in categories)
                 {
-                    EntryCollection entries = requestPage.DataService.GetEntriesForCategory(category.Name, languageFilter);
+                    EntryCollection entries =
+                        requestPage.DataService.GetEntriesForCategory(category.Name, languageFilter);
                     catEntryCount.Add(category.Name, entries.Count);
                     minCount = Math.Min(minCount, entries.Count);
                     maxCount = Math.Max(maxCount, entries.Count);
                 }
-                int distribution = (maxCount - minCount) / 5;
 
+                int distribution = (maxCount - minCount)/5;
+
                 foreach (CategoryCacheEntry category in categories)
                 {
-                    int count = (int)catEntryCount[category.Name];
+                    int count = (int) catEntryCount[category.Name];
+                    string cssClass;
 
-                    string cssClass = String.Empty;
                     if (count == minCount)
+                    {
                         cssClass = "smallestTag";
+                    }
                     else if (count == maxCount)
+                    {
                         cssClass = "largestTag";
-                    else if (count > (minCount + (distribution * 4)))
+                    }
+                    else if (count > (minCount + (distribution*4)))
+                    {
                         cssClass = "largerTag";
-                    else if (count > (minCount + (distribution * 3)))
+                    }
+                    else if (count > (minCount + (distribution*3)))
+                    {
                         cssClass = "largeTag";
-                    else if (count > (minCount + (distribution * 2)))
+                    }
+                    else if (count > (minCount + (distribution*2)))
+                    {
                         cssClass = "mediumTag";
+                    }
                     else if (count > (minCount + (distribution)))
+                    {
                         cssClass = "smallTag";
+                    }
                     else
+                    {
                         cssClass = "smallerTag";
+                    }
 
-                    sb.AppendFormat("<a class=\"{2}\" href=\"{1}\">{0}</a>", category.DisplayName + "&nbsp;(" + count.ToString() + ")", SiteUtilities.GetCategoryViewUrl(requestPage.SiteConfig, category.Name), cssClass);
+                    sb.AppendFormat("<a class=\"{2}\" href=\"{1}\">{0}</a>",
+                                    category.DisplayName + "&nbsp;(" + count + ")",
+                                    SiteUtilities.GetCategoryViewUrl(requestPage.SiteConfig, category.Name), cssClass);
                     sb.Append(" ");
                 }
+
                 sb.Append("</span>");
                 control = sb.ToString();
                 HttpContext.Current.Cache.Insert(key, control, null, DateTime.Now.AddMinutes(240), TimeSpan.Zero);
             }
+
             return new LiteralControl(control);
         }
 
-        public virtual RadioProperties Radio
-        {
-            get { return _radio; }
-        }
-
-        public virtual NewtelligenceProperties Newtelligence
-        {
-            get { return _newtelligence; }
-        }
-
-
         public virtual Control MailTo()
         {
             HyperLink mailLink = new HyperLink();
             mailLink.CssClass = "mailToStyle";
-
-
             mailLink.NavigateUrl = SiteUtilities.RelativeToRoot("Email.aspx");
 
             Image img = new Image();
@@ -2180,8 +2160,102 @@
             img.ToolTip = img.AlternateText = requestPage.CoreStringTables.GetString("text_send_mail");
             img.ImageUrl = requestPage.GetThemedImageUrl("mailTo");
             mailLink.Controls.Add(img);
+
             return mailLink;
         }
+
+        #region Nested type: PopularSorter
+
+        public class PopularSorter : IComparer<Entry>
+        {
+            #region IComparer<Entry> Members
+
+            public int Compare(Entry left, Entry right)
+            {
+                if (left == null) return -1;
+                if (right == null) return 1;
+                if (left.IsPublic == false) return -1;
+                if (right.IsPublic == false) return 1;
+
+                ILoggingDataService logService =
+                    LoggingDataServiceFactory.GetService(SiteConfig.GetLogPathFromCurrentContext());
+                IBlogDataService dataService =
+                    BlogDataServiceFactory.GetService(SiteConfig.GetContentPathFromCurrentContext(), logService);
+
+                TrackingCollection leftTrackings = dataService.GetTrackingsFor(left.EntryId);
+                TrackingCollection rightTrackings = dataService.GetTrackingsFor(right.EntryId);
+
+                CommentCollection leftComments = dataService.GetPublicCommentsFor(left.EntryId);
+                CommentCollection rightComments = dataService.GetPublicCommentsFor(right.EntryId);
+                int leftCount = leftTrackings.Count + leftComments.Count;
+                int rightCount = rightTrackings.Count + rightComments.Count;
+                return leftCount.CompareTo(rightCount);
+            }
+
+            #endregion
+        }
+
+        #endregion
+
+        #region Nested type: UserInfo
+
+        public class UserInfo : IComparable
+        {
+            private string displayName = string.Empty;
+            private string name = string.Empty;
+            private int noPosts = 0;
+
+            public UserInfo(string name, string displayName)
+            {
+                this.name = name;
+                this.displayName = displayName;
+            }
+
+            public string Name
+            {
+                get { return name; }
+                set { name = value; }
+            }
+
+            public string DisplayName
+            {
+                get { return displayName; }
+                set { displayName = value; }
+            }
+
+            public int NoPosts
+            {
+                get { return noPosts; }
+                set { noPosts = value; }
+            }
+
+            public string Author
+            {
+                get
+                {
+                    if (displayName != null && displayName.Length > 0)
+                        return displayName;
+                    else return name;
+                }
+            }
+
+            #region IComparable Members
+
+            public int CompareTo(object obj)
+            {
+                UserInfo userInfo = (UserInfo) obj;
+
+                if (NoPosts > userInfo.NoPosts)
+                    return -1;
+                if (NoPosts < userInfo.NoPosts)
+                    return 1;
+                return 0;
+            }
+
+            #endregion
+        }
+
+        #endregion
     }
 
     /// <summary>
@@ -2218,7 +2292,9 @@
                 HyperLink hl = new HyperLink();
                 hl.CssClass = "archiveLinkStyle";
                 Image img = new Image();
-                img.ImageUrl = new Uri(new Uri(SiteUtilities.GetBaseUrl(requestPage.SiteConfig)), requestPage.GetThemedImageUrl("dayLink")).ToString();
+                img.ImageUrl =
+                    new Uri(new Uri(SiteUtilities.GetBaseUrl(requestPage.SiteConfig)),
+                            requestPage.GetThemedImageUrl("dayLink")).ToString();
                 img.CssClass = "archiveLinkImageStyle";
                 hl.Controls.Add(img);
                 hl.NavigateUrl = SiteUtilities.GetDayViewUrl(day);
@@ -2226,8 +2302,6 @@
             }
         }
 
-
-
         /// <summary>
         /// Protected field <see cref="DayMacros.day"/> formatted as long date.
         /// Corresponds to the macro: &lt;%longDate%&gt;
@@ -2240,19 +2314,6 @@
         }
 
         /// <summary>
-        /// Protected field <see cref="DayMacros.day"/> formatted as whatever the
-        /// user passes in as the format string.
-        /// Corresponds to the macro: &lt;%dayFormattedDate(...)%&gt;
-        /// Works hand in hand with <see cref="DayMacros.ArchiveLink"/>
-        /// </summary>
-        /// <param name="format">Standard format string</param>
-        /// <remarks>The output is plain text.</remarks>
-        public virtual Control dayFormattedDate(string format)
-        {
-            return new LiteralControl(day.ToString(format));
-        }
-
-        /// <summary>
         /// Placeholder for rendering weblog entries.
         /// Corresponds to the macro: &lt;%items%&gt;
         /// </summary>
@@ -2266,7 +2327,11 @@
                 EntryCollection entries = requestPage.WeblogEntries;
                 foreach (Entry entry in entries)
                 {
-                    if ((!requestPage.SiteConfig.AdjustDisplayTimeZone && day.Year == entry.CreatedUtc.Year && day.Month == entry.CreatedUtc.Month && day.Day == entry.CreatedUtc.Day) || (requestPage.SiteConfig.AdjustDisplayTimeZone && requestPage.SiteConfig.GetConfiguredTimeZone().ToLocalTime(entry.CreatedUtc).Date == new DateTime(day.Year, day.Month, day.Day).Date))
+                    if ((!requestPage.SiteConfig.AdjustDisplayTimeZone && day.Year == entry.CreatedUtc.Year &&
+                         day.Month == entry.CreatedUtc.Month && day.Day == entry.CreatedUtc.Day) ||
+                        (requestPage.SiteConfig.AdjustDisplayTimeZone &&
+                         requestPage.SiteConfig.GetConfiguredTimeZone().ToLocalTime(entry.CreatedUtc).Date ==
+                         new DateTime(day.Year, day.Month, day.Day).Date))
                     {
                         requestPage.ProcessItemTemplate(entry, itemPlaceHolder);
                     }
@@ -2274,6 +2339,19 @@
                 return itemPlaceHolder;
             }
         }
+
+        /// <summary>
+        /// Protected field <see cref="DayMacros.day"/> formatted as