yafdotnet-cvs — Mailing list for CVS commit messages.

[Yafdotnet-cvs] yafsrc/YAF.Classes/YAF.Classes.Data DB.cs, 1.6, 1.7 DBAccess.cs, 1.1, 1.2 QueryCounter.cs, 1.1, 1.2 Settings.cs, 1.1, 1.2

[Jaben C. <ja...@us...>]

Update of /cvsroot/yafdotnet/yafsrc/YAF.Classes/YAF.Classes.Data
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv29838/YAF.Classes/YAF.Classes.Data

Modified Files:
	DB.cs DBAccess.cs QueryCounter.cs Settings.cs 
Log Message:
Moved things around, updated copyright stuff.

Index: DB.cs
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/YAF.Classes/YAF.Classes.Data/DB.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** DB.cs	23 Jan 2007 11:33:43 -0000	1.6
--- DB.cs	26 Jan 2007 12:08:12 -0000	1.7
***************
*** 1,4 ****
! /* Yet Another Forum.net
!  * Copyright (C) 2003 Bjørnar Henden
   * http://www.yetanotherforum.net/
   * 
--- 1,5 ----
! /* Yet Another Forum.NET
!  * Copyright (C) 2003-2005 Bjørnar Henden
!  * Copyright (C) 2006-2007 Jaben Cargman
   * http://www.yetanotherforum.net/
   * 

Index: DBAccess.cs
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/YAF.Classes/YAF.Classes.Data/DBAccess.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DBAccess.cs	23 Jan 2007 11:33:43 -0000	1.1
--- DBAccess.cs	26 Jan 2007 12:08:13 -0000	1.2
***************
*** 1,2 ****
--- 1,23 ----
+ /* Yet Another Forum.NET
+  * Copyright (C) 2003-2005 Bjørnar Henden
+  * Copyright (C) 2006-2007 Jaben Cargman
+  * http://www.yetanotherforum.net/
+  * 
+  * This program is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU General Public License
+  * as published by the Free Software Foundation; either version 2
+  * of the License, or (at your option) any later version.
+  * 
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+  */
+ 
+ 
  using System;
  using System.Collections.Generic;

Index: Settings.cs
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/YAF.Classes/YAF.Classes.Data/Settings.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Settings.cs	18 Jan 2007 23:07:08 -0000	1.1
--- Settings.cs	26 Jan 2007 12:08:13 -0000	1.2
***************
*** 1,2 ****
--- 1,22 ----
+ /* Yet Another Forum.NET
+  * Copyright (C) 2003-2005 Bjørnar Henden
+  * Copyright (C) 2006-2007 Jaben Cargman
+  * http://www.yetanotherforum.net/
+  * 
+  * This program is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU General Public License
+  * as published by the Free Software Foundation; either version 2
+  * of the License, or (at your option) any later version.
+  * 
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+  */
+ 
  namespace YAF.Classes.Data.Properties
  {

Index: QueryCounter.cs
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/YAF.Classes/YAF.Classes.Data/QueryCounter.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** QueryCounter.cs	23 Jan 2007 11:33:43 -0000	1.1
--- QueryCounter.cs	26 Jan 2007 12:08:13 -0000	1.2
***************
*** 1,2 ****
--- 1,22 ----
+ /* Yet Another Forum.NET
+  * Copyright (C) 2003-2005 Bjørnar Henden
+  * Copyright (C) 2006-2007 Jaben Cargman
+  * http://www.yetanotherforum.net/
+  * 
+  * This program is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU General Public License
+  * as published by the Free Software Foundation; either version 2
+  * of the License, or (at your option) any later version.
+  * 
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+  */
+ 
  using System;
  using System.Collections.Generic;

[Yafdotnet-cvs] yafsrc/YAF.Classes/YAF.Classes.UI BBCode.cs, NONE, 1.1 FormatMsg.cs, NONE, 1.1 HighLighter.cs, NONE, 1.1 YAF.Classes.UI.csproj, 1.1, 1.2

[Jaben C. <ja...@us...>]

Update of /cvsroot/yafdotnet/yafsrc/YAF.Classes/YAF.Classes.UI
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv29838/YAF.Classes/YAF.Classes.UI

Modified Files:
	YAF.Classes.UI.csproj 
Added Files:
	BBCode.cs FormatMsg.cs HighLighter.cs 
Log Message:
Moved things around, updated copyright stuff.

--- NEW FILE: FormatMsg.cs ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: BBCode.cs ---
(This appears to be a binary file; contents omitted.)

Index: YAF.Classes.UI.csproj
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/YAF.Classes/YAF.Classes.UI/YAF.Classes.UI.csproj,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** YAF.Classes.UI.csproj	14 Dec 2006 17:25:33 -0000	1.1
--- YAF.Classes.UI.csproj	26 Jan 2007 12:08:13 -0000	1.2
***************
*** 35,42 ****
--- 35,55 ----
    </ItemGroup>
    <ItemGroup>
+     <Compile Include="BBCode.cs" />
      <Compile Include="ClientSide\ClientSideFocus.cs" />
      <Compile Include="ClientSide\SmartScroller.cs" />
+     <Compile Include="FormatMsg.cs" />
+     <Compile Include="HighLighter.cs" />
      <Compile Include="Properties\AssemblyInfo.cs" />
    </ItemGroup>
+   <ItemGroup>
+     <ProjectReference Include="..\YAF.Classes.Data\YAF.Classes.Data.csproj">
+       <Project>{9A454596-56DC-4834-A043-F3C1443F859B}</Project>
+       <Name>YAF.Classes.Data</Name>
+     </ProjectReference>
+     <ProjectReference Include="..\YAF.Classes.Utils\YAF.Classes.Utils.csproj">
+       <Project>{FC3A0165-67AF-4E62-8CDE-F26231DD2D77}</Project>
+       <Name>YAF.Classes.Utils</Name>
+     </ProjectReference>
+   </ItemGroup>
    <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
    <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 

--- NEW FILE: HighLighter.cs ---
using System;
using System.IO;
using System.Web;
using System.Text.RegularExpressions;
using System.Collections;
//****************************************************
//
//		Source Control Author : Justin Wendlandt
//			jw...@ho...
//
//		Control Protected by the Creative Commons License
//		http://creativecommons.org/licenses/by-nc-sa/2.0/
//
//****************************************************
namespace YAF.Classes.UI
{
	public class HighLighter
	{
		// To Replace Enter with <br />
		private bool replaceEnter;
		public bool ReplaceEnter
		{
			get { return replaceEnter; }
			set { replaceEnter = value; }
		}

		// Default Constructor
		public HighLighter()
		{
			replaceEnter = false;
		}

		public string colorText( string tmpCode, string pathToDefFile, string language )
		{
			language = language.ToLower();
			if ( language == "c#" || language == "csharp" )
				language = "cs";

			language = language.Replace( "\"", "" );
			// language = language.Replace("&#8220;", "");

			string tmpOutput = "";
			string comments = "";
			bool valid = true;

			ArrayList alKeyWords = new ArrayList();
			ArrayList alKeyTypes = new ArrayList();

			// Read def file.
			try
			{
				StreamReader sr = new StreamReader( pathToDefFile + language.ToString() + ".def" );
				string tmpLine = "";
				string curFlag = "";
				while ( sr.Peek() != -1 )
				{
					tmpLine = sr.ReadLine();
					if ( tmpLine != "" )
					{
						if ( tmpLine.Substring( 0, 1 ) == "-" )
						{
							// Ignore these lines and set the Current Flag
							if ( tmpLine.ToLower().IndexOf( "keywords" ) > 0 )
							{
								curFlag = "keywords";
							}

							if ( tmpLine.ToLower().IndexOf( "keytypes" ) > 0 )
							{
								curFlag = "keytypes";
							}

							if ( tmpLine.ToLower().IndexOf( "comments" ) > 0 )
							{
								curFlag = "comments";
							}
						}
						else
						{
							if ( curFlag == "keywords" )
							{
								alKeyWords.Add( tmpLine );
							}

							if ( curFlag == "keytypes" )
							{
								alKeyTypes.Add( tmpLine );
							}

							if ( curFlag == "comments" )
							{
								comments = tmpLine;
							}
						}
					}
				}
				sr.Close();
			}
			catch ( Exception ex )
			{
				string foobar = ex.ToString();
				tmpOutput = "<span class=\"errors\">There was an error opening file " + pathToDefFile + language.ToString() + ".def...</span>";
				valid = false;
				throw new ApplicationException( string.Format( "There was an error opening file {0}{1}.def", pathToDefFile, language ), ex );
			}

			if ( valid == true )
			{
				// Replace Comments
				int lineNum = 0;
				ArrayList thisComment = new ArrayList();
				MatchCollection mColl = Regex.Matches( tmpCode, comments, RegexOptions.Multiline | RegexOptions.IgnoreCase );
				foreach ( Match m in mColl )
				{
					thisComment.Add( m.ToString() );
					tmpCode = tmpCode.Replace( m.ToString(), "[ReplaceComment" + lineNum++ + "]" );
				}

				// Replace Strings
				lineNum = 0;
				ArrayList thisString = new ArrayList();
				string thisMatch = "\"((\\\\\")|[^\"(\\\\\")]|)+\"";
				mColl = Regex.Matches( tmpCode, thisMatch, RegexOptions.Singleline | RegexOptions.IgnoreCase );
				foreach ( Match m in mColl )
				{
					thisString.Add( m.ToString() );
					tmpCode = tmpCode.Replace( m.ToString(), "[ReplaceString" + lineNum++ + "]" );
				}

				// Replace Chars
				lineNum = 0;
				ArrayList thisChar = new ArrayList();
				mColl = Regex.Matches( tmpCode, "\'.*?\'", RegexOptions.Singleline | RegexOptions.IgnoreCase );
				foreach ( Match m in mColl )
				{
					thisChar.Add( m.ToString() );
					tmpCode = tmpCode.Replace( m.ToString(), "[ReplaceChar" + lineNum++ + "]" );
				}

				// Replace KeyWords
				string [] KeyWords = new String [alKeyWords.Count];
				alKeyWords.CopyTo( KeyWords );
				string tmpKeyWords = "(?<replacethis>" + String.Join( "|", KeyWords ) + ")";
				tmpCode = Regex.Replace( tmpCode, "\\b" + tmpKeyWords + "\\b(?<!//.*)", "<span class=\"keyword\">${replacethis}</span>" );

				// Replace KeyTypes
				string [] KeyTypes = new String [alKeyTypes.Count];
				alKeyTypes.CopyTo( KeyTypes );
				string tmpKeyTypes = "(?<replacethis>" + String.Join( "|", KeyTypes ) + ")";
				tmpCode = Regex.Replace( tmpCode, "\\b" + tmpKeyTypes + "\\b(?<!//.*)", "<span class=\"keytype\">${replacethis}</span>" );

				lineNum = 0;
				foreach ( string m in thisChar )
				{
					tmpCode = tmpCode.Replace( "[ReplaceChar" + lineNum++ + "]", "<span class=\"string\">" + m.ToString() + "</span>" );
				}

				lineNum = 0;
				foreach ( string m in thisString )
				{
					tmpCode = tmpCode.Replace( "[ReplaceString" + lineNum++ + "]", "<span class=\"string\">" + m.ToString() + "</span>" );
				}

				lineNum = 0;
				foreach ( string m in thisComment )
				{
					tmpCode = tmpCode.Replace( "[ReplaceComment" + lineNum++ + "]", "<span class=\"comment\">" + m.ToString() + "</span>" );
				}

				// Replace Numerics
				tmpCode = Regex.Replace( tmpCode, "(\\d{1,12}\\.\\d{1,12}|\\d{1,12})", "<span class=\"integer\">$1</span>" );

				if ( replaceEnter == true )
				{
					tmpCode = Regex.Replace( tmpCode, "\r", "" );
					tmpCode = Regex.Replace( tmpCode, "\n", "<br />" + Environment.NewLine );
				}

				tmpCode = Regex.Replace( tmpCode, "  ", "&nbsp;&nbsp;" );
				tmpCode = Regex.Replace( tmpCode, "\t", "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;" );

				// Create Output
				tmpOutput = "<div class=\"codestuff\">" + Environment.NewLine;
				tmpOutput += "<style type=\"text/css\">" + Environment.NewLine;
				tmpOutput += "<!--" + Environment.NewLine;
				//tmpOutput += ".codestuff { background-color : #eeeeee; border:solid 1px #000000; padding:5px; font-family: Courier New; font-size: 12px}" + Environment.NewLine;
				tmpOutput += ".codestuff .keytype { color : #FF9933; font-weight : normal; }" + Environment.NewLine;
				tmpOutput += ".codestuff .keyword { color : #224FFF; font-weight : normal; }" + Environment.NewLine;
				tmpOutput += ".codestuff .integer { color : #FF0032; }" + Environment.NewLine;
				tmpOutput += ".codestuff .comment { color : #008100; }" + Environment.NewLine;
				tmpOutput += ".codestuff .errors { color : #FF0000; font-weight : bold; }" + Environment.NewLine;
				tmpOutput += ".codestuff .string { color : #FF0022; }" + Environment.NewLine;
				tmpOutput += "//-->" + Environment.NewLine;
				tmpOutput += "</style>" + Environment.NewLine;
				tmpOutput += tmpCode;
				tmpOutput += "</div>" + Environment.NewLine;
			}
			return tmpOutput;
		}
	}
}

[Yafdotnet-cvs] yafsrc/YAF.Classes/YAF.Classes.Base AdminPage.cs, 1.1, 1.2 ForumPage.cs, 1.2, 1.3 YAF.Classes.Base.csproj, 1.2, 1.3 BaseControl.cs, 1.1, NONE BaseUserControl.cs, 1.1, NONE

[Jaben C. <ja...@us...>]

Update of /cvsroot/yafdotnet/yafsrc/YAF.Classes/YAF.Classes.Base
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv29838/YAF.Classes/YAF.Classes.Base

Modified Files:
	AdminPage.cs ForumPage.cs YAF.Classes.Base.csproj 
Removed Files:
	BaseControl.cs BaseUserControl.cs 
Log Message:
Moved things around, updated copyright stuff.

Index: AdminPage.cs
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/YAF.Classes/YAF.Classes.Base/AdminPage.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AdminPage.cs	19 Jan 2007 13:21:44 -0000	1.1
--- AdminPage.cs	26 Jan 2007 12:08:12 -0000	1.2
***************
*** 1,2 ****
--- 1,22 ----
+ /* Yet Another Forum.NET
+  * Copyright (C) 2003-2005 Bjørnar Henden
+  * Copyright (C) 2006-2007 Jaben Cargman
+  * http://www.yetanotherforum.net/
+  * 
+  * This program is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU General Public License
+  * as published by the Free Software Foundation; either version 2
+  * of the License, or (at your option) any later version.
+  * 
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+  */
+ 
  using System;
  using YAF.Classes.Utils;

--- BaseUserControl.cs DELETED ---

Index: ForumPage.cs
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/YAF.Classes/YAF.Classes.Base/ForumPage.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ForumPage.cs	19 Jan 2007 13:21:44 -0000	1.2
--- ForumPage.cs	26 Jan 2007 12:08:12 -0000	1.3
***************
*** 1,3 ****
! /* YetAnotherForum.NET
   * Copyright (C) 2006-2007 Jaben Cargman
   * http://www.yetanotherforum.net/
--- 1,4 ----
! /* Yet Another Forum.NET
!  * Copyright (C) 2003-2005 Bjørnar Henden
   * Copyright (C) 2006-2007 Jaben Cargman
   * http://www.yetanotherforum.net/

--- BaseControl.cs DELETED ---

Index: YAF.Classes.Base.csproj
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/YAF.Classes/YAF.Classes.Base/YAF.Classes.Base.csproj,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** YAF.Classes.Base.csproj	19 Jan 2007 13:21:44 -0000	1.2
--- YAF.Classes.Base.csproj	26 Jan 2007 12:08:12 -0000	1.3
***************
*** 38,45 ****
        <SubType>ASPXCodeBehind</SubType>
      </Compile>
-     <Compile Include="BaseControl.cs" />
-     <Compile Include="BaseUserControl.cs">
-       <SubType>ASPXCodeBehind</SubType>
-     </Compile>
      <Compile Include="ForumPage.cs">
        <SubType>ASPXCodeBehind</SubType>
--- 38,41 ----

[Yafdotnet-cvs] yafsrc/YAF.Classes/YAF.Classes.Utils/Theme Theme.cs, 1.1, 1.2

[Jaben C. <ja...@us...>]

Update of /cvsroot/yafdotnet/yafsrc/YAF.Classes/YAF.Classes.Utils/Theme
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv29838/YAF.Classes/YAF.Classes.Utils/Theme

Modified Files:
	Theme.cs 
Log Message:
Moved things around, updated copyright stuff.

Index: Theme.cs
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/YAF.Classes/YAF.Classes.Utils/Theme/Theme.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Theme.cs	18 Jan 2007 22:58:52 -0000	1.1
--- Theme.cs	26 Jan 2007 12:08:14 -0000	1.2
***************
*** 1,3 ****
! /* YetAnotherForum.NET
   * Copyright (C) 2006-2007 Jaben Cargman
   * http://www.yetanotherforum.net/
--- 1,4 ----
! /* Yet Another Forum.NET
!  * Copyright (C) 2003-2005 Bjørnar Henden
   * Copyright (C) 2006-2007 Jaben Cargman
   * http://www.yetanotherforum.net/
***************
*** 18,21 ****
--- 19,23 ----
   */
  
+ 
  using System;
  using System.Collections.Generic;

[Yafdotnet-cvs] yafsrc/YAF.Classes/YAF.Classes.Utils/Config BoardSettings.cs, 1.1, 1.2 ForumPages.cs, 1.1, 1.2

[Jaben C. <ja...@us...>]

Update of /cvsroot/yafdotnet/yafsrc/YAF.Classes/YAF.Classes.Utils/Config
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv29838/YAF.Classes/YAF.Classes.Utils/Config

Modified Files:
	BoardSettings.cs ForumPages.cs 
Log Message:
Moved things around, updated copyright stuff.

Index: ForumPages.cs
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/YAF.Classes/YAF.Classes.Utils/Config/ForumPages.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ForumPages.cs	18 Jan 2007 22:58:52 -0000	1.1
--- ForumPages.cs	26 Jan 2007 12:08:13 -0000	1.2
***************
*** 1,2 ****
--- 1,22 ----
+ /* Yet Another Forum.NET
+  * Copyright (C) 2003-2005 Bjørnar Henden
+  * Copyright (C) 2006-2007 Jaben Cargman
+  * http://www.yetanotherforum.net/
+  * 
+  * This program is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU General Public License
+  * as published by the Free Software Foundation; either version 2
+  * of the License, or (at your option) any later version.
+  * 
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+  */
+ 
  using System;
  using System.Text;

Index: BoardSettings.cs
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/YAF.Classes/YAF.Classes.Utils/Config/BoardSettings.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BoardSettings.cs	18 Jan 2007 22:58:52 -0000	1.1
--- BoardSettings.cs	26 Jan 2007 12:08:13 -0000	1.2
***************
*** 1,3 ****
! /* YetAnotherForum.NET
   * Copyright (C) 2006-2007 Jaben Cargman
   * http://www.yetanotherforum.net/
--- 1,4 ----
! /* Yet Another Forum.NET
!  * Copyright (C) 2003-2005 Bjørnar Henden
   * Copyright (C) 2006-2007 Jaben Cargman
   * http://www.yetanotherforum.net/
***************
*** 18,21 ****
--- 19,23 ----
   */
  
+ 
  using System;
  using System.Data;

[Yafdotnet-cvs] yafsrc/YAF.Classes/YAF.Classes.Utils/Localization Localization.cs, 1.1, 1.2 Localizer.cs, 1.1, 1.2

[Jaben C. <ja...@us...>]

Update of /cvsroot/yafdotnet/yafsrc/YAF.Classes/YAF.Classes.Utils/Localization
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv29838/YAF.Classes/YAF.Classes.Utils/Localization

Modified Files:
	Localization.cs Localizer.cs 
Log Message:
Moved things around, updated copyright stuff.

Index: Localizer.cs
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/YAF.Classes/YAF.Classes.Utils/Localization/Localizer.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Localizer.cs	18 Jan 2007 22:58:52 -0000	1.1
--- Localizer.cs	26 Jan 2007 12:08:14 -0000	1.2
***************
*** 1,2 ****
--- 1,23 ----
+ /* Yet Another Forum.NET
+  * Copyright (C) 2003-2005 Bjørnar Henden
+  * Copyright (C) 2006-2007 Jaben Cargman
+  * http://www.yetanotherforum.net/
+  * 
+  * This program is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU General Public License
+  * as published by the Free Software Foundation; either version 2
+  * of the License, or (at your option) any later version.
+  * 
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+  */
+ 
+ 
  using System;
  using System.Xml;

Index: Localization.cs
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/YAF.Classes/YAF.Classes.Utils/Localization/Localization.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Localization.cs	18 Jan 2007 22:58:52 -0000	1.1
--- Localization.cs	26 Jan 2007 12:08:14 -0000	1.2
***************
*** 1,2 ****
--- 1,23 ----
+ /* Yet Another Forum.NET
+  * Copyright (C) 2003-2005 Bjørnar Henden
+  * Copyright (C) 2006-2007 Jaben Cargman
+  * http://www.yetanotherforum.net/
+  * 
+  * This program is free software; you can redistribute it and/or
+  * modify it under the terms of the GNU General Public License
+  * as published by the Free Software Foundation; either version 2
+  * of the License, or (at your option) any later version.
+  * 
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+  * 
+  * You should have received a copy of the GNU General Public License
+  * along with this program; if not, write to the Free Software
+  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+  */
+ 
+ 
  using System;
  using System.Collections.Generic;
***************
*** 63,67 ****
  			string filename = null;
  
! 			if ( yaf_Context.Current.Page == null || yaf_Context.Current.Page.IsLanguageFileNull() || !yaf_Context.Current.BoardSettings.AllowUserLanguage )
  			{
  				filename = yaf_Context.Current.BoardSettings.Language;
--- 84,88 ----
  			string filename = null;
  
! 			if ( yaf_Context.Current.PageIsNull() || yaf_Context.Current.Page.IsLanguageFileNull() || !yaf_Context.Current.BoardSettings.AllowUserLanguage )
  			{
  				filename = yaf_Context.Current.BoardSettings.Language;

[Yafdotnet-cvs] yafsrc/YAF.Classes/YAF.Classes.Config Config.cs, 1.2, 1.3 UrlBuilder.cs, 1.1, 1.2

[Jaben C. <ja...@us...>]

Update of /cvsroot/yafdotnet/yafsrc/YAF.Classes/YAF.Classes.Config
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv29838/YAF.Classes/YAF.Classes.Config

Modified Files:
	Config.cs UrlBuilder.cs 
Log Message:
Moved things around, updated copyright stuff.

Index: UrlBuilder.cs
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/YAF.Classes/YAF.Classes.Config/UrlBuilder.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** UrlBuilder.cs	18 Jan 2007 22:57:38 -0000	1.1
--- UrlBuilder.cs	26 Jan 2007 12:08:12 -0000	1.2
***************
*** 1,3 ****
! /* YetAnotherForum.NET
   * Copyright (C) 2006-2007 Jaben Cargman
   * http://www.yetanotherforum.net/
--- 1,4 ----
! /* Yet Another Forum.NET
!  * Copyright (C) 2003-2005 Bjørnar Henden
   * Copyright (C) 2006-2007 Jaben Cargman
   * http://www.yetanotherforum.net/
***************
*** 18,21 ****
--- 19,23 ----
   */
  
+ 
  using System;
  using System.Web;

Index: Config.cs
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/YAF.Classes/YAF.Classes.Config/Config.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Config.cs	19 Jan 2007 13:19:49 -0000	1.2
--- Config.cs	26 Jan 2007 12:08:12 -0000	1.3
***************
*** 1,3 ****
! /* YetAnotherForum.NET
   * Copyright (C) 2006-2007 Jaben Cargman
   * http://www.yetanotherforum.net/
--- 1,4 ----
! /* Yet Another Forum.NET
!  * Copyright (C) 2003-2005 Bjørnar Henden
   * Copyright (C) 2006-2007 Jaben Cargman
   * http://www.yetanotherforum.net/
***************
*** 18,21 ****
--- 19,23 ----
   */
  
+ 
  using System;
  using System.Configuration;

[Yafdotnet-cvs] yafsrc/YAF.Classes/YAF.Classes.Data DBAccess.cs, NONE, 1.1 QueryCounter.cs, NONE, 1.1 DB.cs, 1.5, 1.6 YAF.Classes.Data.csproj, 1.3, 1.4

[Jaben C. <ja...@us...>]

Update of /cvsroot/yafdotnet/yafsrc/YAF.Classes/YAF.Classes.Data
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv21358/YAF.Classes/YAF.Classes.Data

Modified Files:
	DB.cs YAF.Classes.Data.csproj 
Added Files:
	DBAccess.cs QueryCounter.cs 
Log Message:
Broke up the DB file -- long overdue....

Index: DB.cs
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/YAF.Classes/YAF.Classes.Data/DB.cs,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** DB.cs	18 Jan 2007 23:07:08 -0000	1.5
--- DB.cs	23 Jan 2007 11:33:43 -0000	1.6
***************
*** 23,27 ****
  using System.Web;
  using System.Web.Security;
- using YAF.Classes;
  
  namespace YAF.Classes.Data
--- 23,26 ----
***************
*** 96,350 ****
  	}
  
[...3305 lines suppressed...]
  		}
--- 2943,2947 ----
  				cmd.CommandType = CommandType.StoredProcedure;
  				cmd.Parameters.AddWithValue( "@WatchTopicID", watchTopicID );
! 				DBAccess.ExecuteNonQuery( cmd );
  			}
  		}
***************
*** 3204,3208 ****
  				cmd.Parameters.AddWithValue( "@UserID", userID );
  				cmd.Parameters.AddWithValue( "@TopicID", topicID );
! 				ExecuteNonQuery( cmd );
  			}
  		}
--- 2953,2957 ----
  				cmd.Parameters.AddWithValue( "@UserID", userID );
  				cmd.Parameters.AddWithValue( "@TopicID", topicID );
! 				DBAccess.ExecuteNonQuery( cmd );
  			}
  		}

Index: YAF.Classes.Data.csproj
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/YAF.Classes/YAF.Classes.Data/YAF.Classes.Data.csproj,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** YAF.Classes.Data.csproj	19 Jan 2007 13:19:42 -0000	1.3
--- YAF.Classes.Data.csproj	23 Jan 2007 11:33:43 -0000	1.4
***************
*** 36,39 ****
--- 36,40 ----
    <ItemGroup>
      <Compile Include="DB.cs" />
+     <Compile Include="DBAccess.cs" />
      <Compile Include="Properties\AssemblyInfo.cs" />
      <Compile Include="Properties\Settings.Designer.cs">
***************
*** 42,45 ****
--- 43,47 ----
        <DependentUpon>Settings.settings</DependentUpon>
      </Compile>
+     <Compile Include="QueryCounter.cs" />
      <Compile Include="Settings.cs" />
      <Compile Include="YAFDB.Designer.cs">

--- NEW FILE: DBAccess.cs ---
using System;
using System.Collections.Generic;
using System.Text;
using System.Data;
using System.Data.SqlClient;

namespace YAF.Classes.Data
{
	public static class DBAccess
	{
		private static IsolationLevel m_isoLevel = IsolationLevel.ReadUncommitted;

		static public IsolationLevel IsolationLevel
		{
			get
			{
				return m_isoLevel;
			}
		}

		/// <summary>
		/// Gets Connection out of Web.config
		/// </summary>
		/// <returns>Returns SqlConnection</returns>
		public static SqlConnection GetConnection()
		{
			SqlConnection conn = new SqlConnection( YAF.Classes.Config.ConnectionString );
			conn.Open();
			return conn;
		}
		/// <summary>
		/// Gets data out of the database
		/// </summary>
		/// <param name="cmd">The SQL Command</param>
		/// <returns>DataTable with the results</returns>
		static public DataTable GetData( SqlCommand cmd )
		{
			QueryCounter qc = new QueryCounter( cmd.CommandText );
			try
			{
				if ( cmd.Connection != null )
				{
					using ( DataSet ds = new DataSet() )
					{
						using ( SqlDataAdapter da = new SqlDataAdapter() )
						{
							da.SelectCommand = cmd;
							da.Fill( ds );
							return ds.Tables [0];
						}
					}
				}
				else
				{
					using ( SqlConnection conn = GetConnection() )
					{
						using ( SqlTransaction trans = conn.BeginTransaction( m_isoLevel ) )
						{
							try
							{
								cmd.Transaction = trans;
								using ( DataSet ds = new DataSet() )
								{
									using ( SqlDataAdapter da = new SqlDataAdapter() )
									{
										da.SelectCommand = cmd;
										da.SelectCommand.Connection = conn;
										da.Fill( ds );
										return ds.Tables [0];
									}
								}
							}
							finally
							{
								trans.Commit();
							}
						}
					}
				}
			}
			finally
			{
				qc.Dispose();
			}
		}
		/// <summary>
		/// Gets data out of database using a plain text string command
		/// </summary>
		/// <param name="sql">string command to be executed</param>
		/// <returns>DataTable with results</returns>
		static public DataTable GetData( string sql )
		{
			QueryCounter qc = new QueryCounter( sql );
			try
			{
				using ( SqlConnection conn = GetConnection() )
				{
					using ( SqlTransaction trans = conn.BeginTransaction( m_isoLevel ) )
					{
						try
						{
							using ( SqlCommand cmd = conn.CreateCommand() )
							{
								cmd.Transaction = trans;
								cmd.CommandType = CommandType.Text;
								cmd.CommandText = sql;
								using ( DataSet ds = new DataSet() )
								{
									using ( SqlDataAdapter da = new SqlDataAdapter() )
									{
										da.SelectCommand = cmd;
										da.SelectCommand.Connection = conn;
										da.Fill( ds );
										return ds.Tables [0];
									}
								}
							}
						}
						finally
						{
							trans.Commit();
						}
					}
				}
			}
			finally
			{
				qc.Dispose();
			}
		}
		/// <summary>
		/// Executes a NonQuery
		/// </summary>
		/// <param name="cmd">NonQuery to execute</param>
		static public void ExecuteNonQuery( SqlCommand cmd )
		{
			QueryCounter qc = new QueryCounter( cmd.CommandText );
			try
			{
				using ( SqlConnection conn = GetConnection() )
				{
					using ( SqlTransaction trans = conn.BeginTransaction( m_isoLevel ) )
					{
						cmd.Connection = conn;
						cmd.Transaction = trans;
						cmd.ExecuteNonQuery();
						trans.Commit();
					}
				}
			}
			finally
			{
				qc.Dispose();
			}
		}


		static public object ExecuteScalar( SqlCommand cmd )
		{
			QueryCounter qc = new QueryCounter( cmd.CommandText );
			try
			{
				using ( SqlConnection conn = GetConnection() )
				{
					using ( SqlTransaction trans = conn.BeginTransaction( m_isoLevel ) )
					{
						cmd.Connection = conn;
						cmd.Transaction = trans;
						object res = cmd.ExecuteScalar();
						trans.Commit();
						return res;
					}
				}
			}
			finally
			{
				qc.Dispose();
			}
		}
	}
}

--- NEW FILE: QueryCounter.cs ---
using System;
using System.Collections.Generic;
using System.Text;
using System.Diagnostics;
using System.Web;

namespace YAF.Classes.Data
{
	public sealed class QueryCounter : System.IDisposable
	{
#if DEBUG
		private System.Diagnostics.Stopwatch stopWatch = new System.Diagnostics.Stopwatch();
		private string m_cmd;
#endif

		public QueryCounter( string sql )
		{
#if DEBUG
			m_cmd = sql;

			if ( HttpContext.Current.Items ["NumQueries"] == null )
				HttpContext.Current.Items ["NumQueries"] = ( int ) 1;
			else
				HttpContext.Current.Items ["NumQueries"] = 1 + ( int ) HttpContext.Current.Items ["NumQueries"];

			stopWatch.Start();
#endif
		}

		public void Dispose()
		{
#if DEBUG
			stopWatch.Stop();

			double duration = ( double ) stopWatch.ElapsedMilliseconds / 1000.0;

			m_cmd = String.Format( "{0}: {1:N3}", m_cmd, duration );

			if ( HttpContext.Current.Items ["TimeQueries"] == null )
				HttpContext.Current.Items ["TimeQueries"] = duration;
			else
				HttpContext.Current.Items ["TimeQueries"] = duration + ( double ) HttpContext.Current.Items ["TimeQueries"];

			if ( HttpContext.Current.Items ["CmdQueries"] == null )
				HttpContext.Current.Items ["CmdQueries"] = m_cmd;
			else
				HttpContext.Current.Items ["CmdQueries"] += "<br/>" + m_cmd;
#endif
		}

#if DEBUG
		static public void Reset()
		{
			HttpContext.Current.Items ["NumQueries"] = 0;
			HttpContext.Current.Items ["TimeQueries"] = ( double ) 0;
			HttpContext.Current.Items ["CmdQueries"] = "";
		}

		static public int Count
		{
			get
			{
				return ( int ) HttpContext.Current.Items ["NumQueries"];
			}
		}
		static public double Duration
		{
			get
			{
				return ( double ) HttpContext.Current.Items ["TimeQueries"];
			}
		}
		static public string Commands
		{
			get
			{
				return ( string ) HttpContext.Current.Items ["CmdQueries"];
			}
		}
#endif
	}
}

[Yafdotnet-cvs] yafsrc/pages active.ascx, 1.8, 1.9 activeusers.ascx, 1.9, 1.10 approve.ascx, 1.6, 1.7 attachments.ascx, 1.8, 1.9 avatar.ascx, 1.7, 1.8 cp_changepassword.ascx, 1.2, 1.3 cp_editavatar.ascx, 1.3, 1.4 cp_editprofile.ascx, 1.10, 1.11 cp_inbox.ascx, 1.11, 1.12 cp_message.ascx, 1.11, 1.12 cp_profile.ascx, 1.9, 1.10 cp_signature.ascx, 1.9, 1.10 cp_subscriptions.ascx, 1.7, 1.8 emailtopic.ascx, 1.6, 1.7 forum.ascx, 1.16, 1.17 im_aim.ascx, 1.6, 1.7 im_email.ascx, 1.6, 1.7 im_icq.ascx, 1.7, 1.8 im_yim.ascx, 1.6, 1.7 lastposts.ascx, 1.9, 1.10 login.ascx, 1.11, 1.12 members.ascx, 1.12, 1.13 members.ascx.designer.cs, 1.3, 1.4 mod_forumuser.ascx, 1.7, 1.8 moderate.ascx, 1.7, 1.8 movemessage.ascx, 1.1, 1.2 movetopic.ascx, 1.7, 1.8 pmessage.ascx, 1.14, 1.15 postmessage.ascx, 1.22, 1.23 posts.ascx, 1.25, 1.26 printtopic.ascx, 1.5, 1.6 profile.ascx, 1.19, 1.20 recoverpassword.ascx, 1.2, 1.3 register.ascx, 1.8, 1.9 rules.ascx, 1.6, 1.7 search.ascx, 1.16, 1.17 topics.ascx, 1.16, 1.17

[Jaben C. <ja...@us...>]

Update of /cvsroot/yafdotnet/yafsrc/pages
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv20661/pages

Modified Files:
	active.ascx activeusers.ascx approve.ascx attachments.ascx 
	avatar.ascx cp_changepassword.ascx cp_editavatar.ascx 
	cp_editprofile.ascx cp_inbox.ascx cp_message.ascx 
	cp_profile.ascx cp_signature.ascx cp_subscriptions.ascx 
	emailtopic.ascx forum.ascx im_aim.ascx im_email.ascx 
	im_icq.ascx im_yim.ascx lastposts.ascx login.ascx members.ascx 
	members.ascx.designer.cs mod_forumuser.ascx moderate.ascx 
	movemessage.ascx movetopic.ascx pmessage.ascx postmessage.ascx 
	posts.ascx printtopic.ascx profile.ascx recoverpassword.ascx 
	register.ascx rules.ascx search.ascx topics.ascx 
Log Message:
fixing stuff, adding definitions

Index: im_icq.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/im_icq.ascx,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** im_icq.ascx	14 Dec 2006 17:19:44 -0000	1.7
--- im_icq.ascx	23 Jan 2007 11:32:54 -0000	1.8
***************
*** 2,5 ****
--- 2,6 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  
  <YAF:PageLinks runat="server" id="PageLinks"/>

Index: cp_signature.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/cp_signature.ascx,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** cp_signature.ascx	14 Dec 2006 17:19:44 -0000	1.9
--- cp_signature.ascx	23 Jan 2007 11:32:54 -0000	1.10
***************
*** 2,5 ****
--- 2,6 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  <%@ Register TagPrefix="YAF" TagName="SignatureEdit" Src="../controls/EditUsersSignature.ascx" %>
  

Index: attachments.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/attachments.ascx,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** attachments.ascx	14 Dec 2006 17:19:43 -0000	1.8
--- attachments.ascx	23 Jan 2007 11:32:54 -0000	1.9
***************
*** 2,5 ****
--- 2,6 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  
  <YAF:PageLinks runat="server" id="PageLinks"/>

Index: cp_changepassword.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/cp_changepassword.ascx,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** cp_changepassword.ascx	14 Dec 2006 17:19:43 -0000	1.2
--- cp_changepassword.ascx	23 Jan 2007 11:32:54 -0000	1.3
***************
*** 2,5 ****
--- 2,6 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  
  <YAF:PageLinks runat="server" id="PageLinks"/>

Index: cp_editavatar.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/cp_editavatar.ascx,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** cp_editavatar.ascx	14 Dec 2006 17:19:43 -0000	1.3
--- cp_editavatar.ascx	23 Jan 2007 11:32:54 -0000	1.4
***************
*** 2,5 ****
--- 2,6 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  <%@ Register TagPrefix="YAF" TagName="ProfileEdit" Src="../controls/EditUsersAvatar.ascx" %>
  

Index: login.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/login.ascx,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** login.ascx	14 Dec 2006 17:19:44 -0000	1.11
--- login.ascx	23 Jan 2007 11:32:54 -0000	1.12
***************
*** 2,5 ****
--- 2,6 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  
  <YAF:PageLinks runat="server" id="PageLinks"/>

Index: emailtopic.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/emailtopic.ascx,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** emailtopic.ascx	14 Dec 2006 17:19:44 -0000	1.6
--- emailtopic.ascx	23 Jan 2007 11:32:54 -0000	1.7
***************
*** 2,5 ****
--- 2,6 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  
  <YAF:PageLinks runat="server" id="PageLinks"/>

Index: mod_forumuser.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/mod_forumuser.ascx,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** mod_forumuser.ascx	14 Dec 2006 17:19:44 -0000	1.7
--- mod_forumuser.ascx	23 Jan 2007 11:32:54 -0000	1.8
***************
*** 3,6 ****
--- 3,7 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  <YAF:PageLinks runat="server" ID="PageLinks" />
  

Index: lastposts.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/lastposts.ascx,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** lastposts.ascx	19 Jan 2007 13:16:16 -0000	1.9
--- lastposts.ascx	23 Jan 2007 11:32:54 -0000	1.10
***************
*** 2,5 ****
--- 2,6 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  <asp:repeater id="repLastPosts" runat="server" visible="true">
  <HeaderTemplate>

Index: recoverpassword.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/recoverpassword.ascx,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** recoverpassword.ascx	14 Dec 2006 17:19:45 -0000	1.2
--- recoverpassword.ascx	23 Jan 2007 11:32:54 -0000	1.3
***************
*** 2,5 ****
--- 2,6 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  
  <YAF:PageLinks runat="server" id="PageLinks"/>

Index: members.ascx.designer.cs
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/members.ascx.designer.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** members.ascx.designer.cs	21 Dec 2006 16:01:55 -0000	1.3
--- members.ascx.designer.cs	23 Jan 2007 11:32:54 -0000	1.4
***************
*** 2,6 ****
  // <auto-generated>
  //     This code was generated by a tool.
! //     Runtime Version:2.0.50727.42
  //
  //     Changes to this file may cause incorrect behavior and will be lost if
--- 2,6 ----
  // <auto-generated>
  //     This code was generated by a tool.
! //     Runtime Version:2.0.50727.91
  //
  //     Changes to this file may cause incorrect behavior and will be lost if

Index: topics.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/topics.ascx,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** topics.ascx	4 Jan 2007 13:18:18 -0000	1.16
--- topics.ascx	23 Jan 2007 11:32:54 -0000	1.17
***************
*** 2,5 ****
--- 2,6 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  <%@ Register TagPrefix="YAF" TagName="ForumList" Src="../controls/ForumList.ascx" %>
  <YAF:PageLinks runat="server" ID="PageLinks" />

Index: im_email.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/im_email.ascx,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** im_email.ascx	14 Dec 2006 17:19:44 -0000	1.6
--- im_email.ascx	23 Jan 2007 11:32:54 -0000	1.7
***************
*** 2,5 ****
--- 2,6 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  
  <YAF:PageLinks runat="server" id="PageLinks"/>

Index: cp_profile.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/cp_profile.ascx,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** cp_profile.ascx	14 Dec 2006 17:19:44 -0000	1.9
--- cp_profile.ascx	23 Jan 2007 11:32:54 -0000	1.10
***************
*** 2,5 ****
--- 2,6 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  <YAF:PageLinks runat="server" ID="PageLinks" />
  <table width="100%" cellspacing="1" cellpadding="0" class="content">

Index: moderate.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/moderate.ascx,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** moderate.ascx	14 Dec 2006 17:19:44 -0000	1.7
--- moderate.ascx	23 Jan 2007 11:32:54 -0000	1.8
***************
*** 2,5 ****
--- 2,6 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  
  <YAF:PageLinks runat="server" id="PageLinks"/>

Index: movetopic.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/movetopic.ascx,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** movetopic.ascx	14 Dec 2006 17:19:45 -0000	1.7
--- movetopic.ascx	23 Jan 2007 11:32:54 -0000	1.8
***************
*** 2,5 ****
--- 2,6 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  <YAF:PageLinks runat="server" ID="PageLinks" />
  <table class="content" width="100%" cellspacing="1" cellpadding="0">

Index: posts.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/posts.ascx,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** posts.ascx	21 Dec 2006 16:01:55 -0000	1.25
--- posts.ascx	23 Jan 2007 11:32:54 -0000	1.26
***************
*** 2,5 ****
--- 2,6 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  <%@ Register TagPrefix="YAF" TagName="displaypost" Src="../controls/DisplayPost.ascx" %>
  

Index: active.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/active.ascx,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** active.ascx	14 Dec 2006 17:19:43 -0000	1.8
--- active.ascx	23 Jan 2007 11:32:54 -0000	1.9
***************
*** 2,5 ****
--- 2,6 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  
  <YAF:PageLinks runat="server" id="PageLinks"/>

Index: im_yim.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/im_yim.ascx,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** im_yim.ascx	14 Dec 2006 17:19:44 -0000	1.6
--- im_yim.ascx	23 Jan 2007 11:32:54 -0000	1.7
***************
*** 2,5 ****
--- 2,6 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  
  <YAF:PageLinks runat="server" id="PageLinks"/>

Index: members.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/members.ascx,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** members.ascx	19 Jan 2007 13:16:16 -0000	1.12
--- members.ascx	23 Jan 2007 11:32:54 -0000	1.13
***************
*** 2,5 ****
--- 2,6 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  
  <YAF:PageLinks runat="server" id="PageLinks"/>
***************
*** 29,33 ****
  				<td class="post"><a href='<%# YAF.Classes.Utils.yaf_BuildLink.GetLink(YAF.Classes.Utils.ForumPages.profile,"u={0}",Eval("UserID")) %>'><%# Server.HtmlEncode(Convert.ToString(Eval("Name"))) %></a></td>
  				<td class="post"><%# Eval("RankName") %></td>
! 				<td class="post"><%# FormatDateLong((System.DateTime)((System.Data.DataRowView)Container.DataItem)["Joined"]) %></td>
  				<td class="post" align="center"><%# String.Format("{0:N0}",((System.Data.DataRowView)Container.DataItem)["NumPosts"]) %></td>
  			    <td class="post"><%# GetStringSafely(DataBinder.Eval(Container.DataItem,"Location")) %> </td>
--- 30,34 ----
  				<td class="post"><a href='<%# YAF.Classes.Utils.yaf_BuildLink.GetLink(YAF.Classes.Utils.ForumPages.profile,"u={0}",Eval("UserID")) %>'><%# Server.HtmlEncode(Convert.ToString(Eval("Name"))) %></a></td>
  				<td class="post"><%# Eval("RankName") %></td>
! 				<td class="post"><%# yaf_DateTime.FormatDateLong((System.DateTime)((System.Data.DataRowView)Container.DataItem)["Joined"]) %></td>
  				<td class="post" align="center"><%# String.Format("{0:N0}",((System.Data.DataRowView)Container.DataItem)["NumPosts"]) %></td>
  			    <td class="post"><%# GetStringSafely(DataBinder.Eval(Container.DataItem,"Location")) %> </td>

Index: activeusers.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/activeusers.ascx,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** activeusers.ascx	19 Jan 2007 13:16:16 -0000	1.9
--- activeusers.ascx	23 Jan 2007 11:32:54 -0000	1.10
***************
*** 2,5 ****
--- 2,6 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  
  <YAF:PageLinks runat="server" id="PageLinks"/>
***************
*** 22,27 ****
  <tr>
  	<td class=post><asp:HyperLink id="Name" NavigateUrl='<%# YAF.Classes.Utils.yaf_BuildLink.GetLink(YAF.Classes.Utils.ForumPages.profile,"u={0}",Eval("UserID")) %>' Text='<%# Server.HtmlEncode(Convert.ToString(Eval("Name"))) %>' runat="server" /></td>
! 	<td class=post><%# FormatTime((DateTime)((System.Data.DataRowView)Container.DataItem)["Login"]) %></td>
! 	<td class=post><%# FormatTime((DateTime)((System.Data.DataRowView)Container.DataItem)["LastActive"]) %></td>
  	<td class=post><%# String.Format(GetText("minutes"),((System.Data.DataRowView)Container.DataItem)["Active"]) %></td>
  	<td class=post><%# Eval("Browser") %></td>
--- 23,28 ----
  <tr>
  	<td class=post><asp:HyperLink id="Name" NavigateUrl='<%# YAF.Classes.Utils.yaf_BuildLink.GetLink(YAF.Classes.Utils.ForumPages.profile,"u={0}",Eval("UserID")) %>' Text='<%# Server.HtmlEncode(Convert.ToString(Eval("Name"))) %>' runat="server" /></td>
! 	<td class=post><%# yaf_DateTime.FormatTime((DateTime)((System.Data.DataRowView)Container.DataItem)["Login"]) %></td>
! 	<td class=post><%# yaf_DateTime.FormatTime((DateTime)((System.Data.DataRowView)Container.DataItem)["LastActive"]) %></td>
  	<td class=post><%# String.Format(GetText("minutes"),((System.Data.DataRowView)Container.DataItem)["Active"]) %></td>
  	<td class=post><%# Eval("Browser") %></td>

Index: pmessage.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/pmessage.ascx,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** pmessage.ascx	16 Dec 2006 15:12:16 -0000	1.14
--- pmessage.ascx	23 Jan 2007 11:32:54 -0000	1.15
***************
*** 4,7 ****
--- 4,8 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  
  <YAF:PageLinks runat="server" id="PageLinks"/>

Index: profile.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/profile.ascx,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** profile.ascx	19 Jan 2007 13:16:16 -0000	1.19
--- profile.ascx	23 Jan 2007 11:32:54 -0000	1.20
***************
*** 3,6 ****
--- 3,7 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  <%@ Register TagPrefix="uc1" TagName="SignatureEdit" Src="../controls/EditUsersSignature.ascx" %>
  <%@ Register TagPrefix="uc1" TagName="SuspendUser" Src="../controls/EditUsersSuspend.ascx" %>
***************
*** 183,187 ****
                                      <%= GetText("posted") %>
                                  </b>
!                                 <%# FormatDateTime((System.DateTime)((System.Data.DataRowView)Container.DataItem)["Posted"]) %>
  			        </td>
  		        </tr>
--- 184,188 ----
                                      <%= GetText("posted") %>
                                  </b>
!                                 <%# yaf_DateTime.FormatDateTime((System.DateTime)((System.Data.DataRowView)Container.DataItem)["Posted"]) %>
  			        </td>
  		        </tr>

Index: movemessage.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/movemessage.ascx,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** movemessage.ascx	4 Jan 2007 13:34:17 -0000	1.1
--- movemessage.ascx	23 Jan 2007 11:32:54 -0000	1.2
***************
*** 2,5 ****
--- 2,6 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  
  <YAF:PageLinks runat="server" id="PageLinks" />

Index: cp_inbox.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/cp_inbox.ascx,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** cp_inbox.ascx	19 Jan 2007 13:16:16 -0000	1.11
--- cp_inbox.ascx	23 Jan 2007 11:32:54 -0000	1.12
***************
*** 2,5 ****
--- 2,6 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  
  <YAF:PageLinks runat="server" id="PageLinks"/>

Index: cp_subscriptions.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/cp_subscriptions.ascx,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** cp_subscriptions.ascx	14 Dec 2006 17:19:44 -0000	1.7
--- cp_subscriptions.ascx	23 Jan 2007 11:32:54 -0000	1.8
***************
*** 2,5 ****
--- 2,6 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  
  <YAF:PageLinks runat="server" id="PageLinks"/>

Index: approve.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/approve.ascx,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** approve.ascx	14 Dec 2006 17:19:43 -0000	1.6
--- approve.ascx	23 Jan 2007 11:32:54 -0000	1.7
***************
*** 2,5 ****
--- 2,6 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  
  <YAF:PageLinks runat="server" id="PageLinks"/>

Index: postmessage.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/postmessage.ascx,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** postmessage.ascx	19 Jan 2007 13:16:16 -0000	1.22
--- postmessage.ascx	23 Jan 2007 11:32:54 -0000	1.23
***************
*** 3,6 ****
--- 3,7 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  <%@ Register TagPrefix="editor" Namespace="YAF.Editor" Assembly="YAF" %>
  

Index: cp_editprofile.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/cp_editprofile.ascx,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** cp_editprofile.ascx	14 Dec 2006 17:19:43 -0000	1.10
--- cp_editprofile.ascx	23 Jan 2007 11:32:54 -0000	1.11
***************
*** 2,5 ****
--- 2,6 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  <%@ Register TagPrefix="YAF" TagName="ProfileEdit" Src="../controls/EditUsersProfile.ascx" %>
  

Index: cp_message.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/cp_message.ascx,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** cp_message.ascx	14 Dec 2006 17:19:44 -0000	1.11
--- cp_message.ascx	23 Jan 2007 11:32:54 -0000	1.12
***************
*** 2,5 ****
--- 2,6 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  
  <YAF:PageLinks runat="server" id="PageLinks"/>

Index: search.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/search.ascx,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** search.ascx	19 Jan 2007 13:16:16 -0000	1.16
--- search.ascx	23 Jan 2007 11:32:54 -0000	1.17
***************
*** 2,5 ****
--- 2,6 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  
  <YAF:PageLinks runat="server" id="PageLinks"/>

Index: avatar.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/avatar.ascx,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** avatar.ascx	14 Dec 2006 17:19:43 -0000	1.7
--- avatar.ascx	23 Jan 2007 11:32:54 -0000	1.8
***************
*** 2,5 ****
--- 2,6 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  
  <YAF:PageLinks runat="server" id="PageLinks"/>

Index: printtopic.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/printtopic.ascx,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** printtopic.ascx	14 Dec 2006 17:19:45 -0000	1.5
--- printtopic.ascx	23 Jan 2007 11:32:54 -0000	1.6
***************
*** 2,5 ****
--- 2,6 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  
  <YAF:PageLinks runat="server" id="PageLinks"/>

Index: rules.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/rules.ascx,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** rules.ascx	14 Dec 2006 17:19:45 -0000	1.6
--- rules.ascx	23 Jan 2007 11:32:54 -0000	1.7
***************
*** 2,5 ****
--- 2,6 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  
  <YAF:PageLinks runat="server" id="PageLinks"/>

Index: im_aim.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/im_aim.ascx,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** im_aim.ascx	14 Dec 2006 17:19:44 -0000	1.6
--- im_aim.ascx	23 Jan 2007 11:32:54 -0000	1.7
***************
*** 2,5 ****
--- 2,6 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  
  <YAF:PageLinks runat="server" id="PageLinks"/>

Index: forum.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/forum.ascx,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** forum.ascx	19 Jan 2007 13:16:16 -0000	1.16
--- forum.ascx	23 Jan 2007 11:32:54 -0000	1.17
***************
*** 2,5 ****
--- 2,6 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  <%@ Register TagPrefix="YAF" TagName="ForumList" Src="../controls/ForumList.ascx" %>
  <YAF:PageLinks runat="server" ID="PageLinks" />

Index: register.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/register.ascx,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** register.ascx	14 Dec 2006 17:19:45 -0000	1.8
--- register.ascx	23 Jan 2007 11:32:54 -0000	1.9
***************
*** 2,5 ****
--- 2,6 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  
  <YAF:PageLinks runat="server" id="PageLinks"/>

[Yafdotnet-cvs] yafsrc/pages/admin accessmasks.ascx, 1.9, 1.10 admin.ascx, 1.11, 1.12 attachments.ascx, 1.9, 1.10 bannedip.ascx, 1.8, 1.9 bannedip_edit.ascx, 1.7, 1.8 boards.ascx, 1.9, 1.10 boardsettings.ascx, 1.10, 1.11 editaccessmask.ascx, 1.7, 1.8 editboard.ascx, 1.8, 1.9 editcategory.ascx, 1.7, 1.8 editforum.ascx, 1.11, 1.12 editgroup.ascx, 1.8, 1.9 editnntpforum.ascx, 1.8, 1.9 editnntpserver.ascx, 1.8, 1.9 editrank.ascx, 1.8, 1.9 edituser.ascx, 1.10, 1.11 eventlog.ascx, 1.7, 1.8 forums.ascx, 1.8, 1.9 groups.ascx, 1.9, 1.10 hostsettings.ascx, 1.25, 1.26 mail.ascx, 1.7, 1.8 nntpforums.ascx, 1.9, 1.10 nntpretrieve.ascx, 1.10, 1.11 nntpservers.ascx, 1.8, 1.9 pm.ascx, 1.7, 1.8 prune.ascx, 1.7, 1.8 ranks.ascx, 1.9, 1.10 reguser.ascx, 1.6, 1.7 replacewords.ascx, 1.8, 1.9 replacewords_edit.ascx, 1.7, 1.8 smilies.ascx, 1.10, 1.11 smilies_edit.ascx, 1.7, 1.8 smilies_import.ascx, 1.7, 1.8 users.ascx, 1.13, 1.14 version.ascx, 1.7, 1.8

[Jaben C. <ja...@us...>]

Update of /cvsroot/yafdotnet/yafsrc/pages/admin
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv20661/pages/admin

Modified Files:
	accessmasks.ascx admin.ascx attachments.ascx bannedip.ascx 
	bannedip_edit.ascx boards.ascx boardsettings.ascx 
	editaccessmask.ascx editboard.ascx editcategory.ascx 
	editforum.ascx editgroup.ascx editnntpforum.ascx 
	editnntpserver.ascx editrank.ascx edituser.ascx eventlog.ascx 
	forums.ascx groups.ascx hostsettings.ascx mail.ascx 
	nntpforums.ascx nntpretrieve.ascx nntpservers.ascx pm.ascx 
	prune.ascx ranks.ascx reguser.ascx replacewords.ascx 
	replacewords_edit.ascx smilies.ascx smilies_edit.ascx 
	smilies_import.ascx users.ascx version.ascx 
Log Message:
fixing stuff, adding definitions

Index: editaccessmask.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/admin/editaccessmask.ascx,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** editaccessmask.ascx	14 Dec 2006 17:19:46 -0000	1.7
--- editaccessmask.ascx	23 Jan 2007 11:32:54 -0000	1.8
***************
*** 2,5 ****
--- 2,6 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  
  <YAF:PageLinks runat="server" id="PageLinks"/>

Index: editnntpforum.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/admin/editnntpforum.ascx,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** editnntpforum.ascx	14 Dec 2006 17:19:46 -0000	1.8
--- editnntpforum.ascx	23 Jan 2007 11:32:55 -0000	1.9
***************
*** 2,5 ****
--- 2,6 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  
  <YAF:PageLinks runat="server" id="PageLinks"/>

Index: smilies_edit.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/admin/smilies_edit.ascx,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** smilies_edit.ascx	14 Dec 2006 17:19:48 -0000	1.7
--- smilies_edit.ascx	23 Jan 2007 11:32:55 -0000	1.8
***************
*** 2,5 ****
--- 2,6 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  
  <YAF:PageLinks runat="server" id="PageLinks"/>

Index: editforum.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/admin/editforum.ascx,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** editforum.ascx	16 Dec 2006 16:22:45 -0000	1.11
--- editforum.ascx	23 Jan 2007 11:32:55 -0000	1.12
***************
*** 1,4 ****
--- 1,5 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  <%@ Control language="c#" Codebehind="editforum.ascx.cs" AutoEventWireup="True" Inherits="YAF.Pages.Admin.editforum" %>
  <YAF:PageLinks runat="server" id="PageLinks" />

Index: replacewords.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/admin/replacewords.ascx,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** replacewords.ascx	14 Dec 2006 17:19:48 -0000	1.8
--- replacewords.ascx	23 Jan 2007 11:32:55 -0000	1.9
***************
*** 2,5 ****
--- 2,6 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  <YAF:PageLinks runat="server" id="PageLinks" />
  <YAF:adminmenu runat="server" id="Adminmenu1">

Index: prune.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/admin/prune.ascx,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** prune.ascx	14 Dec 2006 17:19:47 -0000	1.7
--- prune.ascx	23 Jan 2007 11:32:55 -0000	1.8
***************
*** 2,5 ****
--- 2,6 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  
  <YAF:PageLinks runat="server" id="PageLinks"/>

Index: ranks.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/admin/ranks.ascx,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ranks.ascx	14 Dec 2006 17:19:48 -0000	1.9
--- ranks.ascx	23 Jan 2007 11:32:55 -0000	1.10
***************
*** 2,5 ****
--- 2,6 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  
  <YAF:PageLinks runat="server" id="PageLinks"/>

Index: smilies.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/admin/smilies.ascx,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** smilies.ascx	21 Dec 2006 16:01:57 -0000	1.10
--- smilies.ascx	23 Jan 2007 11:32:55 -0000	1.11
***************
*** 2,5 ****
--- 2,6 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  
  <YAF:PageLinks runat="server" id="PageLinks"/>

Index: attachments.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/admin/attachments.ascx,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** attachments.ascx	19 Jan 2007 13:16:17 -0000	1.9
--- attachments.ascx	23 Jan 2007 11:32:54 -0000	1.10
***************
*** 2,5 ****
--- 2,6 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  
  <YAF:PageLinks runat="server" id="PageLinks"/>

Index: version.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/admin/version.ascx,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** version.ascx	14 Dec 2006 17:19:49 -0000	1.7
--- version.ascx	23 Jan 2007 11:32:55 -0000	1.8
***************
*** 2,5 ****
--- 2,6 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  
  <YAF:PageLinks runat="server" id="PageLinks"/>

Index: editgroup.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/admin/editgroup.ascx,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** editgroup.ascx	14 Dec 2006 17:19:46 -0000	1.8
--- editgroup.ascx	23 Jan 2007 11:32:55 -0000	1.9
***************
*** 2,5 ****
--- 2,6 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  
  <YAF:PageLinks runat="server" id="PageLinks"/>

Index: bannedip_edit.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/admin/bannedip_edit.ascx,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** bannedip_edit.ascx	14 Dec 2006 17:19:46 -0000	1.7
--- bannedip_edit.ascx	23 Jan 2007 11:32:54 -0000	1.8
***************
*** 2,5 ****
--- 2,6 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  
  <YAF:PageLinks runat="server" id="PageLinks"/>

Index: eventlog.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/admin/eventlog.ascx,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** eventlog.ascx	14 Dec 2006 17:19:47 -0000	1.7
--- eventlog.ascx	23 Jan 2007 11:32:55 -0000	1.8
***************
*** 2,5 ****
--- 2,6 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  
  <YAF:PageLinks runat="server" id="PageLinks"/>

Index: forums.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/admin/forums.ascx,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** forums.ascx	14 Dec 2006 17:19:47 -0000	1.8
--- forums.ascx	23 Jan 2007 11:32:55 -0000	1.9
***************
*** 2,5 ****
--- 2,6 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  
  <YAF:PageLinks runat="server" id="PageLinks"/>

Index: editboard.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/admin/editboard.ascx,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** editboard.ascx	14 Dec 2006 17:19:46 -0000	1.8
--- editboard.ascx	23 Jan 2007 11:32:54 -0000	1.9
***************
*** 2,5 ****
--- 2,6 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  
  <YAF:PageLinks runat="server" id="PageLinks"/>

Index: admin.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/admin/admin.ascx,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** admin.ascx	14 Dec 2006 17:19:45 -0000	1.11
--- admin.ascx	23 Jan 2007 11:32:54 -0000	1.12
***************
*** 2,5 ****
--- 2,6 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  <YAF:PageLinks runat="server" id="PageLinks" />
  <YAF:adminmenu runat="server" id="Adminmenu1">

Index: bannedip.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/admin/bannedip.ascx,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** bannedip.ascx	14 Dec 2006 17:19:46 -0000	1.8
--- bannedip.ascx	23 Jan 2007 11:32:54 -0000	1.9
***************
*** 2,5 ****
--- 2,6 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  
  <YAF:PageLinks runat="server" id="PageLinks"/>

Index: smilies_import.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/admin/smilies_import.ascx,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** smilies_import.ascx	14 Dec 2006 17:19:49 -0000	1.7
--- smilies_import.ascx	23 Jan 2007 11:32:55 -0000	1.8
***************
*** 2,5 ****
--- 2,6 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  
  <YAF:PageLinks runat="server" id="PageLinks"/>

Index: editcategory.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/admin/editcategory.ascx,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** editcategory.ascx	14 Dec 2006 17:19:46 -0000	1.7
--- editcategory.ascx	23 Jan 2007 11:32:55 -0000	1.8
***************
*** 2,5 ****
--- 2,6 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  
  <YAF:PageLinks runat="server" id="PageLinks"/>

Index: replacewords_edit.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/admin/replacewords_edit.ascx,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** replacewords_edit.ascx	14 Dec 2006 17:19:48 -0000	1.7
--- replacewords_edit.ascx	23 Jan 2007 11:32:55 -0000	1.8
***************
*** 1,4 ****
--- 1,5 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  <%@ Control language="c#" Codebehind="replacewords_edit.ascx.cs" AutoEventWireup="True" Inherits="YAF.Pages.Admin.replacewords_edit" %>
  <YAF:PageLinks runat="server" id="PageLinks" />

Index: hostsettings.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/admin/hostsettings.ascx,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** hostsettings.ascx	21 Dec 2006 16:01:57 -0000	1.25
--- hostsettings.ascx	23 Jan 2007 11:32:55 -0000	1.26
***************
*** 1,4 ****
--- 1,5 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  <%@ Control language="c#" Codebehind="hostsettings.ascx.cs" AutoEventWireup="True" Inherits="YAF.Pages.Admin.hostsettings" %>
  <YAF:PageLinks runat="server" id="PageLinks" />

Index: boards.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/admin/boards.ascx,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** boards.ascx	14 Dec 2006 17:19:46 -0000	1.9
--- boards.ascx	23 Jan 2007 11:32:54 -0000	1.10
***************
*** 2,5 ****
--- 2,6 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  
  <YAF:PageLinks runat="server" id="PageLinks"/>

Index: groups.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/admin/groups.ascx,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** groups.ascx	14 Dec 2006 17:19:47 -0000	1.9
--- groups.ascx	23 Jan 2007 11:32:55 -0000	1.10
***************
*** 2,5 ****
--- 2,6 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  
  <YAF:PageLinks runat="server" id="PageLinks"/>

Index: nntpforums.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/admin/nntpforums.ascx,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** nntpforums.ascx	14 Dec 2006 17:19:47 -0000	1.9
--- nntpforums.ascx	23 Jan 2007 11:32:55 -0000	1.10
***************
*** 2,5 ****
--- 2,6 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  
  <YAF:PageLinks runat="server" id="PageLinks"/>

Index: nntpservers.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/admin/nntpservers.ascx,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** nntpservers.ascx	14 Dec 2006 17:19:47 -0000	1.8
--- nntpservers.ascx	23 Jan 2007 11:32:55 -0000	1.9
***************
*** 2,5 ****
--- 2,6 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  
  <YAF:PageLinks runat="server" id="PageLinks"/>

Index: nntpretrieve.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/admin/nntpretrieve.ascx,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** nntpretrieve.ascx	14 Dec 2006 17:19:47 -0000	1.10
--- nntpretrieve.ascx	23 Jan 2007 11:32:55 -0000	1.11
***************
*** 2,5 ****
--- 2,6 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  
  <YAF:PageLinks runat="server" id="PageLinks"/>

Index: users.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/admin/users.ascx,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** users.ascx	21 Dec 2006 16:01:57 -0000	1.13
--- users.ascx	23 Jan 2007 11:32:55 -0000	1.14
***************
*** 2,5 ****
--- 2,6 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  
  <YAF:PageLinks runat="server" ID="PageLinks" />

Index: accessmasks.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/admin/accessmasks.ascx,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** accessmasks.ascx	14 Dec 2006 17:19:45 -0000	1.9
--- accessmasks.ascx	23 Jan 2007 11:32:54 -0000	1.10
***************
*** 2,5 ****
--- 2,6 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  
  <YAF:PageLinks runat="server" id="PageLinks"/>

Index: reguser.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/admin/reguser.ascx,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** reguser.ascx	14 Dec 2006 17:19:48 -0000	1.6
--- reguser.ascx	23 Jan 2007 11:32:55 -0000	1.7
***************
*** 2,5 ****
--- 2,6 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  <YAF:PageLinks runat="server" id="PageLinks" />
  <YAF:adminmenu runat="server" id="Adminmenu1">

Index: pm.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/admin/pm.ascx,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** pm.ascx	14 Dec 2006 17:19:47 -0000	1.7
--- pm.ascx	23 Jan 2007 11:32:55 -0000	1.8
***************
*** 2,5 ****
--- 2,6 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  
  <YAF:PageLinks runat="server" id="PageLinks"/>

Index: editnntpserver.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/admin/editnntpserver.ascx,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** editnntpserver.ascx	14 Dec 2006 17:19:46 -0000	1.8
--- editnntpserver.ascx	23 Jan 2007 11:32:55 -0000	1.9
***************
*** 2,5 ****
--- 2,6 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  
  <YAF:PageLinks runat="server" id="PageLinks"/>

Index: editrank.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/admin/editrank.ascx,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** editrank.ascx	14 Dec 2006 17:19:46 -0000	1.8
--- editrank.ascx	23 Jan 2007 11:32:55 -0000	1.9
***************
*** 2,5 ****
--- 2,6 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  
  <YAF:PageLinks runat="server" id="PageLinks"/>

Index: edituser.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/admin/edituser.ascx,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** edituser.ascx	14 Dec 2006 17:19:47 -0000	1.10
--- edituser.ascx	23 Jan 2007 11:32:55 -0000	1.11
***************
*** 2,5 ****
--- 2,6 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  <%@ Register TagPrefix="uc1" TagName="QuickEdit" Src="../../controls/EditUsersInfo.ascx" %>
  <%@ Register TagPrefix="uc1" TagName="GroupsEdit" Src="../../controls/EditUsersGroups.ascx" %>

Index: boardsettings.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/admin/boardsettings.ascx,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** boardsettings.ascx	14 Dec 2006 17:19:46 -0000	1.10
--- boardsettings.ascx	23 Jan 2007 11:32:54 -0000	1.11
***************
*** 1,4 ****
--- 1,5 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  <%@ Control language="c#" Codebehind="boardsettings.ascx.cs" AutoEventWireup="True" Inherits="YAF.Pages.Admin.boardsettings" %>
  <YAF:PageLinks runat="server" id="PageLinks" />

Index: mail.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/admin/mail.ascx,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** mail.ascx	14 Dec 2006 17:19:47 -0000	1.7
--- mail.ascx	23 Jan 2007 11:32:55 -0000	1.8
***************
*** 2,5 ****
--- 2,6 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  
  <YAF:PageLinks runat="server" id="PageLinks"/>

[Yafdotnet-cvs] yafsrc/pages/help index.ascx, 1.6, 1.7 recover.ascx, 1.6, 1.7

[Jaben C. <ja...@us...>]

Update of /cvsroot/yafdotnet/yafsrc/pages/help
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv20661/pages/help

Modified Files:
	index.ascx recover.ascx 
Log Message:
fixing stuff, adding definitions

Index: index.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/help/index.ascx,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** index.ascx	14 Dec 2006 17:19:49 -0000	1.6
--- index.ascx	23 Jan 2007 11:32:55 -0000	1.7
***************
*** 1,4 ****
--- 1,5 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  <%@ Control language="c#" Codebehind="index.ascx.cs" AutoEventWireup="True" Inherits="YAF.Pages.help.index" %>
  <YAF:PageLinks runat="server" id="PageLinks" />

Index: recover.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/help/recover.ascx,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** recover.ascx	14 Dec 2006 17:19:49 -0000	1.6
--- recover.ascx	23 Jan 2007 11:32:55 -0000	1.7
***************
*** 1,4 ****
--- 1,5 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  <%@ Control language="c#" Codebehind="recover.ascx.cs" AutoEventWireup="True" Inherits="YAF.Pages.help.recover" %>
  <YAF:PageLinks runat="server" id="PageLinks" />

[Yafdotnet-cvs] yafsrc/pages/moderate forum.ascx, 1.7, 1.8 index.ascx, 1.8, 1.9

[Jaben C. <ja...@us...>]

Update of /cvsroot/yafdotnet/yafsrc/pages/moderate
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv20661/pages/moderate

Modified Files:
	forum.ascx index.ascx 
Log Message:
fixing stuff, adding definitions

Index: forum.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/moderate/forum.ascx,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** forum.ascx	14 Dec 2006 17:19:49 -0000	1.7
--- forum.ascx	23 Jan 2007 11:32:55 -0000	1.8
***************
*** 2,5 ****
--- 2,6 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  
  <YAF:PageLinks runat="server" id="PageLinks"/>

Index: index.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/moderate/index.ascx,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** index.ascx	19 Jan 2007 13:16:18 -0000	1.8
--- index.ascx	23 Jan 2007 11:32:55 -0000	1.9
***************
*** 2,5 ****
--- 2,6 ----
  <%@ Register TagPrefix="YAF" Namespace="YAF.Controls" Assembly="YAF" %>
  <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.UI" Assembly="YAF.Classes.UI" %>
+ <%@ Register TagPrefix="YAF" Namespace="YAF.Classes.Utils" Assembly="YAF.Classes.Utils" %>
  
  <YAF:PageLinks runat="server" id="PageLinks"/>

[Yafdotnet-cvs] yafsrc YAF.csproj,1.7,1.8

[Jaben C. <ja...@us...>]

Update of /cvsroot/yafdotnet/yafsrc
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv9141

Modified Files:
	YAF.csproj 
Log Message:
minor adjustment...

Index: YAF.csproj
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/YAF.csproj,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** YAF.csproj	19 Jan 2007 13:14:21 -0000	1.7
--- YAF.csproj	19 Jan 2007 13:25:48 -0000	1.8
***************
*** 929,932 ****
--- 929,933 ----
        <DependentUpon>smileys.ascx</DependentUpon>
      </Compile>
+     <Compile Include="controls\Statistics\ActiveDiscussions.cs" />
      <Compile Include="controls\Statistics\MostActiveUser.cs" />
      <Compile Include="controls\TopicLine.cs">

[Yafdotnet-cvs] yafsrc/controls/Statistics ActiveDiscussions.cs, 1.1, 1.2

[Jaben C. <ja...@us...>]

Update of /cvsroot/yafdotnet/yafsrc/controls/Statistics
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv8725/controls/Statistics

Modified Files:
	ActiveDiscussions.cs 
Log Message:
fixed

Index: ActiveDiscussions.cs
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/controls/Statistics/ActiveDiscussions.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ActiveDiscussions.cs	4 Jan 2007 13:34:17 -0000	1.1
--- ActiveDiscussions.cs	19 Jan 2007 13:24:56 -0000	1.2
***************
*** 8,72 ****
  using System.Web.UI.WebControls.WebParts;
  using System.Web.UI.HtmlControls;
  
  namespace YAF.Controls.Statistics
  {
!     [ToolboxData("<{0}:ActiveDiscussions runat=\"server\"></{0}:ActiveDiscussions>")]
!     public class ActiveDiscussions : BaseControl
!     {
!         private int _displayNumber = 10;
  
!         /// <summary>
!         /// The default constructor for ActiveDiscussions.
!         /// </summary>
!         public ActiveDiscussions()
!         {
  
!         }
  
!         public int DisplayNumber
!         {
!             get
!             {
!                 return _displayNumber;
!             }
!             set
!             {
!                 _displayNumber = value;
!             }
!         }
  
!         /// <summary>
!         /// Renders the ActiveDiscussions class.
!         /// </summary>
!         /// <param name="writer"></param>
!         protected override void Render(System.Web.UI.HtmlTextWriter writer)
!         {
!             string htmlOutput = "";
  
!             htmlOutput += "<table width=\"90%\" class=\"content\" cellspacing=\"1\" border=\"0\" cellpadding=\"0\">";
!             htmlOutput += "<tr><td class=\"header1\">" + ForumPage.GetText("LATEST_POSTS") + "</td></tr>";
!             System.Data.DataTable dt = YAF.Classes.Data.DB.topic_latest(ForumPage.PageBoardID, 7, ForumPage.PageUserID);
!             int i = 1;
  
!             htmlOutput += "<tr><td class=post><table cellspacing=0 cellpadding=0 align=center>";
  
!             foreach (System.Data.DataRow r in dt.Rows)
!             {
!                 i++;
!                 htmlOutput += "<tr class=\"post\">";
!                 
!                 htmlOutput += "<td width=\"75%\">";
!                 //Output Topic Link
!                 htmlOutput += string.Format("&nbsp;<a href=\"{1}\">{0}</a></td>", YAF.Utils.BadWordReplace(Convert.ToString(r["Topic"])), YAF.Forum.GetLink(YAF.ForumPages.posts,"m={0}#{0}",r["LastMessageID"]));
!                 //Output Message Icon
!                 htmlOutput += "<img src=\"" + ForumPage.GetThemeContents("ICONS","ICON_LATEST") + "\" border=\"0\" alt=\"\"></a>";
!                 htmlOutput += "</td></tr>";
!             }
  
!             htmlOutput += "</table></td></tr>";
  
!             htmlOutput += "</table>";
!             writer.Write(htmlOutput);
!         }
!     }
  }
--- 8,73 ----
  using System.Web.UI.WebControls.WebParts;
  using System.Web.UI.HtmlControls;
+ using YAF.Classes.Utils;
  
  namespace YAF.Controls.Statistics
  {
! 	[ToolboxData( "<{0}:ActiveDiscussions runat=\"server\"></{0}:ActiveDiscussions>" )]
! 	public class ActiveDiscussions : YAF.Classes.Base.BaseControl
! 	{
! 		private int _displayNumber = 10;
  
! 		/// <summary>
! 		/// The default constructor for ActiveDiscussions.
! 		/// </summary>
! 		public ActiveDiscussions()
! 		{
  
! 		}
  
! 		public int DisplayNumber
! 		{
! 			get
! 			{
! 				return _displayNumber;
! 			}
! 			set
! 			{
! 				_displayNumber = value;
! 			}
! 		}
  
! 		/// <summary>
! 		/// Renders the ActiveDiscussions class.
! 		/// </summary>
! 		/// <param name="writer"></param>
! 		protected override void Render( System.Web.UI.HtmlTextWriter writer )
! 		{
! 			string htmlOutput = "";
  
! 			htmlOutput += "<table width=\"90%\" class=\"content\" cellspacing=\"1\" border=\"0\" cellpadding=\"0\">";
! 			htmlOutput += "<tr><td class=\"header1\">" + PageContext.Localization.GetText( "LATEST_POSTS" ) + "</td></tr>";
! 			System.Data.DataTable dt = YAF.Classes.Data.DB.topic_latest( PageContext.PageBoardID, 7, PageContext.PageUserID );
! 			int i = 1;
  
! 			htmlOutput += "<tr><td class=post><table cellspacing=0 cellpadding=0 align=center>";
  
! 			foreach ( System.Data.DataRow r in dt.Rows )
! 			{
! 				i++;
! 				htmlOutput += "<tr class=\"post\">";
  
! 				htmlOutput += "<td width=\"75%\">";
! 				//Output Topic Link
! 				htmlOutput += string.Format( "&nbsp;<a href=\"{1}\">{0}</a></td>", General.BadWordReplace( Convert.ToString( r ["Topic"] ) ), yaf_BuildLink.GetLink( ForumPages.posts, "m={0}#{0}", r ["LastMessageID"] ) );
! 				//Output Message Icon
! 				htmlOutput += "<img src=\"" + PageContext.Theme.GetItem( "ICONS", "ICON_LATEST" ) + "\" border=\"0\" alt=\"\"></a>";
! 				htmlOutput += "</td></tr>";
! 			}
  
! 			htmlOutput += "</table></td></tr>";
! 
! 			htmlOutput += "</table>";
! 			writer.Write( htmlOutput );
! 		}
! 	}
  }

[Yafdotnet-cvs] yafsrc/YAF.Classes/YAF.Classes.Base AdminPage.cs, NONE, 1.1 BaseControl.cs, NONE, 1.1 BaseUserControl.cs, NONE, 1.1 ForumPage.cs, 1.1, 1.2 YAF.Classes.Base.csproj, 1.1, 1.2

[Jaben C. <ja...@us...>]

Update of /cvsroot/yafdotnet/yafsrc/YAF.Classes/YAF.Classes.Base
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv7472/YAF.Classes/YAF.Classes.Base

Modified Files:
	ForumPage.cs YAF.Classes.Base.csproj 
Added Files:
	AdminPage.cs BaseControl.cs BaseUserControl.cs 
Log Message:
Next round of commits... getting better.

--- NEW FILE: AdminPage.cs ---
using System;
using YAF.Classes.Utils;
using YAF.Classes.Data;

namespace YAF.Classes.Base
{
	/// <summary>
	/// Summary description for AdminPage.
	/// </summary>
	public class AdminPage : ForumPage
	{
		/// <summary>
		/// Creates the Administration page.
		/// </summary>
		public AdminPage() : base(null)
		{
			this.Load += new EventHandler(AdminPage_Load);
		}

		private void AdminPage_Load(object sender,EventArgs e)
		{
			if ( !PageContext.IsAdmin )
				yaf_BuildLink.AccessDenied();

#if false
			if(!IsPostBack)
			{
				controls.PageLinks ctl = new controls.PageLinks();
				ctl.AddLink(BoardSettings.Name,YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.forum));
				ctl.AddLink("Administration",YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.admin_admin));
				Controls.AddAt(0,ctl);
			}
#endif
		}
	}
}

--- NEW FILE: BaseUserControl.cs ---
using System;
using System.Data;
using YAF.Classes.Utils;

namespace YAF.Classes.Base
{
	/// <summary>
	/// Summary description for ForumUsers.
	/// </summary>
	public class BaseUserControl : System.Web.UI.UserControl
	{
		public yaf_Context PageContext
		{
			get
			{
				return yaf_Context.Current;
			}
		}
	}
}

Index: ForumPage.cs
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/YAF.Classes/YAF.Classes.Base/ForumPage.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ForumPage.cs	18 Jan 2007 23:08:22 -0000	1.1
--- ForumPage.cs	19 Jan 2007 13:21:44 -0000	1.2
***************
*** 46,50 ****
  		private bool m_bShowToolBar = true;
  		private bool m_checkSuspended = true;
- 		private string m_adminMessage = string.Empty;
  		private string m_transPage = string.Empty;
  
--- 46,49 ----
***************
*** 75,79 ****
  			// This doesn't seem to work...
  			Exception x = Server.GetLastError();
[...1004 lines suppressed...]
- 			get
- 			{
- 				if ( PageContext.Page == null || PageContext.Page.IsSuspendedNull() )
- 					return DateTime.Now;
- 				else
- 					return PageContext.Page.Suspended ;
- 			}
- 		}
- 
- 		public int UnreadPrivate
- 		{
- 			get
- 			{
- 				return PageContext.Page.Incoming;
- 			}
- 		}
- 
  		public string ForumURL
  		{
--- 803,806 ----

--- NEW FILE: BaseControl.cs ---
using System;
using System.Data;
using YAF.Classes.Utils;

namespace YAF.Classes.Base
{
	/// <summary>
	/// Summary description for ForumUsers.
	/// </summary>
	public class BaseControl : System.Web.UI.Control
	{
		protected override void Render(System.Web.UI.HtmlTextWriter writer) 
		{
		}

		public yaf_Context PageContext
		{
			get 
			{
				return yaf_Context.Current;
			}
		}
	}
}

Index: YAF.Classes.Base.csproj
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/YAF.Classes/YAF.Classes.Base/YAF.Classes.Base.csproj,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** YAF.Classes.Base.csproj	18 Jan 2007 23:08:22 -0000	1.1
--- YAF.Classes.Base.csproj	19 Jan 2007 13:21:44 -0000	1.2
***************
*** 35,38 ****
--- 35,45 ----
    </ItemGroup>
    <ItemGroup>
+     <Compile Include="AdminPage.cs">
+       <SubType>ASPXCodeBehind</SubType>
+     </Compile>
+     <Compile Include="BaseControl.cs" />
+     <Compile Include="BaseUserControl.cs">
+       <SubType>ASPXCodeBehind</SubType>
+     </Compile>
      <Compile Include="ForumPage.cs">
        <SubType>ASPXCodeBehind</SubType>

[Yafdotnet-cvs] yafsrc/classes AdminPage.cs, 1.8, NONE BaseControl.cs, 1.4, NONE BaseUserControl.cs, 1.3, NONE BoardSettings.cs, 1.26, NONE Data.cs, 1.85, NONE Localizer.cs, 1.8, NONE MySession.cs, 1.6, NONE Security.cs, 1.2, NONE Utils.cs, 1.38, NONE

[Jaben C. <ja...@us...>]

Update of /cvsroot/yafdotnet/yafsrc/classes
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv7045/classes

Removed Files:
	AdminPage.cs BaseControl.cs BaseUserControl.cs 
	BoardSettings.cs Data.cs Localizer.cs MySession.cs Security.cs 
	Utils.cs 
Log Message:
all these classes have moved...

--- BaseControl.cs DELETED ---

--- Utils.cs DELETED ---

--- Data.cs DELETED ---

--- BaseUserControl.cs DELETED ---

--- BoardSettings.cs DELETED ---

--- AdminPage.cs DELETED ---

--- Localizer.cs DELETED ---

--- MySession.cs DELETED ---

--- Security.cs DELETED ---

[Yafdotnet-cvs] yafsrc/YAF.Classes/YAF.Classes.Config Config.cs, 1.1, 1.2

[Jaben C. <ja...@us...>]

Update of /cvsroot/yafdotnet/yafsrc/YAF.Classes/YAF.Classes.Config
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv6558/YAF.Classes/YAF.Classes.Config

Modified Files:
	Config.cs 
Log Message:


Index: Config.cs
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/YAF.Classes/YAF.Classes.Config/Config.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Config.cs	18 Jan 2007 22:57:38 -0000	1.1
--- Config.cs	19 Jan 2007 13:19:49 -0000	1.2
***************
*** 128,132 ****
  					else
  					{
! 						urlAssembly = "YAF.Classes.Utils.UrlBuilder,YAF.Classes.Utils";
  					}
  
--- 128,132 ----
  					else
  					{
! 						urlAssembly = "YAF.Classes.UrlBuilder,YAF.Classes.Config";
  					}
  

[Yafdotnet-cvs] yafsrc/YAF.Classes/YAF.Classes.Data YAF.Classes.Data.csproj, 1.2, 1.3

[Jaben C. <ja...@us...>]

Update of /cvsroot/yafdotnet/yafsrc/YAF.Classes/YAF.Classes.Data
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv6545/YAF.Classes/YAF.Classes.Data

Modified Files:
	YAF.Classes.Data.csproj 
Log Message:


Index: YAF.Classes.Data.csproj
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/YAF.Classes/YAF.Classes.Data/YAF.Classes.Data.csproj,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** YAF.Classes.Data.csproj	18 Jan 2007 23:07:08 -0000	1.2
--- YAF.Classes.Data.csproj	19 Jan 2007 13:19:42 -0000	1.3
***************
*** 56,60 ****
    </ItemGroup>
    <ItemGroup>
-     <None Include="app.config" />
      <None Include="Properties\Settings.settings">
        <Generator>SettingsSingleFileGenerator</Generator>
--- 56,59 ----

[Yafdotnet-cvs] yafsrc/YAF.Classes/YAF.Classes.Utils StaticData.cs, NONE, 1.1

[Jaben C. <ja...@us...>]

Update of /cvsroot/yafdotnet/yafsrc/YAF.Classes/YAF.Classes.Utils
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv6520/YAF.Classes/YAF.Classes.Utils

Added Files:
	StaticData.cs 
Log Message:
Next round of commits... getting better.

--- NEW FILE: StaticData.cs ---
/* YetAnotherForum.NET
 * Copyright (C) 2006-2007 Jaben Cargman
 * http://www.yetanotherforum.net/
 * 
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
 * as published by the Free Software Foundation; either version 2
 * of the License, or (at your option) any later version.
 * 
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 * 
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */

using System;
using System.Data;
using System.Web;

namespace YAF.Classes.Utils
{
	/// <summary>
	/// Summary description for StaticData.
	/// </summary>
	public class yaf_StaticData
	{
		public static DataTable TimeZones()
		{
			using ( DataTable dt = new DataTable( "TimeZone" ) )
			{
				dt.Columns.Add( "Value", Type.GetType( "System.Int32" ) );
				dt.Columns.Add( "Name", Type.GetType( "System.String" ) );

				dt.Rows.Add( new object [] { -720, "(GMT - 12:00) Enitwetok, Kwajalien" } );
				dt.Rows.Add( new object [] { -660, "(GMT - 11:00) Midway Island, Samoa" } );
				dt.Rows.Add( new object [] { -600, "(GMT - 10:00) Hawaii" } );
				dt.Rows.Add( new object [] { -540, "(GMT - 9:00) Alaska" } );
				dt.Rows.Add( new object [] { -480, "(GMT - 8:00) Pacific Time (US & Canada)" } );
				dt.Rows.Add( new object [] { -420, "(GMT - 7:00) Mountain Time (US & Canada)" } );
				dt.Rows.Add( new object [] { -360, "(GMT - 6:00) Central Time (US & Canada), Mexico City" } );
				dt.Rows.Add( new object [] { -300, "(GMT - 5:00) Eastern Time (US & Canada), Bogota, Lima, Quito" } );
				dt.Rows.Add( new object [] { -240, "(GMT - 4:00) Atlantic Time (Canada), Caracas, La Paz" } );
				dt.Rows.Add( new object [] { -210, "(GMT - 3:30) Newfoundland" } );
				dt.Rows.Add( new object [] { -180, "(GMT - 3:00) Brazil, Buenos Aires, Georgetown, Falkland Is." } );
				dt.Rows.Add( new object [] { -120, "(GMT - 2:00) Mid-Atlantic, Ascention Is., St Helena" } );
				dt.Rows.Add( new object [] { -60, "(GMT - 1:00) Azores, Cape Verde Islands" } );
				dt.Rows.Add( new object [] { 0, "(GMT) Casablanca, Dublin, Edinburgh, London, Lisbon, Monrovia" } );
				dt.Rows.Add( new object [] { 60, "(GMT + 1:00) Berlin, Brussels, Kristiansund, Madrid, Paris, Rome, Warsaw" } );
				dt.Rows.Add( new object [] { 120, "(GMT + 2:00) Kaliningrad, South Africa" } );
				dt.Rows.Add( new object [] { 180, "(GMT + 3:00) Baghdad, Riyadh, Moscow, Nairobi" } );
				dt.Rows.Add( new object [] { 210, "(GMT + 3:30) Tehran" } );
				dt.Rows.Add( new object [] { 240, "(GMT + 4:00) Adu Dhabi, Baku, Muscat, Tbilisi" } );
				dt.Rows.Add( new object [] { 270, "(GMT + 4:30) Kabul" } );
				dt.Rows.Add( new object [] { 300, "(GMT + 5:00) Ekaterinburg, Islamabad, Karachi, Tashkent" } );
				dt.Rows.Add( new object [] { 330, "(GMT + 5:30) Bombay, Calcutta, Madras, New Delhi" } );
				dt.Rows.Add( new object [] { 360, "(GMT + 6:00) Almaty, Colomba, Dhakra" } );
				dt.Rows.Add( new object [] { 420, "(GMT + 7:00) Bangkok, Hanoi, Jakarta" } );
				dt.Rows.Add( new object [] { 480, "(GMT + 8:00) Beijing, Hong Kong, Perth, Singapore, Taipei" } );
				dt.Rows.Add( new object [] { 540, "(GMT + 9:00) Osaka, Sapporo, Seoul, Tokyo, Yakutsk" } );
				dt.Rows.Add( new object [] { 570, "(GMT + 9:30) Adelaide, Darwin" } );
				dt.Rows.Add( new object [] { 600, "(GMT + 10:00) Melbourne, Papua New Guinea, Sydney, Vladivostok" } );
				dt.Rows.Add( new object [] { 660, "(GMT + 11:00) Magadan, New Caledonia, Solomon Islands" } );
				dt.Rows.Add( new object [] { 720, "(GMT + 12:00) Auckland, Wellington, Fiji, Marshall Island" } );
				return dt;
			}
		}

		public static DataTable Themes()
		{
			using ( DataTable dt = new DataTable( "Themes" ) )
			{
				dt.Columns.Add( "Theme", typeof( string ) );
				dt.Columns.Add( "FileName", typeof( string ) );

				System.IO.DirectoryInfo dir = new System.IO.DirectoryInfo( System.Web.HttpContext.Current.Request.MapPath( String.Format( "{0}themes", yaf_ForumInfo.ForumRoot ) ) );
				System.IO.FileInfo [] files = dir.GetFiles( "*.xml" );
				foreach ( System.IO.FileInfo file in files )
				{
					try
					{
						System.Xml.XmlDocument doc = new System.Xml.XmlDocument();
						doc.Load( file.FullName );

						DataRow dr = dt.NewRow();
						dr ["Theme"] = doc.DocumentElement.Attributes ["theme"].Value;
						dr ["FileName"] = file.Name;
						dt.Rows.Add( dr );
					}
					catch ( Exception )
					{
					}
				}
				return dt;
			}
		}

		public static DataTable Languages()
		{
			using ( DataTable dt = new DataTable( "Languages" ) )
			{
				dt.Columns.Add( "Language", typeof( string ) );
				dt.Columns.Add( "FileName", typeof( string ) );

				System.IO.DirectoryInfo dir = new System.IO.DirectoryInfo( System.Web.HttpContext.Current.Request.MapPath( String.Format( "{0}languages", yaf_ForumInfo.ForumRoot ) ) );
				System.IO.FileInfo [] files = dir.GetFiles( "*.xml" );
				foreach ( System.IO.FileInfo file in files )
				{
					try
					{
						System.Xml.XmlDocument doc = new System.Xml.XmlDocument();
						doc.Load( file.FullName );
						DataRow dr = dt.NewRow();
						dr ["Language"] = doc.DocumentElement.Attributes ["language"].Value;
						dr ["FileName"] = file.Name;
						dt.Rows.Add( dr );
					}
					catch ( Exception )
					{
					}
				}
				return dt;
			}
		}

		static public DataTable TopicTimes()
		{
			using ( DataTable dt = new DataTable( "TopicTimes" ) )
			{
				dt.Columns.Add( "TopicText", typeof( string ) );
				dt.Columns.Add( "TopicValue", typeof( int ) );

				string [] tTextArray = { "all", "last_day", "last_two_days", "last_week", "last_two_weeks", "last_month", "last_two_months", "last_six_months", "last_year" };
				string [] tTextArrayProp = { "All", "Last Day", "Last Two Days", "Last Week", "Last Two Weeks", "Last Month", "Last Two Months", "Last Six Months", "Last Year" };

				for ( int i = 0; i < 8; i++ )
				{
					DataRow dr = dt.NewRow();
					dr ["TopicText"] = ( yaf_Context.Current.Localization == null ) ? tTextArrayProp [i] : yaf_Context.Current.Localization.GetText( tTextArray [i] );
					dr ["TopicValue"] = i;
					dt.Rows.Add( dr );
				}
				return dt;
			}
		}
	}
}

[Yafdotnet-cvs] yafsrc/YAF.Classes/YAF.Classes.Utils Context.cs, 1.1, 1.2 DateTime.cs, 1.1, 1.2 YAF.Classes.Utils.csproj, 1.2, 1.3 GenerateData.cs, 1.1, NONE

[Jaben C. <ja...@us...>]

Update of /cvsroot/yafdotnet/yafsrc/YAF.Classes/YAF.Classes.Utils
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv6096/YAF.Classes/YAF.Classes.Utils

Modified Files:
	Context.cs DateTime.cs YAF.Classes.Utils.csproj 
Removed Files:
	GenerateData.cs 
Log Message:
Next round of commits... getting better.

Index: YAF.Classes.Utils.csproj
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/YAF.Classes/YAF.Classes.Utils/YAF.Classes.Utils.csproj,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** YAF.Classes.Utils.csproj	18 Jan 2007 22:58:52 -0000	1.2
--- YAF.Classes.Utils.csproj	19 Jan 2007 13:18:27 -0000	1.3
***************
*** 39,43 ****
      <Compile Include="Config\ForumPages.cs" />
      <Compile Include="DateTime.cs" />
!     <Compile Include="GenerateData.cs" />
      <Compile Include="Context.cs" />
      <Compile Include="Localization\Localization.cs" />
--- 39,43 ----
      <Compile Include="Config\ForumPages.cs" />
      <Compile Include="DateTime.cs" />
!     <Compile Include="StaticData.cs" />
      <Compile Include="Context.cs" />
      <Compile Include="Localization\Localization.cs" />

--- GenerateData.cs DELETED ---

Index: Context.cs
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/YAF.Classes/YAF.Classes.Utils/Context.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Context.cs	18 Jan 2007 22:58:52 -0000	1.1
--- Context.cs	19 Jan 2007 13:18:27 -0000	1.2
***************
*** 37,40 ****
--- 37,83 ----
  		private YAF.Classes.Utils.yaf_Localization localization = null;
  		private System.Web.Security.MembershipUser user = null;
+ 		private string loadString = "";
+ 		private string adminLoadString = "";
+ 
+ 		public string LoadString
+ 		{
+ 			get
+ 			{
+ 				return loadString;
+ 			}
+ 		}
+ 
+ 		public string AdminLoadString
+ 		{
+ 			get
+ 			{
+ 				return adminLoadString;
+ 			}
+ 		}
+ 
+ 		/// <summary>
+ 		/// AddLoadMessage creates a message that will be returned on the next page load.
+ 		/// </summary>
+ 		/// <param name="msg">The message you wish to display.</param>
+ 		public void AddLoadMessage( string msg )
+ 		{
+ 			msg = msg.Replace( "\\", "\\\\" );
+ 			msg = msg.Replace( "'", "\\'" );
+ 			msg = msg.Replace( "\r\n", "\\r\\n" );
+ 			msg = msg.Replace( "\n", "\\n" );
+ 			msg = msg.Replace( "\"", "\\\"" );
+ 			loadString += msg + "\\n\\n";
+ 		}
+ 
+ 		/// <summary>
+ 		/// Instead of showing error messages in a pop-up javascript window every time
+ 		/// the page loads (in some cases) provide a error message towards the bottom 
+ 		/// of the page.
+ 		/// </summary>
+ 		/// <param name="msg"></param>
+ 		public void AddAdminMessage( string errorType, string errorMessage )
+ 		{
+ 			adminLoadString = string.Format( "<div style=\"margin: 2%; padding: 7px; border: 3px Solid Red; background-color: #ccc;\"><h1>{0}</h1>{1}</div>", errorType, errorMessage );
+ 		}		
  
  		public static yaf_Context Current
***************
*** 106,110 ****
  				user = value;
  			}
! 		}
  
  		public yaf_BoardSettings BoardSettings
--- 149,153 ----
  				user = value;
  			}
! 		}	
  
  		public yaf_BoardSettings BoardSettings
***************
*** 129,132 ****
--- 172,561 ----
  			}
  		}
+ 
+ 		#region Forum and Page Helper Properties
+ 		/// <summary>
+ 		/// True if current user has post access in the current forum
+ 		/// </summary>
+ 		public bool ForumPostAccess
+ 		{
+ 			get
+ 			{
+ 				if ( Page.IsPostAccessNull() )
+ 					return false;
+ 				else
+ 					return ( Page.PostAccess > 0 );
+ 			}
+ 		}
+ 		/// <summary>
+ 		/// True if the current user has reply access in the current forum
+ 		/// </summary>
+ 		public bool ForumReplyAccess
+ 		{
+ 			get
+ 			{
+ 				if ( Page.IsReplyAccessNull() )
+ 					return false;
+ 				else
+ 					return ( Page.ReplyAccess > 0 );
+ 			}
+ 		}
+ 		/// <summary>
+ 		/// True if the current user has read access in the current forum
+ 		/// </summary>
+ 		public bool ForumReadAccess
+ 		{
+ 			get
+ 			{
+ 				if ( Page.IsReadAccessNull() )
+ 					return false;
+ 				else
+ 					return ( Page.ReadAccess > 0 );
+ 			}
+ 		}
+ 		/// <summary>
+ 		/// True if the current user has access to create priority topics in the current forum
+ 		/// </summary>
+ 		public bool ForumPriorityAccess
+ 		{
+ 			get
+ 			{
+ 				if ( Page.IsPriorityAccessNull() )
+ 					return false;
+ 				else
+ 					return ( Page.PriorityAccess > 0 );
+ 			}
+ 		}
+ 		/// <summary>
+ 		/// True if the current user has access to create polls in the current forum.
+ 		/// </summary>
+ 		public bool ForumPollAccess
+ 		{
+ 			get
+ 			{
+ 				if ( Page.IsPollAccessNull() )
+ 					return false;
+ 				else
+ 					return ( Page.PollAccess > 0 );
+ 			}
+ 		}
+ 		/// <summary>
+ 		/// True if the current user has access to vote on polls in the current forum
+ 		/// </summary>
+ 		public bool ForumVoteAccess
+ 		{
+ 			get
+ 			{
+ 				if ( Page.IsVoteAccessNull() )
+ 					return false;
+ 				else
+ 					return Page.VoteAccess > 0;
+ 			}
+ 		}
+ 		/// <summary>
+ 		/// True if the current user is a moderator of the current forum
+ 		/// </summary>
+ 		public bool ForumModeratorAccess
+ 		{
+ 			get
+ 			{
+ 				if ( Page.IsModeratorAccessNull() )
+ 					return false;
+ 				else
+ 					return ( Page.ModeratorAccess > 0 );
+ 			}
+ 		}
+ 		/// <summary>
+ 		/// True if the current user can delete own messages in the current forum
+ 		/// </summary>
+ 		public bool ForumDeleteAccess
+ 		{
+ 			get
+ 			{
+ 				if ( Page.IsDeleteAccessNull() )
+ 					return false;
+ 				else
+ 					return ( Page.DeleteAccess > 0 );
+ 			}
+ 		}
+ 		/// <summary>
+ 		/// True if the current user can edit own messages in the current forum
+ 		/// </summary>
+ 		public bool ForumEditAccess
+ 		{
+ 			get
+ 			{
+ 				if ( Page.IsEditAccessNull() )
+ 					return false;
+ 				else
+ 					return ( Page.EditAccess > 0 );
+ 			}
+ 		}
+ 		/// <summary>
+ 		/// True if the current user can upload attachments
+ 		/// </summary>
+ 		public bool ForumUploadAccess
+ 		{
+ 			get
+ 			{
+ 				if ( Page.IsUploadAccessNull() )
+ 					return false;
+ 				else
+ 					return ( Page.UploadAccess > 0 );
+ 			}
+ 		}
+ 
+ 		public int PageBoardID
+ 		{
+ 			get
+ 			{
+ 				try
+ 				{
+ 					return Settings.BoardID;
+ 				}
+ 				catch ( Exception )
+ 				{
+ 					return 1;
+ 				}
+ 			}
+ 		}
+ 		/// <summary>
+ 		/// The UserID of the current user.
+ 		/// </summary>
+ 		public int PageUserID
+ 		{
+ 			get
+ 			{
+ 				return ( Page == null ) ? 0 : Page.UserID;
+ 			}
+ 		}
+ 		public string PageUserName
+ 		{
+ 			get
+ 			{
+ 				return ( Page == null ) ? "" : Page.UserName;
+ 			}
+ 		}
+ 		/// <summary>
+ 		/// ForumID for the current page, or 0 if not in any forum
+ 		/// </summary>
+ 		public int PageForumID
+ 		{
+ 			get
+ 			{
+ 				int nLockedForum = Settings.LockedForum;
+ 				if ( nLockedForum != 0 )
+ 					return nLockedForum;
+ 
+ 				if ( Page != null && !Page.IsForumIDNull() )
+ 					return Page.ForumID;
+ 
+ 				return 0;
+ 			}
+ 		}
+ 		/// <summary>
+ 		/// Name of forum for the current page, or an empty string if not in any forum
+ 		/// </summary>
+ 		public string PageForumName
+ 		{
+ 			get
+ 			{
+ 				if ( Page != null && !Page.IsForumNameNull() )
+ 					return ( string ) Page.ForumName;
+ 
+ 				return "";
+ 			}
+ 		}
+ 		/// <summary>
+ 		/// CategoryID for the current page, or 0 if not in any category
+ 		/// </summary>
+ 		public int PageCategoryID
+ 		{
+ 			get
+ 			{
+ 				if ( Settings.CategoryID != 0 )
+ 					return Settings.CategoryID;
+ 				else if ( Page != null && !Page.IsCategoryIDNull() )
+ 					return Page.CategoryID;
+ 
+ 				return 0;
+ 			}
+ 		}
+ 		/// <summary>
+ 		/// Name of category for the current page, or an empty string if not in any category
+ 		/// </summary>
+ 		public string PageCategoryName
+ 		{
+ 			get
+ 			{
+ 				if ( Page != null && !Page.IsCategoryNameNull() )
+ 					return Page.CategoryName;
+ 
+ 				return "";
+ 			}
+ 		}
+ 		/// <summary>
+ 		/// The TopicID of the current page, or 0 if not in any topic
+ 		/// </summary>
+ 		public int PageTopicID
+ 		{
+ 			get
+ 			{
+ 				if ( Page != null && !Page.IsTopicIDNull() )
+ 					return Page.TopicID;
+ 
+ 				return 0;
+ 			}
+ 		}
+ 		/// <summary>
+ 		/// Name of topic for the current page, or an empty string if not in any topic
+ 		/// </summary>
+ 		public string PageTopicName
+ 		{
+ 			get
+ 			{
+ 				if ( Page != null && !Page.IsTopicNameNull() )
+ 					return Page.TopicName;
+ 
+ 				return "";
+ 			}
+ 		}
+ 
+ 		/// <summary>
+ 		/// Is the current user host admin?
+ 		/// </summary>
+ 		public bool IsHostAdmin
+ 		{
+ 			get
+ 			{
+ 				bool isHostAdmin = false;
+ 
+ 				if ( Page != null )
+ 				{
+ 					if ( ( Page.UserFlags & ( int ) UserFlags.IsHostAdmin ) == ( int ) UserFlags.IsHostAdmin )
+ 						isHostAdmin = true;
+ 				}
+ 
+ 				return isHostAdmin;
+ 			}
+ 		}
+ 
+ 		/// <summary>
+ 		/// True if current user is an administrator
+ 		/// </summary>
+ 		public bool IsAdmin
+ 		{
+ 			get
+ 			{
+ 				if ( IsHostAdmin )
+ 					return true;
+ 
+ 				if ( Page != null && !Page.IsIsAdminNull() )
+ 					return Page.IsAdmin != 0;
+ 
+ 				return false;
+ 			}
+ 		}
+ 		/// <summary>
+ 		/// True if the current user is a guest
+ 		/// </summary>
+ 		public bool IsGuest
+ 		{
+ 			get
+ 			{
+ 				if ( Page != null && !Page.IsIsGuestNull() )
+ 					return Page.IsGuest != 0;
+ 
+ 				return false;
+ 			}
+ 		}
+ 		/// <summary>
+ 		/// True if the current user is a forum moderator (mini-admin)
+ 		/// </summary>
+ 		public bool IsForumModerator
+ 		{
+ 			get
+ 			{
+ 				if ( Page != null && !Page.IsIsForumModeratorNull() )
+ 					return Page.IsForumModerator != 0;
+ 
+ 				return false;
+ 			}
+ 		}
+ 		/// <summary>
+ 		/// True if current user is a modeator for at least one forum
+ 		/// </summary>
+ 		public bool IsModerator
+ 		{
+ 			get
+ 			{
+ 				if ( Page != null && !Page.IsIsModeratorNull() )
+ 					return Page.IsModerator != 0;
+ 
+ 				return false;
+ 			}
+ 		}
+ 
+ 		/// <summary>
+ 		/// True if the current user is suspended
+ 		/// </summary>
+ 		public bool IsSuspended
+ 		{
+ 			get
+ 			{
+ 				if ( Page != null && !Page.IsSuspendedNull() )
+ 					return true;
+ 
+ 				return false;
+ 			}
+ 		}
+ 
+ 		/// <summary>
+ 		/// When the user is suspended until
+ 		/// </summary>
+ 		public DateTime SuspendedUntil
+ 		{
+ 			get
+ 			{
+ 				if ( Page == null || Page.IsSuspendedNull() )
+ 					return DateTime.Now;
+ 				else
+ 					return Page.Suspended;
+ 			}
+ 		}
+ 
+ 		/// <summary>
+ 		/// The number of private messages that are unread
+ 		/// </summary>
+ 		public int UnreadPrivate
+ 		{
+ 			get
+ 			{
+ 				return Page.Incoming;
+ 			}
+ 		}
+ 
+ 		/// <summary>
+ 		/// True if board is private (20050909 CHP)
+ 		/// </summary>
+ 		public bool IsPrivate
+ 		{
+ 			get
+ 			{
+ #if TODO
+ 				try
+ 				{
+ 					return
+ 						int.Parse(Utils.UtilsSection[string.Format("isprivate{0}", PageBoardID)])!=0;
+ 				}
+ 				catch
+ 				{
+ 					return false;
+ 				}
+ #else
+ 				return false;
+ #endif
+ 			}
+ 		}
+ 		#endregion
  	}
  
***************
*** 267,270 ****
--- 696,707 ----
  		}
  
+ 		static public string ForumURL
+ 		{
+ 			get
+ 			{
+ 				return string.Format( "{0}{1}", yaf_ForumInfo.ServerURL, yaf_BuildLink.GetLink( ForumPages.forum ) );
+ 			}
+ 		}
+ 
  		static public bool IsLocal
  		{
***************
*** 344,352 ****
  		}
  
! 		public static void AccessDenied()
  		{
  			Redirect( ForumPages.info, "i=4" );
  		}
  
  	}
  }
--- 781,798 ----
  		}
  
! 		static public void AccessDenied()
  		{
  			Redirect( ForumPages.info, "i=4" );
  		}
  
+ 		static public string ThemeFile( string filename )
+ 		{
+ 			return yaf_Context.Current.Theme.ThemeDir + filename;
+ 		}
+ 
+ 		static public string Smiley( string icon )
+ 		{
+ 			return String.Format( "{0}images/emoticons/{1}", yaf_ForumInfo.ForumRoot, icon );
+ 		}
  	}
  }

Index: DateTime.cs
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/YAF.Classes/YAF.Classes.Utils/DateTime.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DateTime.cs	18 Jan 2007 22:58:52 -0000	1.1
--- DateTime.cs	19 Jan 2007 13:18:27 -0000	1.2
***************
*** 5,11 ****
  namespace YAF.Classes.Utils
  {
! 	class yaf_DateTime
  	{
  
  	}
  }
--- 5,180 ----
  namespace YAF.Classes.Utils
  {
! 	public static class yaf_DateTime
  	{
+ 		/// <summary>
+ 		/// Returns the user timezone offset from GMT
+ 		/// </summary>
+ 		public static TimeSpan TimeZoneOffsetUser
+ 		{
+ 			get
+ 			{
+ 				if ( yaf_Context.Current.Page != null )
+ 				{
+ 					int min = yaf_Context.Current.Page.TimeZoneUser;
+ 					return new TimeSpan( min / 60, min % 60, 0 );
+ 				}
+ 				else
+ 					return new TimeSpan( 0 );
+ 			}
+ 		}
+ 		/// <summary>
+ 		/// Returns the time zone offset for the current user compared to the forum time zone.
+ 		/// </summary>
+ 		public static TimeSpan TimeOffset
+ 		{
+ 			get
+ 			{
+ 				return TimeZoneOffsetUser - yaf_Context.Current.BoardSettings.TimeZone;
+ 			}
+ 		}
+ 		/// <summary>
+ 		/// Formats a datetime value into 07.03.2003 22:32:34
+ 		/// </summary>
+ 		/// <param name="o">The date to be formatted</param>
+ 		/// <returns>Formatted string of the formatted DateTime Object.</returns>
+ 		public static string FormatDateTime( object o )
+ 		{
+ 			DateTime dt = ( DateTime ) o + TimeOffset;
+ 			string strDateFormat;
+ 
+ 			strDateFormat = String.Format( "{0:F}", dt );
+ 
+ 			try
+ 			{
+ 				if ( yaf_Context.Current.BoardSettings.DateFormatFromLanguage )
+ 					strDateFormat = dt.ToString( yaf_Context.Current.Localization.GetText( "FORMAT_DATE_TIME_LONG" ) );
+ 			}
+ 			catch ( Exception )
+ 			{
+ 
+ 			}
+ 
+ 			return strDateFormat;
+ 		}
+ 
+ 		/// <summary>
+ 		/// Formats a datatime value into 07.03.2003 00:00:00 except if 
+ 		/// the date is yesterday or today -- in which case it says that.
+ 		/// </summary>
+ 		/// <param name="o">The datetime to be formatted</param>
+ 		/// <returns>Formatted string of DateTime object</returns>
+ 		public static string FormatDateTimeTopic( object o )
+ 		{
+ 			string strDateFormat;
+ 			DateTime dt = Convert.ToDateTime( o ) + TimeOffset;
+ 			DateTime nt = DateTime.Now + TimeOffset;
  
+ 			try
+ 			{
+ 				if ( dt.Date == nt.Date )
+ 				{
+ 					// today
+ 					strDateFormat = String.Format( yaf_Context.Current.Localization.GetText( "TodayAt" ), dt );
+ 				}
+ 				else if ( dt.Date == nt.AddDays( -1 ).Date )
+ 				{
+ 					// yesterday
+ 					strDateFormat = String.Format( yaf_Context.Current.Localization.GetText( "YesterdayAt" ), dt );
+ 				}
+ 				else if ( yaf_Context.Current.BoardSettings.DateFormatFromLanguage )
+ 				{
+ 					strDateFormat = dt.ToString( yaf_Context.Current.Localization.GetText( "FORMAT_DATE_TIME_SHORT" ) );
+ 				}
+ 				else
+ 				{
+ 					strDateFormat = String.Format( "{0:f}", dt );
+ 				}
+ 				return strDateFormat;
+ 			}
+ 			catch ( Exception )
+ 			{
+ 				return dt.ToString( "f" );
+ 			}
+ 		}
+ 		/// <summary>
+ 		/// This formats a DateTime into a short string
+ 		/// </summary>
+ 		/// <param name="o">The DateTime like object you wish to make a formatted string.</param>
+ 		/// <returns>The formatted string created from the DateTime object.</returns>
+ 		public static string FormatDateTimeShort( object o )
+ 		{
+ 			DateTime dt = ( DateTime ) o + TimeOffset;
+ 			try
+ 			{
+ 				if ( yaf_Context.Current.BoardSettings.DateFormatFromLanguage )
+ 					return dt.ToString( yaf_Context.Current.Localization.GetText( "FORMAT_DATE_TIME_SHORT" ) );
+ 				else
+ 					return String.Format( "{0:f}", dt );
+ 			}
+ 			catch ( Exception )
+ 			{
+ 				return dt.ToString( "f" );
+ 			}
+ 		}
+ 		/// <summary>
+ 		/// Formats a datetime value into 7. february 2003
+ 		/// </summary>
+ 		/// <param name="dt">The date to be formatted</param>
+ 		/// <returns></returns>
+ 		public static string FormatDateLong( DateTime dt )
+ 		{
+ 			dt += TimeOffset;
+ 			try
+ 			{
+ 				if ( yaf_Context.Current.BoardSettings.DateFormatFromLanguage )
+ 					return dt.ToString( yaf_Context.Current.Localization.GetText( "FORMAT_DATE_LONG" ) );
+ 				else
+ 					return String.Format( "{0:D}", dt );
+ 			}
+ 			catch ( Exception )
+ 			{
+ 				return dt.ToString( "D" );
+ 			}
+ 		}
+ 		/// <summary>
+ 		/// Formats a datetime value into 07.03.2003
+ 		/// </summary>
+ 		/// <param name="o">This formats the date.</param>
+ 		/// <returns>Short formatted date.</returns>
+ 		public static string FormatDateShort( object o )
+ 		{
+ 			DateTime dt = ( DateTime ) o + TimeOffset;
+ 			try
+ 			{
+ 				if ( yaf_Context.Current.BoardSettings.DateFormatFromLanguage )
+ 					return dt.ToString( yaf_Context.Current.Localization.GetText( "FORMAT_DATE_SHORT" ) );
+ 				else
+ 					return String.Format( "{0:d}", dt );
+ 			}
+ 			catch ( Exception )
+ 			{
+ 				return dt.ToString( "d" );
+ 			}
+ 		}
+ 		/// <summary>
+ 		/// Formats a datetime value into 22:32:34
+ 		/// </summary>
+ 		/// <param name="dt">The date to be formatted</param>
+ 		/// <returns></returns>
+ 		public static string FormatTime( DateTime dt )
+ 		{
+ 			dt += TimeOffset;
+ 			try
+ 			{
+ 				if ( yaf_Context.Current.BoardSettings.DateFormatFromLanguage )
+ 					return dt.ToString( yaf_Context.Current.Localization.GetText( "FORMAT_TIME" ) );
+ 				else
+ 					return String.Format( "{0:T}", dt );
+ 			}
+ 			catch ( Exception )
+ 			{
+ 				return dt.ToString( "T" );
+ 			}
+ 		}
  	}
  }

[Yafdotnet-cvs] yafsrc/pages/admin accessmasks.ascx.cs, 1.12, 1.13 admin.ascx.cs, 1.17, 1.18 attachments.ascx, 1.8, 1.9 attachments.ascx.cs, 1.12, 1.13 bannedip.ascx.cs, 1.11, 1.12 bannedip_edit.ascx.cs, 1.10, 1.11 boards.ascx.cs, 1.12, 1.13 boardsettings.ascx.cs, 1.15, 1.16 editaccessmask.ascx.cs, 1.12, 1.13 editboard.ascx.cs, 1.12, 1.13 editcategory.ascx.cs, 1.11, 1.12 editforum.ascx.cs, 1.19, 1.20 editgroup.ascx.cs, 1.12, 1.13 editnntpforum.ascx.cs, 1.14, 1.15 editnntpserver.ascx.cs, 1.12, 1.13 editrank.ascx.cs, 1.15, 1.16 edituser.ascx.cs, 1.16, 1.17 eventlog.ascx.cs, 1.6, 1.7 forums.ascx.cs, 1.11, 1.12 groups.ascx.cs, 1.12, 1.13 hostsettings.ascx.cs, 1.30, 1.31 mail.ascx.cs, 1.11, 1.12 nntpforums.ascx.cs, 1.13, 1.14 nntpretrieve.ascx.cs, 1.14, 1.15 nntpservers.ascx.cs, 1.11, 1.12 pm.ascx.cs, 1.11, 1.12 prune.ascx.cs, 1.12, 1.13 ranks.ascx.cs, 1.12, 1.13 reguser.ascx.cs, 1.11, 1.12 replacewords.ascx.cs, 1.8, 1.9 replacewords_edit.ascx.cs, 1.10, 1.11 smilies.ascx.cs, 1.12, 1.13 smilies_edit.ascx.cs, 1.15, 1.16 smilies_import.ascx.cs, 1.11, 1.12 users.ascx.cs, 1.17, 1.18 version.ascx.cs, 1.9, 1.10

[Jaben C. <ja...@us...>]

Update of /cvsroot/yafdotnet/yafsrc/pages/admin
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv4847/pages/admin

Modified Files:
	accessmasks.ascx.cs admin.ascx.cs attachments.ascx 
	attachments.ascx.cs bannedip.ascx.cs bannedip_edit.ascx.cs 
	boards.ascx.cs boardsettings.ascx.cs editaccessmask.ascx.cs 
	editboard.ascx.cs editcategory.ascx.cs editforum.ascx.cs 
	editgroup.ascx.cs editnntpforum.ascx.cs editnntpserver.ascx.cs 
	editrank.ascx.cs edituser.ascx.cs eventlog.ascx.cs 
	forums.ascx.cs groups.ascx.cs hostsettings.ascx.cs 
	mail.ascx.cs nntpforums.ascx.cs nntpretrieve.ascx.cs 
	nntpservers.ascx.cs pm.ascx.cs prune.ascx.cs ranks.ascx.cs 
	reguser.ascx.cs replacewords.ascx.cs replacewords_edit.ascx.cs 
	smilies.ascx.cs smilies_edit.ascx.cs smilies_import.ascx.cs 
	users.ascx.cs version.ascx.cs 
Log Message:
Next round of commits... getting better. still plenty more to do!

Index: admin.ascx.cs
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/admin/admin.ascx.cs,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** admin.ascx.cs	14 Dec 2006 17:19:45 -0000	1.17
--- admin.ascx.cs	19 Jan 2007 13:16:17 -0000	1.18
***************
*** 27,30 ****
--- 27,32 ----
  using System.Web.UI.WebControls;
  using System.Web.UI.HtmlControls;
+ using YAF.Classes.Utils;
+ using YAF.Classes.Data;
  
  namespace YAF.Pages.Admin
***************
*** 33,37 ****
  	/// Summary description for main.
  	/// </summary>
! 	public partial class admin : AdminPage
  	{
  	
--- 35,39 ----
  	/// Summary description for main.
  	/// </summary>
! 	public partial class admin : YAF.Classes.Base.AdminPage
  	{
  	
***************
*** 40,44 ****
  			if(!IsPostBack) 
  			{
! 				PageLinks.AddLink(BoardSettings.Name,Forum.GetLink( ForumPages.forum));
  				PageLinks.AddLink("Administration","");
  				BindData();
--- 42,46 ----
  			if(!IsPostBack) 
  			{
! 				PageLinks.AddLink(PageContext.BoardSettings.Name,YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.forum));
  				PageLinks.AddLink("Administration","");
  				BindData();
***************
*** 59,64 ****
  		private void BindData() 
  		{
! 			ActiveList.DataSource = YAF.Classes.Data.DB.active_list(PageBoardID,true);
! 			UserList.DataSource = YAF.Classes.Data.DB.user_list(PageBoardID,null,false);
  			DataBind();
  
--- 61,66 ----
  		private void BindData() 
  		{
! 			ActiveList.DataSource = YAF.Classes.Data.DB.active_list(PageContext.PageBoardID,true);
! 			UserList.DataSource = YAF.Classes.Data.DB.user_list(PageContext.PageBoardID,null,false);
  			DataBind();
  
***************
*** 86,90 ****
  			{
  				case "edit":
! 					Forum.Redirect( ForumPages.admin_edituser,"u={0}",e.CommandArgument);
  					break;
  				case "delete":
--- 88,92 ----
  			{
  				case "edit":
! 					YAF.Classes.Utils.yaf_BuildLink.Redirect( YAF.Classes.Utils.ForumPages.admin_edituser,"u={0}",e.CommandArgument);
  					break;
  				case "delete":
***************
*** 97,101 ****
  					break;
  				case "deleteall":
! 					YAF.Classes.Data.DB.user_deleteold(PageBoardID);
  					BindData();
  					break;
--- 99,103 ----
  					break;
  				case "deleteall":
! 					YAF.Classes.Data.DB.user_deleteold(PageContext.PageBoardID);
  					BindData();
  					break;
***************
*** 108,112 ****
  				return "";
  
! 			return String.Format("<a target=\"_top\" href=\"{0}\">{1}</a>",Forum.GetLink( ForumPages.topics,"f={0}",ForumID),ForumName);
  		}
  
--- 110,114 ----
  				return "";
  
! 			return String.Format("<a target=\"_top\" href=\"{0}\">{1}</a>",YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.topics,"f={0}",ForumID),ForumName);
  		}
  
***************
*** 115,119 ****
  				return "";
  
! 			return String.Format("<a target=\"_top\" href=\"{0}\">{1}</a>",Forum.GetLink( ForumPages.posts,"t={0}",TopicID),TopicName);
  		}
  
--- 117,121 ----
  				return "";
  
! 			return String.Format("<a target=\"_top\" href=\"{0}\">{1}</a>",YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.posts,"t={0}",TopicID),TopicName);
  		}
  

Index: eventlog.ascx.cs
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/admin/eventlog.ascx.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** eventlog.ascx.cs	14 Dec 2006 17:19:47 -0000	1.6
--- eventlog.ascx.cs	19 Jan 2007 13:16:17 -0000	1.7
***************
*** 9,12 ****
--- 9,14 ----
  using System.Web.UI.WebControls;
  using System.Web.UI.HtmlControls;
+ using YAF.Classes.Utils;
+ using YAF.Classes.Data;
  
  namespace YAF.Pages.Admin
***************
*** 15,19 ****
  	/// Summary description for attachments.
  	/// </summary>
! 	public partial class eventlog : AdminPage
  	{
  
--- 17,21 ----
  	/// Summary description for attachments.
  	/// </summary>
! 	public partial class eventlog : YAF.Classes.Base.AdminPage
  	{
  
***************
*** 22,27 ****
  			if(!IsPostBack) 
  			{
! 				PageLinks.AddLink(BoardSettings.Name,Forum.GetLink( ForumPages.forum));
! 				PageLinks.AddLink("Administration",Forum.GetLink( ForumPages.admin_admin));
  				PageLinks.AddLink("Event Log","");
  
--- 24,29 ----
  			if(!IsPostBack) 
  			{
! 				PageLinks.AddLink(PageContext.BoardSettings.Name,YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.forum));
! 				PageLinks.AddLink("Administration",YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.admin_admin));
  				PageLinks.AddLink("Event Log","");
  
***************
*** 32,36 ****
  		private void BindData() 
  		{
! 			List.DataSource = YAF.Classes.Data.DB.eventlog_list(PageBoardID);
  			DataBind();
  		}
--- 34,38 ----
  		private void BindData() 
  		{
! 			List.DataSource = YAF.Classes.Data.DB.eventlog_list(PageContext.PageBoardID);
  			DataBind();
  		}

Index: prune.ascx.cs
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/admin/prune.ascx.cs,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** prune.ascx.cs	14 Dec 2006 17:19:47 -0000	1.12
--- prune.ascx.cs	19 Jan 2007 13:16:17 -0000	1.13
***************
*** 27,30 ****
--- 27,32 ----
  using System.Web.UI.WebControls;
  using System.Web.UI.HtmlControls;
+ using YAF.Classes.Utils;
+ using YAF.Classes.Data;
  
  namespace YAF.Pages.Admin
***************
*** 33,37 ****
  	/// Summary description for prune.
  	/// </summary>
! 	public partial class prune : AdminPage
  	{
  
--- 35,39 ----
  	/// Summary description for prune.
  	/// </summary>
! 	public partial class prune : YAF.Classes.Base.AdminPage
  	{
  
***************
*** 39,44 ****
  		{
  			if(!IsPostBack) {
! 				PageLinks.AddLink(BoardSettings.Name,Forum.GetLink( ForumPages.forum));
! 				PageLinks.AddLink("Administration",Forum.GetLink( ForumPages.admin_admin));
  				PageLinks.AddLink("Prune","");
  
--- 41,46 ----
  		{
  			if(!IsPostBack) {
! 				PageLinks.AddLink(PageContext.BoardSettings.Name,YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.forum));
! 				PageLinks.AddLink("Administration",YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.admin_admin));
  				PageLinks.AddLink("Prune","");
  
***************
*** 49,53 ****
  
  		private void BindData() {
! 			forumlist.DataSource = YAF.Classes.Data.DB.forum_listread(PageBoardID,PageUserID,null,null);
  			forumlist.DataValueField = "ForumID";
  			forumlist.DataTextField = "Forum";
--- 51,55 ----
  
  		private void BindData() {
! 			forumlist.DataSource = YAF.Classes.Data.DB.forum_listread(PageContext.PageBoardID,PageContext.PageUserID,null,null);
  			forumlist.DataValueField = "ForumID";
  			forumlist.DataTextField = "Forum";
***************
*** 58,62 ****
  		private void commit_Click(object sender,EventArgs e) {
  			int Count = YAF.Classes.Data.DB.topic_prune(forumlist.SelectedValue,days.Text);
! 			AddLoadMessage(String.Format("{0} topic(s) deleted.",Count));
  		}
  
--- 60,64 ----
  		private void commit_Click(object sender,EventArgs e) {
  			int Count = YAF.Classes.Data.DB.topic_prune(forumlist.SelectedValue,days.Text);
! 			PageContext.AddLoadMessage(String.Format("{0} topic(s) deleted.",Count));
  		}
  

Index: editnntpserver.ascx.cs
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/admin/editnntpserver.ascx.cs,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** editnntpserver.ascx.cs	14 Dec 2006 17:19:46 -0000	1.12
--- editnntpserver.ascx.cs	19 Jan 2007 13:16:17 -0000	1.13
***************
*** 27,30 ****
--- 27,32 ----
  using System.Web.UI.WebControls;
  using System.Web.UI.HtmlControls;
+ using YAF.Classes.Utils;
+ using YAF.Classes.Data;
  
  namespace YAF.Pages.Admin
***************
*** 33,37 ****
  	/// Summary description for editgroup.
  	/// </summary>
! 	public partial class editnntpserver : AdminPage
  	{
  
--- 35,39 ----
  	/// Summary description for editgroup.
  	/// </summary>
! 	public partial class editnntpserver : YAF.Classes.Base.AdminPage
  	{
  
***************
*** 40,45 ****
  			if(!IsPostBack) 
  			{
! 				PageLinks.AddLink(BoardSettings.Name,Forum.GetLink( ForumPages.forum));
! 				PageLinks.AddLink("Administration",Forum.GetLink( ForumPages.admin_admin));
  				PageLinks.AddLink("NNTP Servers","");
  
--- 42,47 ----
  			if(!IsPostBack) 
  			{
! 				PageLinks.AddLink(PageContext.BoardSettings.Name,YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.forum));
! 				PageLinks.AddLink("Administration",YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.admin_admin));
  				PageLinks.AddLink("NNTP Servers","");
  
***************
*** 47,51 ****
  				if(Request.QueryString["s"] != null) 
  				{
! 					using(DataTable dt = YAF.Classes.Data.DB.nntpserver_list(PageBoardID,Request.QueryString["s"]))
  					{
  						DataRow row = dt.Rows[0];
--- 49,53 ----
  				if(Request.QueryString["s"] != null) 
  				{
! 					using(DataTable dt = YAF.Classes.Data.DB.nntpserver_list(PageContext.PageBoardID,Request.QueryString["s"]))
  					{
  						DataRow row = dt.Rows[0];
***************
*** 90,94 ****
  		protected void Cancel_Click(object sender, System.EventArgs e)
  		{
! 			Forum.Redirect( ForumPages.admin_nntpservers);
  		}
  
--- 92,96 ----
  		protected void Cancel_Click(object sender, System.EventArgs e)
  		{
! 			YAF.Classes.Utils.yaf_BuildLink.Redirect( YAF.Classes.Utils.ForumPages.admin_nntpservers);
  		}
  
***************
*** 97,106 ****
  			if(Name.Text.Trim().Length==0) 
  			{
! 				AddLoadMessage("Missing server name.");
  				return;
  			}
  			if(Address.Text.Trim().Length==0) 
  			{
! 				AddLoadMessage("Missing server address.");
  				return;
  			}
--- 99,108 ----
  			if(Name.Text.Trim().Length==0) 
  			{
! 				PageContext.AddLoadMessage("Missing server name.");
  				return;
  			}
  			if(Address.Text.Trim().Length==0) 
  			{
! 				PageContext.AddLoadMessage("Missing server address.");
  				return;
  			}
***************
*** 108,113 ****
  			object nntpServerID = null;
  			if(Request.QueryString["s"]!=null) nntpServerID = Request.QueryString["s"];
! 			YAF.Classes.Data.DB.nntpserver_save(nntpServerID,PageBoardID,Name.Text,Address.Text,Port.Text.Length>0 ? Port.Text : null,UserName.Text.Length>0 ? UserName.Text : null,UserPass.Text.Length>0 ? UserPass.Text : null);
! 			Forum.Redirect( ForumPages.admin_nntpservers);
  		}
  	}
--- 110,115 ----
  			object nntpServerID = null;
  			if(Request.QueryString["s"]!=null) nntpServerID = Request.QueryString["s"];
! 			YAF.Classes.Data.DB.nntpserver_save(nntpServerID,PageContext.PageBoardID,Name.Text,Address.Text,Port.Text.Length>0 ? Port.Text : null,UserName.Text.Length>0 ? UserName.Text : null,UserPass.Text.Length>0 ? UserPass.Text : null);
! 			YAF.Classes.Utils.yaf_BuildLink.Redirect( YAF.Classes.Utils.ForumPages.admin_nntpservers);
  		}
  	}

Index: bannedip_edit.ascx.cs
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/admin/bannedip_edit.ascx.cs,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** bannedip_edit.ascx.cs	14 Dec 2006 17:19:46 -0000	1.10
--- bannedip_edit.ascx.cs	19 Jan 2007 13:16:17 -0000	1.11
***************
*** 27,30 ****
--- 27,32 ----
  using System.Web.UI.WebControls;
  using System.Web.UI.HtmlControls;
+ using YAF.Classes.Utils;
+ using YAF.Classes.Data;
  
  namespace YAF.Pages.Admin
***************
*** 33,37 ****
  	/// Summary description for bannedip_edit.
  	/// </summary>
! 	public partial class bannedip_edit : AdminPage
  	{
  
--- 35,39 ----
  	/// Summary description for bannedip_edit.
  	/// </summary>
! 	public partial class bannedip_edit : YAF.Classes.Base.AdminPage
  	{
  
***************
*** 39,45 ****
  		{
  			if(!IsPostBack) {
! 				PageLinks.AddLink(BoardSettings.Name,Forum.GetLink( ForumPages.forum));
! 				PageLinks.AddLink("Administration",Forum.GetLink( ForumPages.admin_admin));
! 				PageLinks.AddLink("Banned IP Addresses",Forum.GetLink( ForumPages.admin_bannedip));
  
  				BindData();
--- 41,47 ----
  		{
  			if(!IsPostBack) {
! 				PageLinks.AddLink(PageContext.BoardSettings.Name,YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.forum));
! 				PageLinks.AddLink("Administration",YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.admin_admin));
! 				PageLinks.AddLink("Banned IP Addresses",YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.admin_bannedip));
  
  				BindData();
***************
*** 49,53 ****
  		private void BindData() {
  			if(Request.QueryString["i"] != null) {
! 				DataRow row = YAF.Classes.Data.DB.bannedip_list(PageBoardID,Request.QueryString["i"]).Rows[0];
  				mask.Text = (string)row["Mask"];
  			}
--- 51,55 ----
  		private void BindData() {
  			if(Request.QueryString["i"] != null) {
! 				DataRow row = YAF.Classes.Data.DB.bannedip_list(PageContext.PageBoardID,Request.QueryString["i"]).Rows[0];
  				mask.Text = (string)row["Mask"];
  			}
***************
*** 57,70 ****
  			String[] ip = mask.Text.Split('.');
  			if(ip.Length!=4) {
! 				AddLoadMessage("Invalid ip address.");
  				return;
  			}
! 			YAF.Classes.Data.DB.bannedip_save(Request.QueryString["i"],PageBoardID,mask.Text);
  			Cache.Remove("bannedip");
! 			Forum.Redirect( ForumPages.admin_bannedip);
  		}
  
  		private void cancel_Click(object sender,EventArgs e) {
! 			Forum.Redirect( ForumPages.admin_bannedip);
  		}
  
--- 59,72 ----
  			String[] ip = mask.Text.Split('.');
  			if(ip.Length!=4) {
! 				PageContext.AddLoadMessage("Invalid ip address.");
  				return;
  			}
! 			YAF.Classes.Data.DB.bannedip_save(Request.QueryString["i"],PageContext.PageBoardID,mask.Text);
  			Cache.Remove("bannedip");
! 			YAF.Classes.Utils.yaf_BuildLink.Redirect( YAF.Classes.Utils.ForumPages.admin_bannedip);
  		}
  
  		private void cancel_Click(object sender,EventArgs e) {
! 			YAF.Classes.Utils.yaf_BuildLink.Redirect( YAF.Classes.Utils.ForumPages.admin_bannedip);
  		}
  

Index: attachments.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/admin/attachments.ascx,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** attachments.ascx	14 Dec 2006 17:19:45 -0000	1.8
--- attachments.ascx	19 Jan 2007 13:16:17 -0000	1.9
***************
*** 27,32 ****
  	<ItemTemplate>
  		<tr class=post>
! 			<td><a target="_top" href='<%# YAF.Forum.GetLink(YAF.ForumPages.topics,"f={0}",Eval("ForumID")) %>'><%# Eval("ForumName") %></a></td>
! 			<td><a target="_top" href='<%# YAF.Forum.GetLink(YAF.ForumPages.posts,"t={0}",Eval("TopicID")) %>'><%# Eval("TopicName") %></a></td>
  			<td><%# FormatDateTimeShort(Eval( "Posted")) %></td>
  			<td><%# Eval( "FileName") %></td>
--- 27,32 ----
  	<ItemTemplate>
  		<tr class=post>
! 			<td><a target="_top" href='<%# YAF.Classes.Utils.yaf_BuildLink.GetLink(YAF.Classes.Utils.ForumPages.topics,"f={0}",Eval("ForumID")) %>'><%# Eval("ForumName") %></a></td>
! 			<td><a target="_top" href='<%# YAF.Classes.Utils.yaf_BuildLink.GetLink(YAF.Classes.Utils.ForumPages.posts,"t={0}",Eval("TopicID")) %>'><%# Eval("TopicName") %></a></td>
  			<td><%# FormatDateTimeShort(Eval( "Posted")) %></td>
  			<td><%# Eval( "FileName") %></td>

Index: boards.ascx.cs
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/admin/boards.ascx.cs,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** boards.ascx.cs	14 Dec 2006 17:19:46 -0000	1.12
--- boards.ascx.cs	19 Jan 2007 13:16:17 -0000	1.13
***************
*** 27,30 ****
--- 27,32 ----
  using System.Web.UI.WebControls;
  using System.Web.UI.HtmlControls;
+ using YAF.Classes.Utils;
+ using YAF.Classes.Data;
  
  namespace YAF.Pages.Admin
***************
*** 33,48 ****
  	/// Summary description for members.
  	/// </summary>
! 	public partial class boards : AdminPage
  	{
  	
  		protected void Page_Load(object sender, System.EventArgs e)
  		{
! 			if(!IsHostAdmin)
! 				Data.AccessDenied();
  
  			if(!IsPostBack) 
  			{
! 				PageLinks.AddLink(BoardSettings.Name,Forum.GetLink( ForumPages.forum));
! 				PageLinks.AddLink("Administration",Forum.GetLink( ForumPages.admin_admin));
  				PageLinks.AddLink("Boards","");
  
--- 35,50 ----
  	/// Summary description for members.
  	/// </summary>
! 	public partial class boards : YAF.Classes.Base.AdminPage
  	{
  	
  		protected void Page_Load(object sender, System.EventArgs e)
  		{
! 			if(!PageContext.IsHostAdmin)
! 				yaf_BuildLink.AccessDenied();
  
  			if(!IsPostBack) 
  			{
! 				PageLinks.AddLink(PageContext.BoardSettings.Name,YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.forum));
! 				PageLinks.AddLink("Administration",YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.admin_admin));
  				PageLinks.AddLink("Boards","");
  
***************
*** 76,80 ****
  		private void New_Click(object sender,EventArgs e) 
  		{
! 			Forum.Redirect( ForumPages.admin_editboard);
  		}
  
--- 78,82 ----
  		private void New_Click(object sender,EventArgs e) 
  		{
! 			YAF.Classes.Utils.yaf_BuildLink.Redirect( YAF.Classes.Utils.ForumPages.admin_editboard);
  		}
  
***************
*** 82,86 ****
  			switch(e.CommandName) {
  				case "edit":
! 					Forum.Redirect( ForumPages.admin_editboard,"b={0}",e.CommandArgument);
  					break;
  				case "delete":
--- 84,88 ----
  			switch(e.CommandName) {
  				case "edit":
! 					YAF.Classes.Utils.yaf_BuildLink.Redirect( YAF.Classes.Utils.ForumPages.admin_editboard,"b={0}",e.CommandArgument);
  					break;
  				case "delete":

Index: nntpretrieve.ascx.cs
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/admin/nntpretrieve.ascx.cs,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** nntpretrieve.ascx.cs	14 Dec 2006 17:19:47 -0000	1.14
--- nntpretrieve.ascx.cs	19 Jan 2007 13:16:17 -0000	1.15
***************
*** 27,30 ****
--- 27,32 ----
  using System.Web.UI.WebControls;
  using System.Web.UI.HtmlControls;
+ using YAF.Classes.Utils;
+ using YAF.Classes.Data;
  
  namespace YAF.Pages.Admin
***************
*** 33,37 ****
  	/// Summary description for ranks.
  	/// </summary>
! 	public partial class nntpretrieve : AdminPage
  	{
  
--- 35,39 ----
  	/// Summary description for ranks.
  	/// </summary>
! 	public partial class nntpretrieve : YAF.Classes.Base.AdminPage
  	{
  
***************
*** 40,45 ****
  			if(!IsPostBack) 
  			{
! 				PageLinks.AddLink(BoardSettings.Name,Forum.GetLink( ForumPages.forum));
! 				PageLinks.AddLink("Administration",Forum.GetLink( ForumPages.admin_admin));
  				PageLinks.AddLink("NNTP Retrieve","");
  
--- 42,47 ----
  			if(!IsPostBack) 
  			{
! 				PageLinks.AddLink(PageContext.BoardSettings.Name,YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.forum));
! 				PageLinks.AddLink("Administration",YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.admin_admin));
  				PageLinks.AddLink("NNTP Retrieve","");
  
***************
*** 50,54 ****
  		private void BindData()
  		{
! 			List.DataSource = YAF.Classes.Data.DB.nntpforum_list(PageBoardID,10,null,true);
  			DataBind();
  		}
--- 52,56 ----
  		private void BindData()
  		{
! 			List.DataSource = YAF.Classes.Data.DB.nntpforum_list(PageContext.PageBoardID,10,null,true);
  			DataBind();
  		}
***************
*** 78,83 ****
  			int nSeconds = int.Parse(Seconds.Text);
  			if(nSeconds<1) nSeconds = 1;
! 			int nArticleCount = Classes.Nntp.ReadArticles(PageBoardID,10,nSeconds,BoardSettings.CreateNntpUsers);
! 			AddLoadMessage(String.Format("Retrieved {0} articles. {1:N2} articles per second.",nArticleCount,(double)nArticleCount/nSeconds));
  			BindData();
  		}
--- 80,85 ----
  			int nSeconds = int.Parse(Seconds.Text);
  			if(nSeconds<1) nSeconds = 1;
! 			int nArticleCount = Classes.Nntp.ReadArticles(PageContext.PageBoardID,10,nSeconds,PageContext.BoardSettings.CreateNntpUsers);
! 			PageContext.AddLoadMessage(String.Format("Retrieved {0} articles. {1:N2} articles per second.",nArticleCount,(double)nArticleCount/nSeconds));
  			BindData();
  		}

Index: mail.ascx.cs
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/admin/mail.ascx.cs,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** mail.ascx.cs	14 Dec 2006 17:19:47 -0000	1.11
--- mail.ascx.cs	19 Jan 2007 13:16:17 -0000	1.12
***************
*** 27,30 ****
--- 27,32 ----
  using System.Web.UI.WebControls;
  using System.Web.UI.HtmlControls;
+ using YAF.Classes.Utils;
+ using YAF.Classes.Data;
  
  namespace YAF.Pages.Admin
***************
*** 33,37 ****
  	/// Summary description for mail.
  	/// </summary>
! 	public partial class mail : AdminPage
  	{
  	
--- 35,39 ----
  	/// Summary description for mail.
  	/// </summary>
! 	public partial class mail : YAF.Classes.Base.AdminPage
  	{
  	
***************
*** 40,45 ****
  			if(!IsPostBack) 
  			{
! 				PageLinks.AddLink(BoardSettings.Name,Forum.GetLink( ForumPages.forum));
! 				PageLinks.AddLink("Administration",Forum.GetLink( ForumPages.admin_admin));
  				PageLinks.AddLink("Mail","");
  
--- 42,47 ----
  			if(!IsPostBack) 
  			{
! 				PageLinks.AddLink(PageContext.BoardSettings.Name,YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.forum));
! 				PageLinks.AddLink("Administration",YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.admin_admin));
  				PageLinks.AddLink("Mail","");
  
***************
*** 49,53 ****
  
  		private void BindData() {
! 			ToList.DataSource = YAF.Classes.Data.DB.group_list(PageBoardID,null);
  			DataBind();
  
--- 51,55 ----
  
  		private void BindData() {
! 			ToList.DataSource = YAF.Classes.Data.DB.group_list(PageContext.PageBoardID,null);
  			DataBind();
  
***************
*** 81,93 ****
  				GroupID = ToList.SelectedValue;
  
! 			using(DataTable dt = YAF.Classes.Data.DB.user_emails(PageBoardID,GroupID)) 
  			{
  				foreach(DataRow row in dt.Rows)
  					//  Build a MailMessage
! 					Utils.SendMail(this,BoardSettings.ForumEmail,(string)row["Email"],Subject.Text,Body.Text);
  			}
  			Subject.Text = "";
  			Body.Text = "";
! 			AddLoadMessage("Mails sent.");
  		}
  	}
--- 83,95 ----
  				GroupID = ToList.SelectedValue;
  
! 			using(DataTable dt = YAF.Classes.Data.DB.user_emails(PageContext.PageBoardID,GroupID)) 
  			{
  				foreach(DataRow row in dt.Rows)
  					//  Build a MailMessage
! 					General.SendMail(PageContext.BoardSettings.ForumEmail,(string)row["Email"],Subject.Text,Body.Text);
  			}
  			Subject.Text = "";
  			Body.Text = "";
! 			PageContext.AddLoadMessage("Mails sent.");
  		}
  	}

Index: pm.ascx.cs
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/admin/pm.ascx.cs,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** pm.ascx.cs	14 Dec 2006 17:19:47 -0000	1.11
--- pm.ascx.cs	19 Jan 2007 13:16:17 -0000	1.12
***************
*** 27,30 ****
--- 27,32 ----
  using System.Web.UI.WebControls;
  using System.Web.UI.HtmlControls;
+ using YAF.Classes.Utils;
+ using YAF.Classes.Data;
  
  namespace YAF.Pages.Admin
***************
*** 33,37 ****
  	/// Summary description for prune.
  	/// </summary>
! 	public partial class pm : AdminPage
  	{
  
--- 35,39 ----
  	/// Summary description for prune.
  	/// </summary>
! 	public partial class pm : YAF.Classes.Base.AdminPage
  	{
  
***************
*** 39,44 ****
  		{
  			if(!IsPostBack) {
! 				PageLinks.AddLink(BoardSettings.Name,Forum.GetLink( ForumPages.forum));
! 				PageLinks.AddLink("Administration",Forum.GetLink( ForumPages.admin_admin));
  				PageLinks.AddLink("PM Maintenance","");
  
--- 41,46 ----
  		{
  			if(!IsPostBack) {
! 				PageLinks.AddLink(PageContext.BoardSettings.Name,YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.forum));
! 				PageLinks.AddLink("Administration",YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.admin_admin));
  				PageLinks.AddLink("PM Maintenance","");
  

Index: editforum.ascx.cs
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/admin/editforum.ascx.cs,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** editforum.ascx.cs	14 Dec 2006 17:19:46 -0000	1.19
--- editforum.ascx.cs	19 Jan 2007 13:16:17 -0000	1.20
***************
*** 27,30 ****
--- 27,32 ----
  using System.Web.UI.WebControls;
  using System.Web.UI.HtmlControls;
+ using YAF.Classes.Utils;
+ using YAF.Classes.Data;
  
  namespace YAF.Pages.Admin
***************
*** 33,37 ****
  	/// Administrative Page for the editting of forum properties.
  	/// </summary>
! 	public partial class editforum : AdminPage
  	{
  
--- 35,39 ----
  	/// Administrative Page for the editting of forum properties.
  	/// </summary>
! 	public partial class editforum : YAF.Classes.Base.AdminPage
  	{
  
***************
*** 40,45 ****
  			if ( !IsPostBack )
  			{
! 				PageLinks.AddLink( BoardSettings.Name, Forum.GetLink( ForumPages.forum ) );
! 				PageLinks.AddLink( "Administration", Forum.GetLink( ForumPages.admin_admin ) );
  				PageLinks.AddLink( "Forums", "" );
  
--- 42,47 ----
  			if ( !IsPostBack )
  			{
! 				PageLinks.AddLink( PageContext.BoardSettings.Name, YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.forum ) );
! 				PageLinks.AddLink( "Administration", YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.admin_admin ) );
  				PageLinks.AddLink( "Forums", "" );
  
***************
*** 47,51 ****
  				if ( Request.QueryString ["f"] != null )
  				{
! 					using ( DataTable dt = YAF.Classes.Data.DB.forum_list( PageBoardID, Request.QueryString ["f"] ) )
  					{
  						DataRow row = dt.Rows [0];
--- 49,53 ----
  				if ( Request.QueryString ["f"] != null )
  				{
! 					using ( DataTable dt = YAF.Classes.Data.DB.forum_list( PageContext.PageBoardID, Request.QueryString ["f"] ) )
  					{
  						DataRow row = dt.Rows [0];
***************
*** 75,79 ****
  		{
  			int ForumID = 0;
! 			CategoryList.DataSource = YAF.Classes.Data.DB.category_list( PageBoardID, null );
  			CategoryList.DataBind();
  
--- 77,81 ----
  		{
  			int ForumID = 0;
! 			CategoryList.DataSource = YAF.Classes.Data.DB.category_list( PageContext.PageBoardID, null );
  			CategoryList.DataBind();
  
***************
*** 86,90 ****
  
  			// Load forum's combo
! 			ParentList.DataSource = YAF.Classes.Data.DB.forum_listall_fromCat( PageBoardID, CategoryList.SelectedValue );
  			ParentList.DataValueField = "ForumID";
  			ParentList.DataTextField = "Title";
--- 88,92 ----
  
  			// Load forum's combo
! 			ParentList.DataSource = YAF.Classes.Data.DB.forum_listall_fromCat( PageContext.PageBoardID, CategoryList.SelectedValue );
  			ParentList.DataValueField = "ForumID";
  			ParentList.DataTextField = "Title";
***************
*** 98,102 ****
  			AccessMaskID.DataBind();
  
! 			ThemeList.DataSource = Data.Themes();
  			ThemeList.DataTextField = "Theme";
  			ThemeList.DataValueField = "FileName";
--- 100,104 ----
  			AccessMaskID.DataBind();
  
! 			ThemeList.DataSource = yaf_StaticData.Themes();
  			ThemeList.DataTextField = "Theme";
  			ThemeList.DataValueField = "FileName";
***************
*** 107,111 ****
  		public void Category_Change( object sender, System.EventArgs e )
  		{
! 			ParentList.DataSource = YAF.Classes.Data.DB.forum_listall_fromCat( PageBoardID, CategoryList.SelectedValue );
  			ParentList.DataValueField = "ForumID";
  			ParentList.DataTextField = "Title";
--- 109,113 ----
  		public void Category_Change( object sender, System.EventArgs e )
  		{
! 			ParentList.DataSource = YAF.Classes.Data.DB.forum_listall_fromCat( PageContext.PageBoardID, CategoryList.SelectedValue );
  			ParentList.DataValueField = "ForumID";
  			ParentList.DataTextField = "Title";
***************
*** 125,144 ****
  			if ( CategoryList.SelectedValue.Trim().Length == 0 )
  			{
! 				AddLoadMessage( "You must select a category for the forum." );
  				return;
  			}
  			if ( Name.Text.Trim().Length == 0 )
  			{
! 				AddLoadMessage( "You must enter a name for the forum." );
  				return;
  			}
  			if ( Description.Text.Trim().Length == 0 )
  			{
! 				AddLoadMessage( "You must enter a description for the forum." );
  				return;
  			}
  			if ( SortOrder.Text.Trim().Length == 0 )
  			{
! 				AddLoadMessage( "You must enter a value for sort order." );
  				return;
  			}
--- 127,146 ----
  			if ( CategoryList.SelectedValue.Trim().Length == 0 )
  			{
! 				PageContext.AddLoadMessage( "You must select a category for the forum." );
  				return;
  			}
  			if ( Name.Text.Trim().Length == 0 )
  			{
! 				PageContext.AddLoadMessage( "You must enter a name for the forum." );
  				return;
  			}
  			if ( Description.Text.Trim().Length == 0 )
  			{
! 				PageContext.AddLoadMessage( "You must enter a description for the forum." );
  				return;
  			}
  			if ( SortOrder.Text.Trim().Length == 0 )
  			{
! 				PageContext.AddLoadMessage( "You must enter a value for sort order." );
  				return;
  			}
***************
*** 152,156 ****
  			else if ( AccessMaskID.SelectedValue.Length == 0 )
  			{
! 				AddLoadMessage( "You must select an initial access mask for the forum." );
  				return;
  			}
--- 154,158 ----
  			else if ( AccessMaskID.SelectedValue.Length == 0 )
  			{
! 				PageContext.AddLoadMessage( "You must select an initial access mask for the forum." );
  				return;
  			}
***************
*** 175,193 ****
  					YAF.Classes.Data.DB.forumaccess_save( ForumID, GroupID, ( ( DropDownList ) item.FindControl( "AccessmaskID" ) ).SelectedValue );
  				}
! 				Forum.Redirect( ForumPages.admin_forums );
  			}
  
  			// Done
! 			Forum.Redirect( ForumPages.admin_editforum, "f={0}", ForumID );
  		}
  
  		private void Cancel_Click( object sender, System.EventArgs e )
  		{
! 			Forum.Redirect( ForumPages.admin_forums );
  		}
  
  		protected void BindData_AccessMaskID( object sender, System.EventArgs e )
  		{
! 			( ( DropDownList ) sender ).DataSource = YAF.Classes.Data.DB.accessmask_list( PageBoardID, null );
  			( ( DropDownList ) sender ).DataValueField = "AccessMaskID";
  			( ( DropDownList ) sender ).DataTextField = "Name";
--- 177,195 ----
  					YAF.Classes.Data.DB.forumaccess_save( ForumID, GroupID, ( ( DropDownList ) item.FindControl( "AccessmaskID" ) ).SelectedValue );
  				}
! 				YAF.Classes.Utils.yaf_BuildLink.Redirect( YAF.Classes.Utils.ForumPages.admin_forums );
  			}
  
  			// Done
! 			YAF.Classes.Utils.yaf_BuildLink.Redirect( YAF.Classes.Utils.ForumPages.admin_editforum, "f={0}", ForumID );
  		}
  
  		private void Cancel_Click( object sender, System.EventArgs e )
  		{
! 			YAF.Classes.Utils.yaf_BuildLink.Redirect( YAF.Classes.Utils.ForumPages.admin_forums );
  		}
  
  		protected void BindData_AccessMaskID( object sender, System.EventArgs e )
  		{
! 			( ( DropDownList ) sender ).DataSource = YAF.Classes.Data.DB.accessmask_list( PageContext.PageBoardID, null );
  			( ( DropDownList ) sender ).DataValueField = "AccessMaskID";
  			( ( DropDownList ) sender ).DataTextField = "Name";

Index: ranks.ascx.cs
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/admin/ranks.ascx.cs,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** ranks.ascx.cs	14 Dec 2006 17:19:48 -0000	1.12
--- ranks.ascx.cs	19 Jan 2007 13:16:17 -0000	1.13
***************
*** 27,30 ****
--- 27,32 ----
  using System.Web.UI.WebControls;
  using System.Web.UI.HtmlControls;
+ using YAF.Classes.Utils;
+ using YAF.Classes.Data;
  
  namespace YAF.Pages.Admin
***************
*** 33,37 ****
  	/// Summary description for ranks.
  	/// </summary>
! 	public partial class ranks : AdminPage
  	{
  
--- 35,39 ----
  	/// Summary description for ranks.
  	/// </summary>
! 	public partial class ranks : YAF.Classes.Base.AdminPage
  	{
  
***************
*** 40,45 ****
  			if(!IsPostBack) 
  			{
! 				PageLinks.AddLink(BoardSettings.Name,Forum.GetLink( ForumPages.forum));
! 				PageLinks.AddLink("Administration",Forum.GetLink( ForumPages.admin_admin));
  				PageLinks.AddLink("Ranks","");
  
--- 42,47 ----
  			if(!IsPostBack) 
  			{
! 				PageLinks.AddLink(PageContext.BoardSettings.Name,YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.forum));
! 				PageLinks.AddLink("Administration",YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.admin_admin));
  				PageLinks.AddLink("Ranks","");
  
***************
*** 76,80 ****
  		private void BindData() 
  		{
! 			RankList.DataSource = YAF.Classes.Data.DB.rank_list(PageBoardID,null);
  			DataBind();
  		}
--- 78,82 ----
  		private void BindData() 
  		{
! 			RankList.DataSource = YAF.Classes.Data.DB.rank_list(PageContext.PageBoardID,null);
  			DataBind();
  		}
***************
*** 85,89 ****
  			{
  				case "edit":
! 					Forum.Redirect( ForumPages.admin_editrank,"r={0}",e.CommandArgument);
  					break;
  				case "delete":
--- 87,91 ----
  			{
  				case "edit":
! 					YAF.Classes.Utils.yaf_BuildLink.Redirect( YAF.Classes.Utils.ForumPages.admin_editrank,"r={0}",e.CommandArgument);
  					break;
  				case "delete":
***************
*** 96,100 ****
  		protected void NewRank_Click(object sender, System.EventArgs e)
  		{
! 			Forum.Redirect( ForumPages.admin_editrank);
  		}
  
--- 98,102 ----
  		protected void NewRank_Click(object sender, System.EventArgs e)
  		{
! 			YAF.Classes.Utils.yaf_BuildLink.Redirect( YAF.Classes.Utils.ForumPages.admin_editrank);
  		}
  

Index: edituser.ascx.cs
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/admin/edituser.ascx.cs,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** edituser.ascx.cs	14 Dec 2006 17:19:47 -0000	1.16
--- edituser.ascx.cs	19 Jan 2007 13:16:17 -0000	1.17
***************
*** 28,31 ****
--- 28,33 ----
  using System.Web.UI.HtmlControls;
  using System.Web.Security;
+ using YAF.Classes.Utils;
+ using YAF.Classes.Data;
  
  namespace YAF.Pages.Admin
***************
*** 34,38 ****
  	/// Summary description for edituser.
  	/// </summary>
! 	public partial class edituser : AdminPage
  	{
  		protected void Page_Load( object sender, System.EventArgs e )
--- 36,40 ----
  	/// Summary description for edituser.
  	/// </summary>
! 	public partial class edituser : YAF.Classes.Base.AdminPage
  	{
  		protected void Page_Load( object sender, System.EventArgs e )
***************
*** 46,57 ****
  			{
  				if ( Request.QueryString ["u"] != null )
! 					if ( !IsHostAdmin && IsUserHostAdmin( Convert.ToInt32( Request.QueryString ["u"] ) ) )
  					{
! 						Data.AccessDenied();
  					}
  
! 				PageLinks.AddLink( BoardSettings.Name, Forum.GetLink( ForumPages.forum ) );
! 				PageLinks.AddLink( "Administration", Forum.GetLink( ForumPages.admin_admin ) );
! 				PageLinks.AddLink( "Users", Forum.GetLink( ForumPages.admin_users ) );
  				PageLinks.AddLink( "Edit", "" );
  
--- 48,60 ----
  			{
  				if ( Request.QueryString ["u"] != null )
! 					// TODO: write the IsUserHostAdmin function
! 					if ( !PageContext.IsHostAdmin ) // && IsUserHostAdmin( Convert.ToInt32( Request.QueryString ["u"] ) ) ) 
  					{
! 						yaf_BuildLink.AccessDenied();
  					}
  
! 				PageLinks.AddLink( PageContext.BoardSettings.Name, YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.forum ) );
! 				PageLinks.AddLink( "Administration", YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.admin_admin ) );
! 				PageLinks.AddLink( "Users", YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.admin_users ) );
  				PageLinks.AddLink( "Edit", "" );
  
***************
*** 96,110 ****
  		{
  			UserAdminMultiView.SetActiveView( ProfileEditView );
!         }
!         protected void Edit4_Click(object sender, System.EventArgs e)
!         {
!             UserAdminMultiView.SetActiveView(SignatureEditView);
!         }
!         protected void Edit5_Click(object sender, System.EventArgs e)
!         {
!             UserAdminMultiView.SetActiveView(SuspendUserView);
!         }
!         protected void Edit6_Click(object sender, System.EventArgs e)
!         {
  			UserAdminMultiView.SetActiveView( UserPointsView );
  		}
--- 99,113 ----
  		{
  			UserAdminMultiView.SetActiveView( ProfileEditView );
! 		}
! 		protected void Edit4_Click( object sender, System.EventArgs e )
! 		{
! 			UserAdminMultiView.SetActiveView( SignatureEditView );
! 		}
! 		protected void Edit5_Click( object sender, System.EventArgs e )
! 		{
! 			UserAdminMultiView.SetActiveView( SuspendUserView );
! 		}
! 		protected void Edit6_Click( object sender, System.EventArgs e )
! 		{
  			UserAdminMultiView.SetActiveView( UserPointsView );
  		}
***************
*** 112,116 ****
  		{
  			UserAdminMultiView.SetActiveView( AvatarEditView );
!         }
  
  		#region Web Form Designer generated code
--- 115,119 ----
  		{
  			UserAdminMultiView.SetActiveView( AvatarEditView );
! 		}
  
  		#region Web Form Designer generated code

Index: smilies.ascx.cs
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/admin/smilies.ascx.cs,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** smilies.ascx.cs	21 Dec 2006 16:01:57 -0000	1.12
--- smilies.ascx.cs	19 Jan 2007 13:16:18 -0000	1.13
***************
*** 8,11 ****
--- 8,13 ----
  using System.Web.UI.WebControls;
  using System.Web.UI.HtmlControls;
+ using YAF.Classes.Utils;
+ using YAF.Classes.Data;
  
  namespace YAF.Pages.Admin
***************
*** 14,18 ****
  	/// Summary description for smilies.
  	/// </summary>
! 	public partial class smilies : AdminPage
  	{
  
--- 16,20 ----
  	/// Summary description for smilies.
  	/// </summary>
! 	public partial class smilies : YAF.Classes.Base.AdminPage
  	{
  
***************
*** 21,26 ****
  			if(!IsPostBack) 
  			{
! 				PageLinks.AddLink(BoardSettings.Name,Forum.GetLink( ForumPages.forum));
! 				PageLinks.AddLink("Administration",Forum.GetLink( ForumPages.admin_admin));
  				PageLinks.AddLink("Smilies","");
  
--- 23,28 ----
  			if(!IsPostBack) 
  			{
! 				PageLinks.AddLink(PageContext.BoardSettings.Name,YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.forum));
! 				PageLinks.AddLink("Administration",YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.admin_admin));
  				PageLinks.AddLink("Smilies","");
  
***************
*** 42,46 ****
  		{
              Pager.PageSize = 15;
!             DataView dv = YAF.Classes.Data.DB.smiley_list(PageBoardID, null).DefaultView;
              Pager.Count = dv.Count;
              PagedDataSource pds = new PagedDataSource();
--- 44,48 ----
  		{
              Pager.PageSize = 15;
!             DataView dv = YAF.Classes.Data.DB.smiley_list(PageContext.PageBoardID, null).DefaultView;
              Pager.Count = dv.Count;
              PagedDataSource pds = new PagedDataSource();
***************
*** 58,65 ****
  			{
  				case "add":
! 					Forum.Redirect( ForumPages.admin_smilies_edit);
  					break;
  				case "edit":
! 					Forum.Redirect( ForumPages.admin_smilies_edit,"s={0}",e.CommandArgument);
  					break;
  				case "delete":
--- 60,67 ----
  			{
  				case "add":
! 					YAF.Classes.Utils.yaf_BuildLink.Redirect( YAF.Classes.Utils.ForumPages.admin_smilies_edit);
  					break;
  				case "edit":
! 					YAF.Classes.Utils.yaf_BuildLink.Redirect( YAF.Classes.Utils.ForumPages.admin_smilies_edit,"s={0}",e.CommandArgument);
  					break;
  				case "delete":
***************
*** 68,72 ****
  					break;
  				case "import":
! 					Forum.Redirect( ForumPages.admin_smilies_import);
  					break;
  			}
--- 70,74 ----
  					break;
  				case "import":
! 					YAF.Classes.Utils.yaf_BuildLink.Redirect( YAF.Classes.Utils.ForumPages.admin_smilies_import);
  					break;
  			}

Index: boardsettings.ascx.cs
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/admin/boardsettings.ascx.cs,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** boardsettings.ascx.cs	14 Dec 2006 17:19:46 -0000	1.15
--- boardsettings.ascx.cs	19 Jan 2007 13:16:17 -0000	1.16
***************
*** 28,31 ****
--- 28,33 ----
  using System.Web.UI.HtmlControls;
  using System.Globalization;
+ using YAF.Classes.Utils;
+ using YAF.Classes.Data;
  
  namespace YAF.Pages.Admin {
***************
*** 33,37 ****
  	/// Summary description for settings.
  	/// </summary>
! 	public partial class boardsettings : AdminPage
  	{
  	
--- 35,39 ----
  	/// Summary description for settings.
  	/// </summary>
! 	public partial class boardsettings : YAF.Classes.Base.AdminPage
  	{
  	
***************
*** 40,57 ****
  			if(!IsPostBack)
  			{
! 				PageLinks.AddLink(BoardSettings.Name,Forum.GetLink( ForumPages.forum));
! 				PageLinks.AddLink("Administration",Forum.GetLink( ForumPages.admin_admin));
  				PageLinks.AddLink("Board Settings","");
  
  				// create list boxes by populating datasources from Data class
! 				Theme.DataSource = Data.Themes();
  				Theme.DataTextField = "Theme";
  				Theme.DataValueField = "FileName";
  
! 				Language.DataSource = Data.Languages();
  				Language.DataTextField = "Language";
  				Language.DataValueField = "FileName";
  
! 				ShowTopic.DataSource = Data.TopicTimes();
  				ShowTopic.DataTextField = "TopicText";
  				ShowTopic.DataValueField = "TopicValue";
--- 42,59 ----
  			if(!IsPostBack)
  			{
! 				PageLinks.AddLink(PageContext.BoardSettings.Name,YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.forum));
! 				PageLinks.AddLink("Administration",YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.admin_admin));
  				PageLinks.AddLink("Board Settings","");
  
  				// create list boxes by populating datasources from Data class
! 				Theme.DataSource = yaf_StaticData.Themes();
  				Theme.DataTextField = "Theme";
  				Theme.DataValueField = "FileName";
  
! 				Language.DataSource = yaf_StaticData.Languages();
  				Language.DataTextField = "Language";
  				Language.DataValueField = "FileName";
  
! 				ShowTopic.DataSource = yaf_StaticData.TopicTimes();
  				ShowTopic.DataTextField = "TopicText";
  				ShowTopic.DataValueField = "TopicValue";
***************
*** 59,66 ****
  				BindData();
  				
! 				Theme.Items.FindByValue(BoardSettings.Theme).Selected = true;
! 				Language.Items.FindByValue(BoardSettings.Language).Selected = true;
! 				ShowTopic.Items.FindByValue(BoardSettings.ShowTopicsDefault.ToString()).Selected = true;
!                 AllowThemedLogo.Checked = BoardSettings.AllowThemedLogo;
  			}
  		}
--- 61,68 ----
  				BindData();
  				
! 				Theme.Items.FindByValue(PageContext.BoardSettings.Theme).Selected = true;
! 				Language.Items.FindByValue(PageContext.BoardSettings.Language).Selected = true;
! 				ShowTopic.Items.FindByValue(PageContext.BoardSettings.ShowTopicsDefault.ToString()).Selected = true;
!                 AllowThemedLogo.Checked = PageContext.BoardSettings.AllowThemedLogo;
  			}
  		}
***************
*** 69,73 ****
  		{
  			DataRow row;
! 			using(DataTable dt = YAF.Classes.Data.DB.board_list(PageBoardID))
  				row = dt.Rows[0];
  
--- 71,75 ----
  		{
  			DataRow row;
! 			using(DataTable dt = YAF.Classes.Data.DB.board_list(PageContext.PageBoardID))
  				row = dt.Rows[0];
  
***************
*** 99,115 ****
  		protected void Save_Click(object sender, System.EventArgs e)
  		{
!             YAF.Classes.Data.DB.board_save(PageBoardID, Name.Text, AllowThreaded.Checked);
  
! 			BoardSettings.Theme = Theme.SelectedValue;
! 			BoardSettings.Language = Language.SelectedValue;
! 			BoardSettings.ShowTopicsDefault = Convert.ToInt32(ShowTopic.SelectedValue);
!             BoardSettings.AllowThemedLogo = AllowThemedLogo.Checked;
  			/// save the settings to the database
! 			BoardSettings.SaveRegistry();
  
  			/// Reload forum settings
! 			BoardSettings = null;
  
! 			Forum.Redirect( ForumPages.admin_admin);
  		}
  	}
--- 101,117 ----
  		protected void Save_Click(object sender, System.EventArgs e)
  		{
!             YAF.Classes.Data.DB.board_save(PageContext.PageBoardID, Name.Text, AllowThreaded.Checked);
  
! 			PageContext.BoardSettings.Theme = Theme.SelectedValue;
! 			PageContext.BoardSettings.Language = Language.SelectedValue;
! 			PageContext.BoardSettings.ShowTopicsDefault = Convert.ToInt32(ShowTopic.SelectedValue);
!             PageContext.BoardSettings.AllowThemedLogo = AllowThemedLogo.Checked;
  			/// save the settings to the database
! 			PageContext.BoardSettings.SaveRegistry();
  
  			/// Reload forum settings
! 			PageContext.BoardSettings = null;
  
! 			YAF.Classes.Utils.yaf_BuildLink.Redirect( YAF.Classes.Utils.ForumPages.admin_admin);
  		}
  	}

Index: replacewords_edit.ascx.cs
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/admin/replacewords_edit.ascx.cs,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** replacewords_edit.ascx.cs	14 Dec 2006 17:19:48 -0000	1.10
--- replacewords_edit.ascx.cs	19 Jan 2007 13:16:18 -0000	1.11
***************
*** 27,30 ****
--- 27,32 ----
  using System.Web.UI.WebControls;
  using System.Web.UI.HtmlControls;
+ using YAF.Classes.Utils;
+ using YAF.Classes.Data;
  
  namespace YAF.Pages.Admin
***************
*** 33,37 ****
  	/// Summary description for bannedip_edit.
  	/// </summary>
! 	public partial class replacewords_edit : AdminPage
  	{
  
--- 35,39 ----
  	/// Summary description for bannedip_edit.
  	/// </summary>
! 	public partial class replacewords_edit : YAF.Classes.Base.AdminPage
  	{
  
***************
*** 42,47 ****
  			if(!IsPostBack) 
  			{
! 				PageLinks.AddLink(BoardSettings.Name,Forum.GetLink( ForumPages.forum));
! 				PageLinks.AddLink("Administration",Forum.GetLink( ForumPages.admin_admin));
  				PageLinks.AddLink(strAddEdit + " Word Replace","");
  
--- 44,49 ----
  			if(!IsPostBack) 
  			{
! 				PageLinks.AddLink(PageContext.BoardSettings.Name,YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.forum));
! 				PageLinks.AddLink("Administration",YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.admin_admin));
  				PageLinks.AddLink(strAddEdit + " Word Replace","");
  
***************
*** 66,75 ****
  			YAF.Classes.Data.DB.replace_words_save(Request.QueryString["i"],badword.Text,goodword.Text);
  			Cache.Remove("replacewords");
! 			Forum.Redirect( ForumPages.admin_replacewords);
  		}
  
  		private void cancel_Click(object sender,EventArgs e) 
  		{
! 			Forum.Redirect( ForumPages.admin_replacewords);
  		}
  
--- 68,77 ----
  			YAF.Classes.Data.DB.replace_words_save(Request.QueryString["i"],badword.Text,goodword.Text);
  			Cache.Remove("replacewords");
! 			YAF.Classes.Utils.yaf_BuildLink.Redirect( YAF.Classes.Utils.ForumPages.admin_replacewords);
  		}
  
  		private void cancel_Click(object sender,EventArgs e) 
  		{
! 			YAF.Classes.Utils.yaf_BuildLink.Redirect( YAF.Classes.Utils.ForumPages.admin_replacewords);
  		}
  

Index: smilies_edit.ascx.cs
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/admin/smilies_edit.ascx.cs,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** smilies_edit.ascx.cs	14 Dec 2006 17:19:48 -0000	1.15
--- smilies_edit.ascx.cs	19 Jan 2007 13:16:18 -0000	1.16
***************
*** 8,11 ****
--- 8,13 ----
  using System.Web.UI.WebControls;
  using System.Web.UI.HtmlControls;
+ using YAF.Classes.Utils;
+ using YAF.Classes.Data;
  
  namespace YAF.Pages.Admin
***************
*** 14,18 ****
  	/// Summary description for smilies_edit.
  	/// </summary>
! 	public partial class smilies_edit : AdminPage
  	{
  
--- 16,20 ----
  	/// Summary description for smilies_edit.
  	/// </summary>
! 	public partial class smilies_edit : YAF.Classes.Base.AdminPage
  	{
  
***************
*** 21,26 ****
  			if(!IsPostBack)
  			{
! 				PageLinks.AddLink(BoardSettings.Name,Forum.GetLink( ForumPages.forum));
! 				PageLinks.AddLink("Administration",Forum.GetLink( ForumPages.admin_admin));
  				PageLinks.AddLink("Smilies","");
  
--- 23,28 ----
  			if(!IsPostBack)
  			{
! 				PageLinks.AddLink(PageContext.BoardSettings.Name,YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.forum));
! 				PageLinks.AddLink("Administration",YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.admin_admin));
  				PageLinks.AddLink("Smilies","");
  
***************
*** 43,47 ****
  				dt.Rows.Add(dr);
  				
! 				System.IO.DirectoryInfo dir = new System.IO.DirectoryInfo(Request.MapPath(String.Format("{0}images/emoticons",Data.ForumRoot)));
  				System.IO.FileInfo[] files = dir.GetFiles("*.*");
  				long nFileID = 1;
--- 45,49 ----
  				dt.Rows.Add(dr);
  				
! 				System.IO.DirectoryInfo dir = new System.IO.DirectoryInfo(Request.MapPath(String.Format("{0}images/emoticons",yaf_ForumInfo.ForumRoot)));
  				System.IO.FileInfo[] files = dir.GetFiles("*.*");
  				long nFileID = 1;
***************
*** 67,71 ****
  			if(Request["s"]!=null) 
  			{
! 				using(DataTable dt = YAF.Classes.Data.DB.smiley_list(PageBoardID,Request.QueryString["s"])) 
  				{
  					if(dt.Rows.Count>0) 
--- 69,73 ----
  			if(Request["s"]!=null) 
  			{
! 				using(DataTable dt = YAF.Classes.Data.DB.smiley_list(PageContext.PageBoardID,Request.QueryString["s"])) 
  				{
  					if(dt.Rows.Count>0) 
***************
*** 74,78 ****
  						Emotion.Text = dt.Rows[0]["Emoticon"].ToString();
  						if (Icon.Items.FindByText(dt.Rows[0]["Icon"].ToString()) != null) Icon.Items.FindByText(dt.Rows[0]["Icon"].ToString()).Selected = true;
! 						Preview.Src = String.Format("{0}images/emoticons/{1}",Data.ForumRoot,dt.Rows[0]["Icon"]);
  					}
  				}
--- 76,80 ----
  						Emotion.Text = dt.Rows[0]["Emoticon"].ToString();
  						if (Icon.Items.FindByText(dt.Rows[0]["Icon"].ToString()) != null) Icon.Items.FindByText(dt.Rows[0]["Icon"].ToString()).Selected = true;
! 						Preview.Src = String.Format("{0}images/emoticons/{1}",yaf_ForumInfo.ForumRoot,dt.Rows[0]["Icon"]);
  					}
  				}
***************
*** 80,88 ****
  			else
  			{
! 				Preview.Src = String.Format("{0}images/spacer.gif", Data.ForumRoot);
  			}
  			Icon.Attributes["onchange"] = String.Format(
  				"getElementById('{1}__ctl0_Preview').src='{0}images/emoticons/' + this.value",
! 				Data.ForumRoot,
  				this.Parent.ID
  				);
--- 82,90 ----
  			else
  			{
! 				Preview.Src = String.Format("{0}images/spacer.gif", yaf_ForumInfo.ForumRoot);
  			}
  			Icon.Attributes["onchange"] = String.Format(
  				"getElementById('{1}__ctl0_Preview').src='{0}images/emoticons/' + this.value",
! 				yaf_ForumInfo.ForumRoot,
  				this.Parent.ID
  				);
***************
*** 97,120 ****
  			if(sCode.Length==0) 
  			{
! 				AddLoadMessage("Please enter the code to use for this emotion.");
  				return;
  			}
  			if(sEmotion.Length==0) 
  			{
! 				AddLoadMessage("Please enter the emotion for this icon.");
  				return;
  			}
  			if(Icon.SelectedIndex<1) 
  			{
! 				AddLoadMessage("Please select an icon to use for this emotion.");
  				return;
  			}
! 			YAF.Classes.Data.DB.smiley_save(Request.QueryString["s"],PageBoardID,sCode,sIcon,sEmotion,0);
! 			Forum.Redirect( ForumPages.admin_smilies);
  		}
  
  		private void cancel_Click(object sender, System.EventArgs e) 
  		{
! 			Forum.Redirect( ForumPages.admin_smilies);
  		}
  
--- 99,122 ----
  			if(sCode.Length==0) 
  			{
! 				PageContext.AddLoadMessage("Please enter the code to use for this emotion.");
  				return;
  			}
  			if(sEmotion.Length==0) 
  			{
! 				PageContext.AddLoadMessage("Please enter the emotion for this icon.");
  				return;
  			}
  			if(Icon.SelectedIndex<1) 
  			{
! 				PageContext.AddLoadMessage("Please select an icon to use for this emotion.");
  				return;
  			}
! 			YAF.Classes.Data.DB.smiley_save(Request.QueryString["s"],PageContext.PageBoardID,sCode,sIcon,sEmotion,0);
! 			YAF.Classes.Utils.yaf_BuildLink.Redirect( YAF.Classes.Utils.ForumPages.admin_smilies);
  		}
  
  		private void cancel_Click(object sender, System.EventArgs e) 
  		{
! 			YAF.Classes.Utils.yaf_BuildLink.Redirect( YAF.Classes.Utils.ForumPages.admin_smilies);
  		}
  

Index: editnntpforum.ascx.cs
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/admin/editnntpforum.ascx.cs,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** editnntpforum.ascx.cs	14 Dec 2006 17:19:46 -0000	1.14
--- editnntpforum.ascx.cs	19 Jan 2007 13:16:17 -0000	1.15
***************
*** 27,30 ****
--- 27,32 ----
  using System.Web.UI.WebControls;
  using System.Web.UI.HtmlControls;
+ using YAF.Classes.Utils;
+ using YAF.Classes.Data;
  
  namespace YAF.Pages.Admin
***************
*** 33,37 ****
  	/// Summary description for editgroup.
  	/// </summary>
! 	public partial class editnntpforum : AdminPage
  	{
  
--- 35,39 ----
  	/// Summary description for editgroup.
  	/// </summary>
! 	public partial class editnntpforum : YAF.Classes.Base.AdminPage
  	{
  
***************
*** 40,45 ****
  			if ( !IsPostBack )
  			{
! 				PageLinks.AddLink( BoardSettings.Name, Forum.GetLink( ForumPages.forum ) );
! 				PageLinks.AddLink( "Administration", Forum.GetLink( ForumPages.admin_admin ) );
  				PageLinks.AddLink( "NNTP Forums", "" );
  
--- 42,47 ----
  			if ( !IsPostBack )
  			{
! 				PageLinks.AddLink( PageContext.BoardSettings.Name, YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.forum ) );
! 				PageLinks.AddLink( "Administration", YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.admin_admin ) );
  				PageLinks.AddLink( "NNTP Forums", "" );
  
***************
*** 47,51 ****
  				if ( Request.QueryString ["s"] != null )
  				{
! 					using ( DataTable dt = YAF.Classes.Data.DB.nntpforum_list( PageBoardID, null, Request.QueryString ["s"], DBNull.Value ) )
  					{
  						DataRow row = dt.Rows [0];
--- 49,53 ----
  				if ( Request.QueryString ["s"] != null )
  				{
! 					using ( DataTable dt = YAF.Classes.Data.DB.nntpforum_list( PageContext.PageBoardID, null, Request.QueryString ["s"], DBNull.Value ) )
  					{
  						DataRow row = dt.Rows [0];
***************
*** 81,88 ****
  		private void BindData()
  		{
! 			NntpServerID.DataSource = YAF.Classes.Data.DB.nntpserver_list( PageBoardID, null );
  			NntpServerID.DataValueField = "NntpServerID";
  			NntpServerID.DataTextField = "Name";
! 			ForumID.DataSource = YAF.Classes.Data.DB.forum_listall_sorted( PageBoardID, PageUserID );
  			ForumID.DataValueField = "ForumID";
  			ForumID.DataTextField = "Title";
--- 83,90 ----
  		private void BindData()
  		{
! 			NntpServerID.DataSource = YAF.Classes.Data.DB.nntpserver_list( PageContext.PageBoardID, null );
  			NntpServerID.DataValueField = "NntpServerID";
  			NntpServerID.DataTextField = "Name";
! 			ForumID.DataSource = YAF.Classes.Data.DB.forum_listall_sorted( PageContext.PageBoardID, PageContext.PageUserID );
  			ForumID.DataValueField = "ForumID";
  			ForumID.DataTextField = "Title";
***************
*** 92,96 ****
  		protected void Cancel_Click( object sender, System.EventArgs e )
  		{
! 			Forum.Redirect( ForumPages.admin_nntpforums );
  		}
  
--- 94,98 ----
  		protected void Cancel_Click( object sender, System.EventArgs e )
  		{
! 			YAF.Classes.Utils.yaf_BuildLink.Redirect( YAF.Classes.Utils.ForumPages.admin_nntpforums );
  		}
  
***************
*** 100,104 ****
  			if ( Request.QueryString ["s"] != null ) nntpForumID = Request.QueryString ["s"];
  			YAF.Classes.Data.DB.nntpforum_save( nntpForumID, NntpServerID.SelectedValue, GroupName.Text, ForumID.SelectedValue, Active.Checked );
! 			Forum.Redirect( ForumPages.admin_nntpforums );
  		}
  	}
--- 102,106 ----
  			if ( Request.QueryString ["s"] != null ) nntpForumID = Request.QueryString ["s"];
  			YAF.Classes.Data.DB.nntpforum_save( nntpForumID, NntpServerID.SelectedValue, GroupName.Text, ForumID.SelectedValue, Active.Checked );
! 			YAF.Classes.Utils.yaf_BuildLink.Redirect( YAF.Classes.Utils.ForumPages.admin_nntpforums );
  		}
  	}

Index: editboard.ascx.cs
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/admin/editboard.ascx.cs,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** editboard.ascx.cs	14 Dec 2006 17:19:46 -0000	1.12
--- editboard.ascx.cs	19 Jan 2007 13:16:17 -0000	1.13
***************
*** 27,30 ****
--- 27,32 ----
  using System.Web.UI.WebControls;
  using System.Web.UI.HtmlControls;
+ using YAF.Classes.Utils;
+ using YAF.Classes.Data;
  
  namespace YAF.Pages.Admin
***************
*** 33,43 ****
  	/// Summary description for WebForm1.
  	/// </summary>
! 	public partial class editboard : AdminPage {
  	
  		protected void Page_Load(object sender, System.EventArgs e) 
  		{
  			if(!IsPostBack) {
! 				PageLinks.AddLink(BoardSettings.Name,Forum.GetLink( ForumPages.forum));
! 				PageLinks.AddLink("Administration",Forum.GetLink( ForumPages.admin_admin));
  				PageLinks.AddLink("Boards","");
  
--- 35,45 ----
  	/// Summary description for WebForm1.
  	/// </summary>
! 	public partial class editboard : YAF.Classes.Base.AdminPage {
  	
  		protected void Page_Load(object sender, System.EventArgs e) 
  		{
  			if(!IsPostBack) {
! 				PageLinks.AddLink(PageContext.BoardSettings.Name,YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.forum));
! 				PageLinks.AddLink("Administration",YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.admin_admin));
  				PageLinks.AddLink("Boards","");
  
***************
*** 89,93 ****
  			if(Name.Text.Trim().Length==0) 
  			{
! 				AddLoadMessage("You must enter a name for the board.");
  				return;
  			}
--- 91,95 ----
  			if(Name.Text.Trim().Length==0) 
  			{
! 				PageContext.AddLoadMessage("You must enter a name for the board.");
  				return;
  			}
***************
*** 96,115 ****
  				if(UserName.Text.Trim().Length==0)
  				{
! 					AddLoadMessage("You must enter the name of a administrator user.");
  					return;
  				}
  				if(UserEmail.Text.Trim().Length==0) 
  				{
! 					AddLoadMessage("You must enter the email address of the administrator user.");
  					return;
  				}
  				if(UserPass1.Text.Trim().Length==0)
  				{
! 					AddLoadMessage("You must enter a password for the administrator user.");
  					return;
  				}
  				if(UserPass1.Text!=UserPass2.Text)
  				{
! 					AddLoadMessage("The passwords don't match.");
  					return;
  				}
--- 98,117 ----
  				if(UserName.Text.Trim().Length==0)
  				{
! 					PageContext.AddLoadMessage("You must enter the name of a administrator user.");
  					return;
  				}
  				if(UserEmail.Text.Trim().Length==0) 
  				{
! 					PageContext.AddLoadMessage("You must enter the email address of the administrator user.");
  					return;
  				}
  				if(UserPass1.T...
 
[truncated message content]

[Yafdotnet-cvs] yafsrc/pages Forum.cs, 1.31, 1.32 active.ascx.cs, 1.22, 1.23 activeusers.ascx, 1.8, 1.9 activeusers.ascx.cs, 1.15, 1.16 approve.ascx.cs, 1.15, 1.16 attachments.ascx.cs, 1.23, 1.24 avatar.ascx.cs, 1.14, 1.15 cp_changepassword.ascx.cs, 1.2, 1.3 cp_editavatar.ascx.cs, 1.3, 1.4 cp_editprofile.ascx.cs, 1.30, 1.31 cp_inbox.ascx, 1.10, 1.11 cp_inbox.ascx.cs, 1.17, 1.18 cp_message.ascx.cs, 1.23, 1.24 cp_profile.ascx.cs, 1.20, 1.21 cp_signature.ascx.cs, 1.23, 1.24 cp_subscriptions.ascx.cs, 1.15, 1.16 deletemessage.ascx.cs, 1.1, 1.2 emailtopic.ascx.cs, 1.16, 1.17 error.ascx.cs, 1.7, 1.8 forum.ascx, 1.15, 1.16 forum.ascx.cs, 1.27, 1.28 im_aim.ascx.cs, 1.10, 1.11 im_email.ascx.cs, 1.12, 1.13 im_icq.ascx.cs, 1.11, 1.12 im_yim.ascx.cs, 1.10, 1.11 info.ascx.cs, 1.11, 1.12 lastposts.ascx, 1.8, 1.9 lastposts.ascx.cs, 1.8, 1.9 login.ascx.cs, 1.25, 1.26 logout.ascx.cs, 1.9, 1.10 members.ascx, 1.11, 1.12 members.ascx.cs, 1.19, 1.20 mod_forumuser.ascx.cs, 1.17, 1.18 moderate.ascx.cs, 1.16, 1.17 movemessage.ascx.cs, 1.1, 1.2 movetopic.ascx.cs, 1.19, 1.20 pmessage.ascx.cs, 1.29, 1.30 postmessage.ascx, 1.21, 1.22 postmessage.ascx.cs, 1.43, 1.44 posts.ascx.cs, 1.47, 1.48 printtopic.ascx.cs, 1.16, 1.17 profile.ascx, 1.18, 1.19 profile.ascx.cs, 1.37, 1.38 recoverpassword.ascx.cs, 1.2, 1.3 register.ascx.cs, 1.18, 1.19 rsstopic.ascx.cs, 1.13, 1.14 rules.ascx.cs, 1.10, 1.11 search.ascx, 1.15, 1.16 search.ascx.cs, 1.31, 1.32 topics.ascx.cs, 1.28, 1.29 ForumPage.cs, 1.84, NONE getpage.cmd, 1.1, NONE

[Jaben C. <ja...@us...>]

Update of /cvsroot/yafdotnet/yafsrc/pages
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv4847/pages

Modified Files:
	Forum.cs active.ascx.cs activeusers.ascx activeusers.ascx.cs 
	approve.ascx.cs attachments.ascx.cs avatar.ascx.cs 
	cp_changepassword.ascx.cs cp_editavatar.ascx.cs 
	cp_editprofile.ascx.cs cp_inbox.ascx cp_inbox.ascx.cs 
	cp_message.ascx.cs cp_profile.ascx.cs cp_signature.ascx.cs 
	cp_subscriptions.ascx.cs deletemessage.ascx.cs 
	emailtopic.ascx.cs error.ascx.cs forum.ascx forum.ascx.cs 
	im_aim.ascx.cs im_email.ascx.cs im_icq.ascx.cs im_yim.ascx.cs 
	info.ascx.cs lastposts.ascx lastposts.ascx.cs login.ascx.cs 
	logout.ascx.cs members.ascx members.ascx.cs 
	mod_forumuser.ascx.cs moderate.ascx.cs movemessage.ascx.cs 
	movetopic.ascx.cs pmessage.ascx.cs postmessage.ascx 
	postmessage.ascx.cs posts.ascx.cs printtopic.ascx.cs 
	profile.ascx profile.ascx.cs recoverpassword.ascx.cs 
	register.ascx.cs rsstopic.ascx.cs rules.ascx.cs search.ascx 
	search.ascx.cs topics.ascx.cs 
Removed Files:
	ForumPage.cs getpage.cmd 
Log Message:
Next round of commits... getting better. still plenty more to do!

--- getpage.cmd DELETED ---

Index: register.ascx.cs
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/register.ascx.cs,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** register.ascx.cs	14 Dec 2006 17:19:45 -0000	1.18
--- register.ascx.cs	19 Jan 2007 13:16:16 -0000	1.19
***************
*** 29,39 ****
  using System.Web.Security;
  using System.Globalization;
  
! namespace YAF.Pages
  {
  	/// <summary>
  	/// Summary description for register.
  	/// </summary>
! 	public partial class register : ForumPage
  	{
  	
--- 29,41 ----
  using System.Web.Security;
  using System.Globalization;
+ using YAF.Classes.Utils;
+ using YAF.Classes.Data;
  
! namespace YAF.Pages // YAF.Pages
  {
  	/// <summary>
  	/// Summary description for register.
  	/// </summary>
! 	public partial class register : YAF.Classes.Base.ForumPage
  	{
  	
***************
*** 44,52 ****
  		protected void Page_Load(object sender, System.EventArgs e)
  		{
! 			if(!CanLogin || BoardSettings.DisableRegistrations)
! 				Data.AccessDenied();
  
  			if(!IsPostBack) {
! 				PageLinks.AddLink(BoardSettings.Name,Forum.GetLink( ForumPages.forum));
  			}
  		}
--- 46,54 ----
  		protected void Page_Load(object sender, System.EventArgs e)
  		{
! 			if(!CanLogin || PageContext.BoardSettings.DisableRegistrations)
! 				yaf_BuildLink.AccessDenied();
  
  			if(!IsPostBack) {
! 				PageLinks.AddLink(PageContext.BoardSettings.Name,YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.forum));
  			}
  		}

Index: lastposts.ascx.cs
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/lastposts.ascx.cs,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** lastposts.ascx.cs	14 Dec 2006 17:19:44 -0000	1.8
--- lastposts.ascx.cs	19 Jan 2007 13:16:16 -0000	1.9
***************
*** 5,15 ****
  using System.Web.UI.WebControls;
  using System.Web.UI.HtmlControls;
  
! namespace YAF.Pages
  {
  	/// <summary>
  	///		Summary description for LastPosts.
  	/// </summary>
! 	public partial class lastposts : ForumPage
  	{
  
--- 5,17 ----
  using System.Web.UI.WebControls;
  using System.Web.UI.HtmlControls;
+ using YAF.Classes.Utils;
+ using YAF.Classes.Data;
  
! namespace YAF.Pages // YAF.Pages
  {
  	/// <summary>
  	///		Summary description for LastPosts.
  	/// </summary>
! 	public partial class lastposts : YAF.Classes.Base.ForumPage
  	{
  
***************
*** 21,26 ****
  		protected void Page_Load(object sender, System.EventArgs e)
  		{
! 			if(!ForumReadAccess)
! 				Data.AccessDenied();
  
  			if (Request.QueryString["t"] != null)
--- 23,28 ----
  		protected void Page_Load(object sender, System.EventArgs e)
  		{
! 			if(!PageContext.ForumReadAccess)
! 				yaf_BuildLink.AccessDenied();
  
  			if (Request.QueryString["t"] != null)
***************
*** 53,57 ****
  		{
  			DataRowView row = (DataRowView)o;
! 			string html = FormatMsg.FormatMessage(this,row["Message"].ToString(),new MessageFlags(Convert.ToInt32(row["Flags"])));
  
  			string messageSignature = row["Signature"].ToString();
--- 55,59 ----
  		{
  			DataRowView row = (DataRowView)o;
! 			string html = FormatMsg.FormatMessage(row["Message"].ToString(),new MessageFlags(Convert.ToInt32(row["Flags"])));
  
  			string messageSignature = row["Signature"].ToString();
***************
*** 61,65 ****
  				flags.IsHTML = false;
  
! 				messageSignature = FormatMsg.FormatMessage(this,messageSignature,flags);
  				html += "<br/><hr noshade/>" + messageSignature;
  			}
--- 63,67 ----
  				flags.IsHTML = false;
  
! 				messageSignature = FormatMsg.FormatMessage(messageSignature,flags);
  				html += "<br/><hr noshade/>" + messageSignature;
  			}

Index: cp_profile.ascx.cs
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/cp_profile.ascx.cs,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** cp_profile.ascx.cs	14 Dec 2006 17:19:44 -0000	1.20
--- cp_profile.ascx.cs	19 Jan 2007 13:16:16 -0000	1.21
***************
*** 29,39 ****
  using System.Web.UI.HtmlControls;
  using System.Globalization;
  
! namespace YAF.Pages
  {
  	/// <summary>
  	/// Summary description for editprofile.
  	/// </summary>
! 	public partial class cp_profile : ForumPage
  	{
  
--- 29,41 ----
  using System.Web.UI.HtmlControls;
  using System.Globalization;
+ using YAF.Classes.Utils;
+ using YAF.Classes.Data;
  
! namespace YAF.Pages // YAF.Pages
  {
  	/// <summary>
  	/// Summary description for editprofile.
  	/// </summary>
! 	public partial class cp_profile : YAF.Classes.Base.ForumPage
  	{
  
***************
*** 48,54 ****
  			{
  				if(CanLogin)
! 					Forum.Redirect( ForumPages.login, "ReturnUrl={0}", Utils.GetSafeRawUrl() );
  				else
! 					Forum.Redirect( ForumPages.forum );
  			}
  
--- 50,56 ----
  			{
  				if(CanLogin)
! 					YAF.Classes.Utils.yaf_BuildLink.Redirect( YAF.Classes.Utils.ForumPages.login, "ReturnUrl={0}", General.GetSafeRawUrl() );
  				else
! 					YAF.Classes.Utils.yaf_BuildLink.Redirect( YAF.Classes.Utils.ForumPages.forum );
  			}
  
***************
*** 57,62 ****
  				BindData();
  
! 				PageLinks.AddLink( BoardSettings.Name, Forum.GetLink( ForumPages.forum ) );
! 				PageLinks.AddLink( PageUserName, "" );
  			}
  		}
--- 59,64 ----
  				BindData();
  
! 				PageLinks.AddLink( PageContext.BoardSettings.Name, YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.forum ) );
! 				PageLinks.AddLink( PageContext.PageUserName, "" );
  			}
  		}
***************
*** 66,74 ****
  			DataRow row;
  
! 			Groups.DataSource = YAF.Classes.Data.DB.usergroup_list( PageUserID );
  
  			// Bind			
  			DataBind();
! 			using ( DataTable dt = YAF.Classes.Data.DB.user_list( PageBoardID, PageUserID, true ) )
  			{
  				row = dt.Rows [0];
--- 68,76 ----
  			DataRow row;
  
! 			Groups.DataSource = YAF.Classes.Data.DB.usergroup_list( PageContext.PageUserID );
  
  			// Bind			
  			DataBind();
! 			using ( DataTable dt = YAF.Classes.Data.DB.user_list( PageContext.PageBoardID, PageContext.PageUserID, true ) )
  			{
  				row = dt.Rows [0];
***************
*** 78,95 ****
  			AccountEmail.Text = row ["Email"].ToString();
  			Name.Text = Server.HtmlEncode( ( string ) row ["Name"] );
! 			Joined.Text = FormatDateTime( ( DateTime ) row ["Joined"] );
  			NumPosts.Text = String.Format( "{0:N0}", row ["NumPosts"] );
  
! 			if ( BoardSettings.AvatarUpload && row ["HasAvatarImage"] != null && long.Parse( row ["HasAvatarImage"].ToString() ) > 0 )
  			{
! 				AvatarImage.Src = String.Format( "{0}resource.ashx?u={1}", Data.ForumRoot, PageUserID );
  			}
! 			else if ( row ["Avatar"].ToString().Length > 0 ) // Took out BoardSettings.AvatarRemote
  			{
  				AvatarImage.Src = String.Format( "{3}resource.ashx?url={0}&width={1}&height={2}",
  					Server.UrlEncode( row ["Avatar"].ToString() ),
! 					BoardSettings.AvatarWidth,
! 					BoardSettings.AvatarHeight,
! 					Data.ForumRoot );
  			}
  			else
--- 80,97 ----
  			AccountEmail.Text = row ["Email"].ToString();
  			Name.Text = Server.HtmlEncode( ( string ) row ["Name"] );
! 			Joined.Text = yaf_DateTime.FormatDateTime( ( DateTime ) row ["Joined"] );
  			NumPosts.Text = String.Format( "{0:N0}", row ["NumPosts"] );
  
! 			if ( PageContext.BoardSettings.AvatarUpload && row ["HasAvatarImage"] != null && long.Parse( row ["HasAvatarImage"].ToString() ) > 0 )
  			{
! 				AvatarImage.Src = String.Format( "{0}resource.ashx?u={1}", yaf_ForumInfo.ForumRoot, PageContext.PageUserID );
  			}
! 			else if ( row ["Avatar"].ToString().Length > 0 ) // Took out PageContext.BoardSettings.AvatarRemote
  			{
  				AvatarImage.Src = String.Format( "{3}resource.ashx?url={0}&width={1}&height={2}",
  					Server.UrlEncode( row ["Avatar"].ToString() ),
! 					PageContext.BoardSettings.AvatarWidth,
! 					PageContext.BoardSettings.AvatarHeight,
! 					yaf_ForumInfo.ForumRoot );
  			}
  			else

Index: rules.ascx.cs
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/rules.ascx.cs,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** rules.ascx.cs	14 Dec 2006 17:19:45 -0000	1.10
--- rules.ascx.cs	19 Jan 2007 13:16:16 -0000	1.11
***************
*** 28,38 ****
  using System.Web.UI.WebControls;
  using System.Web.UI.HtmlControls;
  
! namespace YAF.Pages
  {
  	/// <summary>
  	/// Summary description for rules.
  	/// </summary>
! 	public partial class rules : ForumPage
  	{
  	
--- 28,40 ----
  using System.Web.UI.WebControls;
  using System.Web.UI.HtmlControls;
+ using YAF.Classes.Utils;
+ using YAF.Classes.Data;
  
! namespace YAF.Pages // YAF.Pages
  {
  	/// <summary>
  	/// Summary description for rules.
  	/// </summary>
! 	public partial class rules : YAF.Classes.Base.ForumPage
  	{
  	
***************
*** 45,54 ****
  			if(!IsPostBack) 
  			{
! 				PageLinks.AddLink(BoardSettings.Name,Forum.GetLink( ForumPages.forum));
  			
  				ForumRules.Text = "TODO:";
  			}
  			//TODO: Write license info and stuff...
! 			Forum.Redirect( ForumPages.register);
  		}
  
--- 47,56 ----
  			if(!IsPostBack) 
  			{
! 				PageLinks.AddLink(PageContext.BoardSettings.Name,YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.forum));
  			
  				ForumRules.Text = "TODO:";
  			}
  			//TODO: Write license info and stuff...
! 			YAF.Classes.Utils.yaf_BuildLink.Redirect( YAF.Classes.Utils.ForumPages.register);
  		}
  
***************
*** 75,84 ****
  		protected void Cancel_Click(object sender, System.EventArgs e)
  		{
! 			Forum.Redirect( ForumPages.forum);
  		}
  
  		protected void Accept_Click(object sender, System.EventArgs e)
  		{
! 			Forum.Redirect( ForumPages.register);
  		}
  
--- 77,86 ----
  		protected void Cancel_Click(object sender, System.EventArgs e)
  		{
! 			YAF.Classes.Utils.yaf_BuildLink.Redirect( YAF.Classes.Utils.ForumPages.forum);
  		}
  
  		protected void Accept_Click(object sender, System.EventArgs e)
  		{
! 			YAF.Classes.Utils.yaf_BuildLink.Redirect( YAF.Classes.Utils.ForumPages.register);
  		}
  

Index: moderate.ascx.cs
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/moderate.ascx.cs,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** moderate.ascx.cs	14 Dec 2006 17:19:45 -0000	1.16
--- moderate.ascx.cs	19 Jan 2007 13:16:16 -0000	1.17
***************
*** 27,37 ****
  using System.Web.UI.WebControls;
  using System.Web.UI.HtmlControls;
  
! namespace YAF.Pages
  {
  	/// <summary>
  	/// Summary description for moderate.
  	/// </summary>
! 	public partial class moderate0 : ForumPage
  	{
  
--- 27,39 ----
  using System.Web.UI.WebControls;
  using System.Web.UI.HtmlControls;
+ using YAF.Classes.Utils;
+ using YAF.Classes.Data;
  
! namespace YAF.Pages // YAF.Pages
  {
  	/// <summary>
  	/// Summary description for moderate.
  	/// </summary>
! 	public partial class moderate0 : YAF.Classes.Base.ForumPage
  	{
  
***************
*** 42,47 ****
  		protected void Page_Load(object sender, System.EventArgs e)
  		{
! 			if(!ForumModeratorAccess)
! 				Data.AccessDenied();
  
  			if(!IsPostBack) 
--- 44,49 ----
  		protected void Page_Load(object sender, System.EventArgs e)
  		{
! 			if(!PageContext.ForumModeratorAccess)
! 				yaf_BuildLink.AccessDenied();
  
  			if(!IsPostBack) 
***************
*** 49,58 ****
  				AddUser.Text = GetText("INVITE");
  
! 				if(ForumControl.LockedForum==0)
  				{
! 					PageLinks.AddLink(BoardSettings.Name,Forum.GetLink( ForumPages.forum));
! 					PageLinks.AddLink(PageCategoryName,Forum.GetLink( ForumPages.forum,"c={0}",PageCategoryID));
  				}
! 				PageLinks.AddForumLinks(PageForumID);
  				PageLinks.AddLink(GetText("TITLE"),"");
  			}
--- 51,60 ----
  				AddUser.Text = GetText("INVITE");
  
! 				if(PageContext.Settings.LockedForum==0)
  				{
! 					PageLinks.AddLink(PageContext.BoardSettings.Name,YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.forum));
! 					PageLinks.AddLink(PageContext.PageCategoryName,YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.forum,"c={0}",PageContext.PageCategoryID));
  				}
! 				PageLinks.AddForumLinks(PageContext.PageForumID);
  				PageLinks.AddLink(GetText("TITLE"),"");
  			}
***************
*** 62,66 ****
  		private void AddUser_Click(object sender, System.EventArgs e)
  		{
! 			Forum.Redirect( ForumPages.mod_forumuser,"f={0}",PageForumID);
  		}
  
--- 64,68 ----
  		private void AddUser_Click(object sender, System.EventArgs e)
  		{
! 			YAF.Classes.Utils.yaf_BuildLink.Redirect( YAF.Classes.Utils.ForumPages.mod_forumuser,"f={0}",PageContext.PageForumID);
  		}
  
***************
*** 77,82 ****
  		private void BindData() 
  		{
! 			topiclist.DataSource = YAF.Classes.Data.DB.topic_list(PageForumID,-1,null,0,999999);
! 			UserList.DataSource = YAF.Classes.Data.DB.userforum_list(null,PageForumID);
  			DataBind();
  		}
--- 79,84 ----
  		private void BindData() 
  		{
! 			topiclist.DataSource = YAF.Classes.Data.DB.topic_list(PageContext.PageForumID,-1,null,0,999999);
! 			UserList.DataSource = YAF.Classes.Data.DB.userforum_list(null,PageContext.PageForumID);
  			DataBind();
  		}
***************
*** 85,89 ****
  			if(e.CommandName=="delete") {
  				YAF.Classes.Data.DB.topic_delete(e.CommandArgument);
! 				AddLoadMessage(GetText("deleted"));
  				BindData();
  			}
--- 87,91 ----
  			if(e.CommandName=="delete") {
  				YAF.Classes.Data.DB.topic_delete(e.CommandArgument);
! 				PageContext.AddLoadMessage(GetText("deleted"));
  				BindData();
  			}
***************
*** 95,102 ****
  			{
  				case "edit":
! 					Forum.Redirect( ForumPages.mod_forumuser,"f={0}&u={1}",PageForumID,e.CommandArgument);
  					break;
  				case "remove":
! 					YAF.Classes.Data.DB.userforum_delete(e.CommandArgument,PageForumID);
  					BindData();
  					break;
--- 97,104 ----
  			{
  				case "edit":
! 					YAF.Classes.Utils.yaf_BuildLink.Redirect( YAF.Classes.Utils.ForumPages.mod_forumuser,"f={0}&u={1}",PageContext.PageForumID,e.CommandArgument);
  					break;
  				case "remove":
! 					YAF.Classes.Data.DB.userforum_delete(e.CommandArgument,PageContext.PageForumID);
  					BindData();
  					break;

Index: rsstopic.ascx.cs
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/rsstopic.ascx.cs,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** rsstopic.ascx.cs	4 Jan 2007 13:18:18 -0000	1.13
--- rsstopic.ascx.cs	19 Jan 2007 13:16:16 -0000	1.14
***************
*** 29,39 ****
  using System.Web.UI.WebControls;
  using System.Web.UI.HtmlControls;
  
! namespace YAF.Pages
  {
  	/// <summary>
  	/// Summary description for rss.
  	/// </summary>
! 	public partial class rsstopic : ForumPage
  	{
  		public rsstopic()
--- 29,41 ----
  using System.Web.UI.WebControls;
  using System.Web.UI.HtmlControls;
+ using YAF.Classes.Utils;
+ using YAF.Classes.Data;
  
! namespace YAF.Pages // YAF.Pages
  {
  	/// <summary>
  	/// Summary description for rss.
  	/// </summary>
! 	public partial class rsstopic : YAF.Classes.Base.ForumPage
  	{
  		public rsstopic()
***************
*** 50,54 ****
  
  			writer.Formatting = Formatting.Indented;
! 			rf.WriteRSSPrologue( writer, this );
  
  			// Usage rf.AddRSSItem(writer, "Item Title", "http://test.com", "This is a test item");
--- 52,56 ----
  
  			writer.Formatting = Formatting.Indented;
! 			rf.WriteRSSPrologue( writer );
  
  			// Usage rf.AddRSSItem(writer, "Item Title", "http://test.com", "This is a test item");
***************
*** 57,87 ****
  			{
  				case "latestposts":
!                     if (!ForumReadAccess)
!                         Data.AccessDenied();
!                     using (DataTable dt = YAF.Classes.Data.DB.topic_latest(PageBoardID, 7, PageUserID))
!                     {
!                         foreach (DataRow row in dt.Rows)
!                             rf.AddRSSItem(writer, row["Subject"].ToString(), ServerURL + Forum.GetLink(ForumPages.posts, "t={0}", Request.QueryString["t"]), row["Message"].ToString(), Convert.ToDateTime(row["Posted"]).ToString("r"));
!                     }
!                     break;
!                 case "latestannouncements":
!                     if (!ForumReadAccess)
!                         Data.AccessDenied();
!                     using (DataTable dt = YAF.Classes.Data.DB.topic_announcements(PageBoardID,7,PageUserID))
!                     {
!                         foreach (DataRow  row in dt.Rows)
!                             rf.AddRSSItem(writer, row["Subject"].ToString(), ServerURL + Forum.GetLink(ForumPages.posts, "t={0}", Request.QueryString["t"]), row["Message"].ToString(), Convert.ToDateTime(row["Posted"]).ToString("r"));
!                     }
!                     break;
  				case "posts":
! 					if ( !ForumReadAccess )
! 						Data.AccessDenied();
  
  					if ( Request.QueryString ["t"] != null )
  					{
!                         using (DataTable dt = YAF.Classes.Data.DB.post_list(PageTopicID, 1, BoardSettings.ShowDeletedMessages))
  						{
  							foreach ( DataRow row in dt.Rows )
! 								rf.AddRSSItem( writer, row ["Subject"].ToString(), ServerURL + Forum.GetLink( ForumPages.posts, "t={0}", Request.QueryString ["t"] ), row ["Message"].ToString(), Convert.ToDateTime( row ["Posted"] ).ToString( "r" ) );
  						}
  					}
--- 59,89 ----
  			{
  				case "latestposts":
! 					if ( !PageContext.ForumReadAccess )
! 						yaf_BuildLink.AccessDenied();
! 					using ( DataTable dt = YAF.Classes.Data.DB.topic_latest( PageContext.PageBoardID, 7, PageContext.PageUserID ) )
! 					{
! 						foreach ( DataRow row in dt.Rows )
! 							rf.AddRSSItem( writer, row ["Subject"].ToString(), yaf_ForumInfo.ServerURL + yaf_BuildLink.GetLink( ForumPages.posts, "t={0}", Request.QueryString ["t"] ), row ["Message"].ToString(), Convert.ToDateTime( row ["Posted"] ).ToString( "r" ) );
! 					}
! 					break;
! 				case "latestannouncements":
! 					if ( !PageContext.ForumReadAccess )
! 						yaf_BuildLink.AccessDenied();
! 					using ( DataTable dt = YAF.Classes.Data.DB.topic_announcements( PageContext.PageBoardID, 7, PageContext.PageUserID ) )
! 					{
! 						foreach ( DataRow row in dt.Rows )
! 							rf.AddRSSItem( writer, row ["Subject"].ToString(), yaf_ForumInfo.ServerURL + yaf_BuildLink.GetLink( ForumPages.posts, "t={0}", Request.QueryString ["t"] ), row ["Message"].ToString(), Convert.ToDateTime( row ["Posted"] ).ToString( "r" ) );
! 					}
! 					break;
  				case "posts":
! 					if ( !PageContext.ForumReadAccess )
! 						yaf_BuildLink.AccessDenied();
  
  					if ( Request.QueryString ["t"] != null )
  					{
! 						using ( DataTable dt = YAF.Classes.Data.DB.post_list( PageContext.PageTopicID, 1, PageContext.BoardSettings.ShowDeletedMessages ) )
  						{
  							foreach ( DataRow row in dt.Rows )
! 								rf.AddRSSItem( writer, row ["Subject"].ToString(), yaf_ForumInfo.ServerURL + yaf_BuildLink.GetLink( ForumPages.posts, "t={0}", Request.QueryString ["t"] ), row ["Message"].ToString(), Convert.ToDateTime( row ["Posted"] ).ToString( "r" ) );
  						}
  					}
***************
*** 89,93 ****
  					break;
  				case "forum":
! 					using ( DataTable dt = YAF.Classes.Data.DB.forum_listread( PageBoardID, PageUserID, null, null ) )
  					{
  						foreach ( DataRow row in dt.Rows )
--- 91,95 ----
  					break;
  				case "forum":
! 					using ( DataTable dt = YAF.Classes.Data.DB.forum_listread( PageContext.PageBoardID, PageContext.PageUserID, null, null ) )
  					{
  						foreach ( DataRow row in dt.Rows )
***************
*** 95,103 ****
  							if ( row ["LastTopicID"] != DBNull.Value )
  							{
! 								rf.AddRSSItem( writer, row ["Forum"].ToString(), ServerURL + Forum.GetLink( ForumPages.topics, "f={0}", row ["ForumID"] ), row ["Description"].ToString() );
  							}
  							else
  							{
! 								rf.AddRSSItem( writer, row ["Forum"].ToString(), ServerURL + Forum.GetLink( ForumPages.topics, "f={0}", row ["ForumID"] ), row ["Description"].ToString() );
  							}
  						}
--- 97,105 ----
  							if ( row ["LastTopicID"] != DBNull.Value )
  							{
! 								rf.AddRSSItem( writer, row ["Forum"].ToString(), yaf_ForumInfo.ServerURL + yaf_BuildLink.GetLink( ForumPages.topics, "f={0}", row ["ForumID"] ), row ["Description"].ToString() );
  							}
  							else
  							{
! 								rf.AddRSSItem( writer, row ["Forum"].ToString(), yaf_ForumInfo.ServerURL + yaf_BuildLink.GetLink( ForumPages.topics, "f={0}", row ["ForumID"] ), row ["Description"].ToString() );
  							}
  						}
***************
*** 105,110 ****
  					break;
  				case "topics":
! 					if ( !ForumReadAccess )
! 						Data.AccessDenied();
  
  					if ( Request.QueryString ["f"] != null )
--- 107,112 ----
  					break;
  				case "topics":
! 					if ( !PageContext.ForumReadAccess )
! 						yaf_BuildLink.AccessDenied();
  
  					if ( Request.QueryString ["f"] != null )
***************
*** 115,119 ****
  							foreach ( DataRow row in dt.Rows )
  							{
! 								rf.AddRSSItem( writer, row ["Topic"].ToString(), ServerURL + Forum.GetLink( ForumPages.posts, "t={0}", row ["TopicID"] ), row ["Topic"].ToString(), Convert.ToDateTime( row ["Posted"] ).ToString( "r" ) );
  							}
  						}
--- 117,121 ----
  							foreach ( DataRow row in dt.Rows )
  							{
! 								rf.AddRSSItem( writer, row ["Topic"].ToString(), yaf_ForumInfo.ServerURL + yaf_BuildLink.GetLink( ForumPages.posts, "t={0}", row ["TopicID"] ), row ["Topic"].ToString(), Convert.ToDateTime( row ["Posted"] ).ToString( "r" ) );
  							}
  						}
***************
*** 122,130 ****
  					break;
  				case "active":
! 					using ( DataTable dt = YAF.Classes.Data.DB.topic_active( PageBoardID, PageUserID, DateTime.Now + TimeSpan.FromHours( -24 ), ForumControl.CategoryID ) )
  					{
  						foreach ( DataRow row in dt.Rows )
  						{
! 							rf.AddRSSItem( writer, row ["Subject"].ToString(), ServerURL + Forum.GetLink( ForumPages.posts, "t={0}", row ["LinkTopicID"] ), row ["Subject"].ToString() );
  						}
  					}
--- 124,132 ----
  					break;
  				case "active":
! 					using ( DataTable dt = YAF.Classes.Data.DB.topic_active( PageContext.PageBoardID, PageContext.PageUserID, DateTime.Now + TimeSpan.FromHours( -24 ), PageContext.Settings.CategoryID ) )
  					{
  						foreach ( DataRow row in dt.Rows )
  						{
! 							rf.AddRSSItem( writer, row ["Subject"].ToString(), yaf_ForumInfo.ServerURL + yaf_BuildLink.GetLink( ForumPages.posts, "t={0}", row ["LinkTopicID"] ), row ["Subject"].ToString() );
  						}
  					}

Index: lastposts.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/lastposts.ascx,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** lastposts.ascx	14 Dec 2006 17:19:44 -0000	1.8
--- lastposts.ascx	19 Jan 2007 13:16:16 -0000	1.9
***************
*** 14,18 ****
  <ItemTemplate>
  		<tr class="postheader">
! 			<td width="140"><b><a href="<%# YAF.Forum.GetLink(YAF.ForumPages.profile,"u={0}",Eval( "UserID")) %>"><%# Eval( "UserName") %></a></b>
  			</td>
  			<td width="80%" class="small" align="left"><b><%# GetText("posted") %></b> <%# FormatDateTime((System.DateTime)((System.Data.DataRowView)Container.DataItem)["Posted"]) %></td>
--- 14,18 ----
  <ItemTemplate>
  		<tr class="postheader">
! 			<td width="140"><b><a href="<%# YAF.Classes.Utils.yaf_BuildLink.GetLink(YAF.Classes.Utils.ForumPages.profile,"u={0}",Eval( "UserID")) %>"><%# Eval( "UserName") %></a></b>
  			</td>
  			<td width="80%" class="small" align="left"><b><%# GetText("posted") %></b> <%# FormatDateTime((System.DateTime)((System.Data.DataRowView)Container.DataItem)["Posted"]) %></td>
***************
*** 27,31 ****
  <AlternatingItemTemplate>
  		<tr class="postheader">
! 			<td width="140"><b><a href="<%# YAF.Forum.GetLink(YAF.ForumPages.profile,"u={0}",Eval( "UserID")) %>"><%# Eval( "UserName") %></a></b>
  			</td>
  			<td width="80%" class="small" align="left"><b><%# GetText("posted") %></b> <%# FormatDateTime((System.DateTime)((System.Data.DataRowView)Container.DataItem)["Posted"]) %></td>
--- 27,31 ----
  <AlternatingItemTemplate>
  		<tr class="postheader">
! 			<td width="140"><b><a href="<%# YAF.Classes.Utils.yaf_BuildLink.GetLink(YAF.Classes.Utils.ForumPages.profile,"u={0}",Eval( "UserID")) %>"><%# Eval( "UserName") %></a></b>
  			</td>
  			<td width="80%" class="small" align="left"><b><%# GetText("posted") %></b> <%# FormatDateTime((System.DateTime)((System.Data.DataRowView)Container.DataItem)["Posted"]) %></td>

Index: forum.ascx.cs
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/forum.ascx.cs,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** forum.ascx.cs	14 Dec 2006 17:19:44 -0000	1.27
--- forum.ascx.cs	19 Jan 2007 13:16:16 -0000	1.28
***************
*** 27,30 ****
--- 27,32 ----
  using System.Web.UI.WebControls;
  using System.Web.UI.HtmlControls;
+ using YAF.Classes.Utils;
+ using YAF.Classes.Data;
  
  namespace YAF.Pages
***************
*** 33,37 ****
  	/// Summary description for _default.
  	/// </summary>
! 	public partial class forum : ForumPage
  	{
  
--- 35,39 ----
  	/// Summary description for _default.
  	/// </summary>
! 	public partial class forum : YAF.Classes.Base.ForumPage
  	{
  
***************
*** 45,73 ****
  			if ( !IsPostBack )
  			{
! 				if (IsPrivate && User==null)
  				{
! 					Forum.Redirect( ForumPages.login, "ReturnUrl={0}", Request.RawUrl );
  				}
  
! 				TimeNow.Text = String.Format( GetText( "CURRENT_TIME" ), FormatTime( DateTime.Now ) );
! 				TimeLastVisit.Text = String.Format( GetText( "last_visit" ), FormatDateTime( Mession.LastVisit ) );
  				MarkAll.Text = GetText( "MARKALL" );
  
! 				if ( UnreadPrivate > 0 )
  				{
  					UnreadMsgs.Visible = true;
! 					UnreadMsgs.NavigateUrl = Forum.GetLink( ForumPages.cp_inbox );
! 					if ( UnreadPrivate == 1 )
! 						UnreadMsgs.Text = String.Format( GetText( "unread1" ), UnreadPrivate );
  					else
! 						UnreadMsgs.Text = String.Format( GetText( "unread0" ), UnreadPrivate );
  				}
  
! 				if ( ForumControl.LockedForum == 0 )
  				{
! 					PageLinks.AddLink( BoardSettings.Name, Forum.GetLink( ForumPages.forum ) );
! 					if ( PageCategoryID != 0 )
  					{
! 						PageLinks.AddLink( PageCategoryName, Forum.GetLink( ForumPages.forum, "c={0}", PageCategoryID ) );
  						Welcome.Visible = false;
  					}
--- 47,75 ----
  			if ( !IsPostBack )
  			{
! 				if (PageContext.IsPrivate && User==null)
  				{
! 					YAF.Classes.Utils.yaf_BuildLink.Redirect( YAF.Classes.Utils.ForumPages.login, "ReturnUrl={0}", Request.RawUrl );
  				}
  
! 				TimeNow.Text = String.Format( GetText( "CURRENT_TIME" ), yaf_DateTime.FormatTime( DateTime.Now ) );
! 				TimeLastVisit.Text = String.Format( GetText( "last_visit" ), yaf_DateTime.FormatDateTime( Mession.LastVisit ) );
  				MarkAll.Text = GetText( "MARKALL" );
  
! 				if ( PageContext.UnreadPrivate > 0 )
  				{
  					UnreadMsgs.Visible = true;
! 					UnreadMsgs.NavigateUrl = YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.cp_inbox );
! 					if ( PageContext.UnreadPrivate == 1 )
! 						UnreadMsgs.Text = String.Format( GetText( "unread1" ), PageContext.UnreadPrivate );
  					else
! 						UnreadMsgs.Text = String.Format( GetText( "unread0" ), PageContext.UnreadPrivate );
  				}
  
! 				if ( PageContext.Settings.LockedForum == 0 )
  				{
! 					PageLinks.AddLink( PageContext.BoardSettings.Name, YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.forum ) );
! 					if ( PageContext.PageCategoryID != 0 )
  					{
! 						PageLinks.AddLink( PageContext.PageCategoryName, YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.forum, "c={0}", PageContext.PageCategoryID ) );
  						Welcome.Visible = false;
  					}
***************
*** 87,107 ****
  		private void BindData()
  		{
! 			DataSet ds = YAF.Classes.Data.DB.board_layout( PageBoardID, PageUserID, PageCategoryID, null );
  			CategoryList.DataSource = ds.Tables ["yaf_Category"];
  
  			// Active users
  			// Call this before forum_stats to clean up active users
! 			ActiveList.DataSource = YAF.Classes.Data.DB.active_list( PageBoardID, null );
  
  			// Latest forum posts
  			// Shows the latest n number of posts on the main forum list page
! 			LatestPosts.DataSource = YAF.Classes.Data.DB.topic_latest( PageBoardID, 7, PageUserID );
  
  			// Forum statistics
! 			string key = string.Format( "BoardStats.{0}", PageBoardID );
  			DataRow stats = ( DataRow ) Cache [key];
  			if ( stats == null )
  			{
! 				stats = YAF.Classes.Data.DB.board_poststats( PageBoardID );
  				Cache.Insert( key, stats, null, DateTime.Now.AddMinutes( 15 ), TimeSpan.Zero );
  			}
--- 89,109 ----
  		private void BindData()
  		{
! 			DataSet ds = YAF.Classes.Data.DB.board_layout( PageContext.PageBoardID, PageContext.PageUserID, PageContext.PageCategoryID, null );
  			CategoryList.DataSource = ds.Tables ["yaf_Category"];
  
  			// Active users
  			// Call this before forum_stats to clean up active users
! 			ActiveList.DataSource = YAF.Classes.Data.DB.active_list( PageContext.PageBoardID, null );
  
  			// Latest forum posts
  			// Shows the latest n number of posts on the main forum list page
! 			LatestPosts.DataSource = YAF.Classes.Data.DB.topic_latest( PageContext.PageBoardID, 7, PageContext.PageUserID );
  
  			// Forum statistics
! 			string key = string.Format( "BoardStats.{0}", PageContext.PageBoardID );
  			DataRow stats = ( DataRow ) Cache [key];
  			if ( stats == null )
  			{
! 				stats = YAF.Classes.Data.DB.board_poststats( PageContext.PageBoardID );
  				Cache.Insert( key, stats, null, DateTime.Now.AddMinutes( 15 ), TimeSpan.Zero );
  			}
***************
*** 113,118 ****
  			{
  				Stats.Text += String.Format( GetText( "stats_lastpost" ),
! 					FormatDateTimeTopic( ( DateTime ) stats ["LastPost"] ),
! 					String.Format( "<a href=\"{0}\">{1}</a>", Forum.GetLink( ForumPages.profile, "u={0}", stats ["LastUserID"] ), Server.HtmlEncode( stats ["LastUser"].ToString() ) )
  				);
  				Stats.Text += "<br/>";
--- 115,120 ----
  			{
  				Stats.Text += String.Format( GetText( "stats_lastpost" ),
! 					yaf_DateTime.FormatDateTimeTopic( ( DateTime ) stats ["LastPost"] ),
! 					String.Format( "<a href=\"{0}\">{1}</a>", YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.profile, "u={0}", stats ["LastUserID"] ), Server.HtmlEncode( stats ["LastUser"].ToString() ) )
  				);
  				Stats.Text += "<br/>";
***************
*** 123,139 ****
  
  			Stats.Text += String.Format( GetText( "stats_lastmember" ),
! 				String.Format( "<a href=\"{0}\">{1}</a>", Forum.GetLink( ForumPages.profile, "u={0}", stats ["LastMemberID"] ), Server.HtmlEncode( stats ["LastMember"].ToString() ) )
  				);
  			Stats.Text += "<br/>";
  
! 			DataRow activeStats = YAF.Classes.Data.DB.active_stats( PageBoardID );
  			activeinfo.Text = String.Format( "<a href=\"{3}\">{0}</a> - {1}, {2}.",
  				String.Format( GetText( ( int ) activeStats ["ActiveUsers"] == 1 ? "ACTIVE_USERS_COUNT1" : "ACTIVE_USERS_COUNT2" ), activeStats ["ActiveUsers"] ),
  				String.Format( GetText( ( int ) activeStats ["ActiveMembers"] == 1 ? "ACTIVE_USERS_MEMBERS1" : "ACTIVE_USERS_MEMBERS2" ), activeStats ["ActiveMembers"] ),
  				String.Format( GetText( ( int ) activeStats ["ActiveGuests"] == 1 ? "ACTIVE_USERS_GUESTS1" : "ACTIVE_USERS_GUESTS2" ), activeStats ["ActiveGuests"] ),
! 				Forum.GetLink( ForumPages.activeusers )
  				);
  
! 			activeinfo.Text += "<br/>" + string.Format( GetText( "MAX_ONLINE" ), BoardSettings.MaxUsers, FormatDateTimeTopic( BoardSettings.MaxUsersWhen ) );
  
  			UpdateActiveDiscussionsPanel();
--- 125,141 ----
  
  			Stats.Text += String.Format( GetText( "stats_lastmember" ),
! 				String.Format( "<a href=\"{0}\">{1}</a>", YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.profile, "u={0}", stats ["LastMemberID"] ), Server.HtmlEncode( stats ["LastMember"].ToString() ) )
  				);
  			Stats.Text += "<br/>";
  
! 			DataRow activeStats = YAF.Classes.Data.DB.active_stats( PageContext.PageBoardID );
  			activeinfo.Text = String.Format( "<a href=\"{3}\">{0}</a> - {1}, {2}.",
  				String.Format( GetText( ( int ) activeStats ["ActiveUsers"] == 1 ? "ACTIVE_USERS_COUNT1" : "ACTIVE_USERS_COUNT2" ), activeStats ["ActiveUsers"] ),
  				String.Format( GetText( ( int ) activeStats ["ActiveMembers"] == 1 ? "ACTIVE_USERS_MEMBERS1" : "ACTIVE_USERS_MEMBERS2" ), activeStats ["ActiveMembers"] ),
  				String.Format( GetText( ( int ) activeStats ["ActiveGuests"] == 1 ? "ACTIVE_USERS_GUESTS1" : "ACTIVE_USERS_GUESTS2" ), activeStats ["ActiveGuests"] ),
! 				YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.activeusers )
  				);
  
! 			activeinfo.Text += "<br/>" + string.Format( GetText( "MAX_ONLINE" ), PageContext.BoardSettings.MaxUsers, yaf_DateTime.FormatDateTimeTopic( PageContext.BoardSettings.MaxUsersWhen ) );
  
  			UpdateActiveDiscussionsPanel();
***************
*** 154,163 ****
  
  				return String.Format( "{0}<br/>{1}<br/>{2}&nbsp;<a title=\"{4}\" href=\"{5}\"><img src='{3}'></a>",
! 					FormatDateTimeTopic( Convert.ToDateTime( row ["LastPosted"] ) ),
! 					String.Format( GetText( "in" ), String.Format( "<a href=\"{0}\">{1}</a>", Forum.GetLink( ForumPages.posts, "t={0}", row ["LastTopicID"] ), row ["LastTopicName"] ) ),
! 					String.Format( GetText( "by" ), String.Format( "<a href=\"{0}\">{1}</a>", Forum.GetLink( ForumPages.profile, "u={0}", row ["LastUserID"] ), row ["LastUser"] ) ),
  					minipost,
  					GetText( "GO_LAST_POST" ),
! 					Forum.GetLink( ForumPages.posts, "m={0}#{0}", row ["LastMessageID"] )
  					);
  			}
--- 156,165 ----
  
  				return String.Format( "{0}<br/>{1}<br/>{2}&nbsp;<a title=\"{4}\" href=\"{5}\"><img src='{3}'></a>",
! 					yaf_DateTime.FormatDateTimeTopic( Convert.ToDateTime( row ["LastPosted"] ) ),
! 					String.Format( GetText( "in" ), String.Format( "<a href=\"{0}\">{1}</a>", YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.posts, "t={0}", row ["LastTopicID"] ), row ["LastTopicName"] ) ),
! 					String.Format( GetText( "by" ), String.Format( "<a href=\"{0}\">{1}</a>", YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.profile, "u={0}", row ["LastUserID"] ), row ["LastUser"] ) ),
  					minipost,
  					GetText( "GO_LAST_POST" ),
! 					YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.posts, "m={0}#{0}", row ["LastMessageID"] )
  					);
  			}
***************
*** 180,184 ****
  			DataRow row = ( DataRow ) o;
  			bool locked = ( bool ) row ["Locked"];
! 			DateTime lastRead = GetForumRead( ( int ) row ["ForumID"] );
  			DateTime lastPosted = row ["LastPosted"] != DBNull.Value ? ( DateTime ) row ["LastPosted"] : lastRead;
  
--- 182,186 ----
  			DataRow row = ( DataRow ) o;
  			bool locked = ( bool ) row ["Locked"];
! 			DateTime lastRead = Mession.GetForumRead( ( int ) row ["ForumID"] );
  			DateTime lastPosted = row ["LastPosted"] != DBNull.Value ? ( DateTime ) row ["LastPosted"] : lastRead;
  
***************
*** 214,218 ****
  		protected void ModeratorList_ItemCommand( object source, System.Web.UI.WebControls.RepeaterCommandEventArgs e )
  		{
! 			//AddLoadMessage("TODO: Fix this");
  			//TODO: Show moderators
  		}
--- 216,220 ----
  		protected void ModeratorList_ItemCommand( object source, System.Web.UI.WebControls.RepeaterCommandEventArgs e )
  		{
! 			//PageContext.AddLoadMessage("TODO: Fix this");
  			//TODO: Show moderators
  		}

Index: cp_editprofile.ascx.cs
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/cp_editprofile.ascx.cs,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** cp_editprofile.ascx.cs	14 Dec 2006 17:19:43 -0000	1.30
--- cp_editprofile.ascx.cs	19 Jan 2007 13:16:16 -0000	1.31
***************
*** 30,40 ****
  using System.Globalization;
  using System.Collections.Specialized;
  
! namespace YAF.Pages
  {
  	/// <summary>
  	/// Summary description for cp_editprofile.
  	/// </summary>
! 	public partial class cp_editprofile : ForumPage
  	{
  
--- 30,42 ----
  using System.Globalization;
  using System.Collections.Specialized;
+ using YAF.Classes.Utils;
+ using YAF.Classes.Data;
  
! namespace YAF.Pages // YAF.Pages
  {
  	/// <summary>
  	/// Summary description for cp_editprofile.
  	/// </summary>
! 	public partial class cp_editprofile : YAF.Classes.Base.ForumPage
  	{
  
***************
*** 49,61 ****
  			{
  				if(CanLogin)
! 					Forum.Redirect( ForumPages.login, "ReturnUrl={0}", Utils.GetSafeRawUrl() );
  				else
! 					Forum.Redirect( ForumPages.forum );
  			}
  
  			if ( !IsPostBack )
  			{
! 				PageLinks.AddLink( BoardSettings.Name, Forum.GetLink( ForumPages.forum ) );
! 				PageLinks.AddLink( PageUserName, Forum.GetLink( ForumPages.cp_profile ) );
  				PageLinks.AddLink( GetText( "TITLE" ), "" );
  			}
--- 51,63 ----
  			{
  				if(CanLogin)
! 					YAF.Classes.Utils.yaf_BuildLink.Redirect( YAF.Classes.Utils.ForumPages.login, "ReturnUrl={0}", General.GetSafeRawUrl() );
  				else
! 					YAF.Classes.Utils.yaf_BuildLink.Redirect( YAF.Classes.Utils.ForumPages.forum );
  			}
  
  			if ( !IsPostBack )
  			{
! 				PageLinks.AddLink( PageContext.BoardSettings.Name, YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.forum ) );
! 				PageLinks.AddLink( PageContext.PageUserName, YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.cp_profile ) );
  				PageLinks.AddLink( GetText( "TITLE" ), "" );
  			}

Index: active.ascx.cs
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/active.ascx.cs,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** active.ascx.cs	14 Dec 2006 17:19:43 -0000	1.22
--- active.ascx.cs	19 Jan 2007 13:16:16 -0000	1.23
***************
*** 27,37 ****
  using System.Web.UI.WebControls;
  using System.Web.UI.HtmlControls;
  
! namespace YAF.Pages
  {
  	/// <summary>
  	/// Summary description for active.
  	/// </summary>
! 	public partial class active : ForumPage
  	{
  		protected System.Web.UI.WebControls.DropDownList ForumJump;
--- 27,39 ----
  using System.Web.UI.WebControls;
  using System.Web.UI.HtmlControls;
+ using YAF.Classes.Utils;
+ using YAF.Classes.Data;
  
! namespace YAF.Pages // YAF.Pages
  {
  	/// <summary>
  	/// Summary description for active.
  	/// </summary>
! 	public partial class active : YAF.Classes.Base.ForumPage
  	{
  		protected System.Web.UI.WebControls.DropDownList ForumJump;
***************
*** 46,62 ****
  		{
  			// 20050909 CHP : BEGIN
! 			if (IsPrivate && User==null)
  			{
  				if(CanLogin)
! 					Forum.Redirect( ForumPages.login,"ReturnUrl={0}",Request.RawUrl);
  				else
! 					Forum.Redirect( ForumPages.forum);
  			}
  			// 20050909 CHP : END
  
!  			// RssFeed.NavigateUrl = String.Format("{0}default.aspx?g=rsstopic&pg=active", Data.ForumRoot);
! 			if (BoardSettings.ShowRSSLink)
  			{
! 				RssFeed.NavigateUrl = Forum.GetLink( ForumPages.rsstopic, "pg=active");
  				RssFeed.Text = GetText("RSSFEED");
  				RssFeed.Visible = true;
--- 48,64 ----
  		{
  			// 20050909 CHP : BEGIN
! 			if (PageContext.IsPrivate && User==null)
  			{
  				if(CanLogin)
! 					YAF.Classes.Utils.yaf_BuildLink.Redirect( YAF.Classes.Utils.ForumPages.login,"ReturnUrl={0}",Request.RawUrl);
  				else
! 					YAF.Classes.Utils.yaf_BuildLink.Redirect( YAF.Classes.Utils.ForumPages.forum);
  			}
  			// 20050909 CHP : END
  
!  			// RssFeed.NavigateUrl = String.Format("{0}default.aspx?g=rsstopic&pg=active", yaf_ForumInfo.ForumRoot);
! 			if (PageContext.BoardSettings.ShowRSSLink)
  			{
! 				RssFeed.NavigateUrl = YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.rsstopic, "pg=active");
  				RssFeed.Text = GetText("RSSFEED");
  				RssFeed.Visible = true;
***************
*** 69,76 ****
  			if(!IsPostBack)
  			{
! 				PageLinks.AddLink(BoardSettings.Name,Forum.GetLink( ForumPages.forum));
  				PageLinks.AddLink(GetText("TITLE"),"");
  
! 				Since.Items.Add(new ListItem(String.Format(GetText("last_visit"),FormatDateTime(Mession.LastVisit)),"0"));
  				Since.Items.Add(new ListItem(GetText("last_hour"),"-1"));
  				Since.Items.Add(new ListItem(GetText("last_two_hours"),"-2"));
--- 71,78 ----
  			if(!IsPostBack)
  			{
! 				PageLinks.AddLink(PageContext.BoardSettings.Name,YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.forum));
  				PageLinks.AddLink(GetText("TITLE"),"");
  
! 				Since.Items.Add(new ListItem(String.Format(GetText("last_visit"),yaf_DateTime.FormatDateTime(Mession.LastVisit)),"0"));
  				Since.Items.Add(new ListItem(GetText("last_hour"),"-1"));
  				Since.Items.Add(new ListItem(GetText("last_two_hours"),"-2"));
***************
*** 131,137 ****
  			object categoryIDObject = null;
  
! 			if ( ForumControl.CategoryID != 0 ) categoryIDObject = ForumControl.CategoryID;
  
! 			DataView dv = YAF.Classes.Data.DB.topic_active( PageBoardID, PageUserID, SinceDate, categoryIDObject ).DefaultView;
  			pds.DataSource = dv;
  			Pager.Count = dv.Count;
--- 133,139 ----
  			object categoryIDObject = null;
  
! 			if ( PageContext.Settings.CategoryID != 0 ) categoryIDObject = PageContext.Settings.CategoryID;
  
! 			DataView dv = YAF.Classes.Data.DB.topic_active( PageContext.PageBoardID, PageContext.PageUserID, SinceDate, categoryIDObject ).DefaultView;
  			pds.DataSource = dv;
  			Pager.Count = dv.Count;
***************
*** 149,153 ****
  			string html = "";
  			if(ForumName!=LastForumName) {
! 				html = String.Format("<tr><td class=header2 colspan=6><a href=\"{1}\">{0}</a></td></tr>",ForumName,Forum.GetLink( ForumPages.topics,"f={0}",row["ForumID"]));
  				LastForumName = ForumName;
  			}
--- 151,155 ----
  			string html = "";
  			if(ForumName!=LastForumName) {
! 				html = String.Format("<tr><td class=header2 colspan=6><a href=\"{1}\">{0}</a></td></tr>",ForumName,YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.topics,"f={0}",row["ForumID"]));
  				LastForumName = ForumName;
  			}

Index: login.ascx.cs
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/login.ascx.cs,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** login.ascx.cs	14 Dec 2006 17:19:44 -0000	1.25
--- login.ascx.cs	19 Jan 2007 13:16:16 -0000	1.26
***************
*** 28,38 ****
  using System.Web.UI.HtmlControls;
  using System.Web.Security;
  
! namespace YAF.Pages
  {
  	/// <summary>
  	/// Summary description for login.
  	/// </summary>
! 	public partial class login : ForumPage
  	{
  
--- 28,40 ----
  using System.Web.UI.HtmlControls;
  using System.Web.Security;
+ using YAF.Classes.Utils;
+ using YAF.Classes.Data;
  
! namespace YAF.Pages // YAF.Pages
  {
  	/// <summary>
  	/// Summary description for login.
  	/// </summary>
! 	public partial class login : YAF.Classes.Base.ForumPage
  	{
  
***************
*** 45,58 ****
  		{
  			if ( !CanLogin )
! 				Forum.Redirect( ForumPages.forum );
  
  
  			if ( !IsPostBack )
  			{
! 				PageLinks.AddLink( BoardSettings.Name, Forum.GetLink( ForumPages.forum ) );
  				Login1.CreateUserText = "Sign up for a new account.";
! 				Login1.CreateUserUrl = Forum.GetLink( ForumPages.register );
  				Login1.PasswordRecoveryText = GetText( "lostpassword" );
! 				Login1.PasswordRecoveryUrl = Forum.GetLink( ForumPages.recoverpassword );
  
  				//ForumLogin.Text = GetText( "forum_login" );
--- 47,60 ----
  		{
  			if ( !CanLogin )
! 				YAF.Classes.Utils.yaf_BuildLink.Redirect( YAF.Classes.Utils.ForumPages.forum );
  
  
  			if ( !IsPostBack )
  			{
! 				PageLinks.AddLink( PageContext.BoardSettings.Name, YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.forum ) );
  				Login1.CreateUserText = "Sign up for a new account.";
! 				Login1.CreateUserUrl = YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.register );
  				Login1.PasswordRecoveryText = GetText( "lostpassword" );
! 				Login1.PasswordRecoveryUrl = YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.recoverpassword );
  
  				//ForumLogin.Text = GetText( "forum_login" );
***************
*** 80,84 ****
  				Response.Redirect( Request.QueryString ["ReturnUrl"] );
  			else
! 				Forum.Redirect( ForumPages.forum );
  		}
  	}
--- 82,86 ----
  				Response.Redirect( Request.QueryString ["ReturnUrl"] );
  			else
! 				YAF.Classes.Utils.yaf_BuildLink.Redirect( YAF.Classes.Utils.ForumPages.forum );
  		}
  	}

Index: posts.ascx.cs
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/posts.ascx.cs,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** posts.ascx.cs	21 Dec 2006 16:01:56 -0000	1.47
--- posts.ascx.cs	19 Jan 2007 13:16:16 -0000	1.48
***************
*** 28,38 ****
  using System.Web.UI.HtmlControls;
  using System.Text.RegularExpressions;
  
! namespace YAF.Pages
  {
  	/// <summary>
  	/// Summary description for posts.
  	/// </summary>
! 	public partial class posts : ForumPage
  	{
  		protected YAF.Editor.ForumEditor QuickReplyEditor;
--- 28,40 ----
  using System.Web.UI.HtmlControls;
  using System.Text.RegularExpressions;
+ using YAF.Classes.Utils;
+ using YAF.Classes.Data;
  
! namespace YAF.Pages // YAF.Pages
  {
  	/// <summary>
  	/// Summary description for posts.
  	/// </summary>
! 	public partial class posts : YAF.Classes.Base.ForumPage
  	{
  		protected YAF.Editor.ForumEditor QuickReplyEditor;
***************
*** 55,59 ****
  			MyTestMenu.AddItem( "email", GetText( "emailtopic" ) );
  			MyTestMenu.AddItem( "print", GetText( "printtopic" ) );
! 			if ( BoardSettings.ShowRSSLink ) MyTestMenu.AddItem( "rssfeed", GetText( "rsstopic" ) );
  			ViewMenu.AddItem( "normal", GetText( "NORMAL" ) );
  			ViewMenu.AddItem( "threaded", GetText( "THREADED" ) );
--- 57,61 ----
  			MyTestMenu.AddItem( "email", GetText( "emailtopic" ) );
  			MyTestMenu.AddItem( "print", GetText( "printtopic" ) );
! 			if ( PageContext.BoardSettings.ShowRSSLink ) MyTestMenu.AddItem( "rssfeed", GetText( "rsstopic" ) );
  			ViewMenu.AddItem( "normal", GetText( "NORMAL" ) );
  			ViewMenu.AddItem( "threaded", GetText( "THREADED" ) );
***************
*** 67,86 ****
  		protected void Page_Load( object sender, System.EventArgs e )
  		{
! 			QuickReplyEditor.BaseDir = Data.ForumRoot + "editors";
! 			QuickReplyEditor.StyleSheet = this.ThemeFile( "theme.css" );
  
! 			topic = YAF.Classes.Data.DB.topic_info( PageTopicID );
! 			using ( DataTable dt = YAF.Classes.Data.DB.forum_list( PageBoardID, PageForumID ) )
  				forum = dt.Rows [0];
  
! 			if ( !ForumReadAccess )
! 				Data.AccessDenied();
  
  			if ( !IsPostBack )
  			{
! 				if ( ForumControl.LockedForum == 0 )
  				{
! 					PageLinks.AddLink( BoardSettings.Name, Forum.GetLink( ForumPages.forum ) );
! 					PageLinks.AddLink( PageCategoryName, Forum.GetLink( ForumPages.forum, "c={0}", PageCategoryID ) );
  				}
  
--- 69,88 ----
  		protected void Page_Load( object sender, System.EventArgs e )
  		{
! 			QuickReplyEditor.BaseDir = yaf_ForumInfo.ForumRoot + "editors";
! 			QuickReplyEditor.StyleSheet = yaf_BuildLink.ThemeFile( "theme.css" );
  
! 			topic = YAF.Classes.Data.DB.topic_info( PageContext.PageTopicID );
! 			using ( DataTable dt = YAF.Classes.Data.DB.forum_list( PageContext.PageBoardID, PageContext.PageForumID ) )
  				forum = dt.Rows [0];
  
! 			if ( !PageContext.ForumReadAccess )
! 				yaf_BuildLink.AccessDenied();
  
  			if ( !IsPostBack )
  			{
! 				if ( PageContext.Settings.LockedForum == 0 )
  				{
! 					PageLinks.AddLink( PageContext.BoardSettings.Name, YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.forum ) );
! 					PageLinks.AddLink( PageContext.PageCategoryName, YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.forum, "c={0}", PageContext.PageCategoryID ) );
  				}
  
***************
*** 90,104 ****
  				DataPanel1.CollapseText = GetText( "QUICKREPLY_HIDE" );
  
! 				PageLinks.AddForumLinks( PageForumID );
! 				PageLinks.AddLink( Utils.BadWordReplace( PageTopicName ), "" );
  
! 				TopicTitle.Text = Utils.BadWordReplace( ( string ) topic ["Topic"] );
! 				ViewOptions.Visible = BoardSettings.AllowThreaded;
! 				ForumJumpLine.Visible = BoardSettings.ShowForumJump && ForumControl.LockedForum == 0;
  
! 				RssTopic.NavigateUrl = Forum.GetLink( ForumPages.rsstopic, "pg={0}&amp;t={1}", Request.QueryString ["g"], PageTopicID );
! 				RssTopic.Visible = BoardSettings.ShowRSSLink;
  
! 				if ( !ForumPostAccess )
  				{
  					NewTopic1.Visible = false;
--- 92,106 ----
  				DataPanel1.CollapseText = GetText( "QUICKREPLY_HIDE" );
  
! 				PageLinks.AddForumLinks( PageContext.PageForumID );
! 				PageLinks.AddLink( General.BadWordReplace( PageContext.PageTopicName ), "" );
  
! 				TopicTitle.Text = General.BadWordReplace( ( string ) topic ["Topic"] );
! 				ViewOptions.Visible = PageContext.BoardSettings.AllowThreaded;
! 				ForumJumpLine.Visible = PageContext.BoardSettings.ShowForumJump && PageContext.Settings.LockedForum == 0;
  
! 				RssTopic.NavigateUrl = YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.rsstopic, "pg={0}&amp;t={1}", Request.QueryString ["g"], PageContext.PageTopicID );
! 				RssTopic.Visible = PageContext.BoardSettings.ShowRSSLink;
  
! 				if ( !PageContext.ForumPostAccess )
  				{
  					NewTopic1.Visible = false;
***************
*** 106,110 ****
  				}
  
! 				if ( !ForumReplyAccess || ( ( int ) topic ["Flags"] & ( int ) YAF.Classes.Data.TopicFlags.Locked ) == ( int ) YAF.Classes.Data.TopicFlags.Locked )
  				{
  					PostReplyLink1.Visible = false;
--- 108,112 ----
  				}
  
! 				if ( !PageContext.ForumReplyAccess || ( ( int ) topic ["Flags"] & ( int ) YAF.Classes.Data.TopicFlags.Locked ) == ( int ) YAF.Classes.Data.TopicFlags.Locked )
  				{
  					PostReplyLink1.Visible = false;
***************
*** 113,117 ****
  				}
  
! 				if ( ForumModeratorAccess )
  				{
  					MoveTopic1.Visible = true;
--- 115,119 ----
  				}
  
! 				if ( PageContext.ForumModeratorAccess )
  				{
  					MoveTopic1.Visible = true;
***************
*** 149,153 ****
  				MoveTopic2.ToolTip = MoveTopic1.ToolTip;
  
! 				if ( !ForumModeratorAccess )
  				{
  					LockTopic1.Visible = false;
--- 151,155 ----
  				MoveTopic2.ToolTip = MoveTopic1.ToolTip;
  
! 				if ( !PageContext.ForumModeratorAccess )
  				{
  					LockTopic1.Visible = false;
***************
*** 168,172 ****
  			}
  			// Mark topic read
! 			SetTopicRead( PageTopicID, DateTime.Now );
  
  			BindData();
--- 170,174 ----
  			}
  			// Mark topic read
! 			Mession.SetTopicRead( PageContext.PageTopicID, DateTime.Now );
  
  			BindData();
***************
*** 185,202 ****
  		private void QuickReply_Click( object sender, EventArgs e )
  		{
! 			if ( !ForumReplyAccess || ( ( int ) topic ["Flags"] & ( int ) YAF.Classes.Data.TopicFlags.Locked ) == ( int ) YAF.Classes.Data.TopicFlags.Locked )
! 				Data.AccessDenied();
  
  			if ( QuickReplyEditor.Text.Length <= 0 )
  			{
! 				AddLoadMessage( "You can't post empty message" );
  				return;
  			}
  
! 			if ( !( IsAdmin || IsModerator ) && BoardSettings.PostFloodDelay > 0 )
  			{
! 				if ( Mession.LastPost > DateTime.Now.AddSeconds( -BoardSettings.PostFloodDelay ) )
  				{
! 					AddLoadMessage( String.Format( GetText( "wait" ), ( Mession.LastPost - DateTime.Now.AddSeconds( -BoardSettings.PostFloodDelay ) ).Seconds ) );
  					return;
  				}
--- 187,204 ----
  		private void QuickReply_Click( object sender, EventArgs e )
  		{
! 			if ( !PageContext.ForumReplyAccess || ( ( int ) topic ["Flags"] & ( int ) YAF.Classes.Data.TopicFlags.Locked ) == ( int ) YAF.Classes.Data.TopicFlags.Locked )
! 				yaf_BuildLink.AccessDenied();
  
  			if ( QuickReplyEditor.Text.Length <= 0 )
  			{
! 				PageContext.AddLoadMessage( "You can't post empty message" );
  				return;
  			}
  
! 			if ( !( PageContext.IsAdmin || PageContext.IsModerator ) && PageContext.BoardSettings.PostFloodDelay > 0 )
  			{
! 				if ( Mession.LastPost > DateTime.Now.AddSeconds( -PageContext.BoardSettings.PostFloodDelay ) )
  				{
! 					PageContext.AddLoadMessage( String.Format( GetText( "wait" ), ( Mession.LastPost - DateTime.Now.AddSeconds( -PageContext.BoardSettings.PostFloodDelay ) ).Seconds ) );
  					return;
  				}
***************
*** 210,214 ****
  			object replyTo = -1;
  			string msg = QuickReplyEditor.Text;
! 			TopicID = PageTopicID;
  
  			MessageFlags tFlags = new MessageFlags();
--- 212,216 ----
  			object replyTo = -1;
  			string msg = QuickReplyEditor.Text;
! 			TopicID = PageContext.PageTopicID;
  
  			MessageFlags tFlags = new MessageFlags();
***************
*** 217,221 ****
  			tFlags.IsBBCode = QuickReplyEditor.UsesBBCode;
  
! 			if ( !YAF.Classes.Data.DB.message_save( TopicID, PageUserID, msg, null, Request.UserHostAddress, null, replyTo, tFlags.BitValue, ref nMessageID ) )
  				TopicID = 0;
  
--- 219,223 ----
  			tFlags.IsBBCode = QuickReplyEditor.UsesBBCode;
  
! 			if ( !YAF.Classes.Data.DB.message_save( TopicID, PageContext.PageUserID, msg, null, Request.UserHostAddress, null, replyTo, tFlags.BitValue, ref nMessageID ) )
  				TopicID = 0;
  
***************
*** 228,240 ****
  			if ( bApproved )
  			{
! 				Forum.Redirect( ForumPages.posts, "m={0}&#{0}", nMessageID );
  			}
  			else
  			{
! 				string url = Forum.GetLink( ForumPages.topics, "f={0}", PageForumID );
! 				if ( YAF.Classes.Utils.Config.IsRainbow )
! 					Forum.Redirect( ForumPages.info, "i=1" );
  				else
! 					Forum.Redirect( ForumPages.info, "i=1&url={0}", Server.UrlEncode( url ) );
  			}
  		}
--- 230,242 ----
  			if ( bApproved )
  			{
! 				YAF.Classes.Utils.yaf_BuildLink.Redirect( YAF.Classes.Utils.ForumPages.posts, "m={0}&#{0}", nMessageID );
  			}
  			else
  			{
! 				string url = YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.topics, "f={0}", PageContext.PageForumID );
! 				if ( YAF.Classes.Config.IsRainbow )
! 					YAF.Classes.Utils.yaf_BuildLink.Redirect( YAF.Classes.Utils.ForumPages.info, "i=1" );
  				else
! 					YAF.Classes.Utils.yaf_BuildLink.Redirect( YAF.Classes.Utils.ForumPages.info, "i=1&url={0}", Server.UrlEncode( url ) );
  			}
  		}
***************
*** 280,287 ****
  			m_bDataBound = true;
  
! 			Pager.PageSize = BoardSettings.PostsPerPage;
  
  			if ( topic == null )
! 				Forum.Redirect( ForumPages.topics, "f={0}", PageForumID );
  
  			PagedDataSource pds = new PagedDataSource();
--- 282,289 ----
  			m_bDataBound = true;
  
! 			Pager.PageSize = PageContext.BoardSettings.PostsPerPage;
  
  			if ( topic == null )
! 				YAF.Classes.Utils.yaf_BuildLink.Redirect( YAF.Classes.Utils.ForumPages.topics, "f={0}", PageContext.PageForumID );
  
  			PagedDataSource pds = new PagedDataSource();
***************
*** 289,299 ****
  			pds.PageSize = Pager.PageSize;
  
!             using ( DataTable dt0 = YAF.Classes.Data.DB.post_list(PageTopicID, IsPostBack ? 0 : 1, BoardSettings.ShowDeletedMessages))
  			{
  				bool ShowAds = true;
  				if ( User != null )
! 					ShowAds = BoardSettings.ShowAdsToSignedInUsers;
  
! 				if ( BoardSettings.AdPost != null && BoardSettings.AdPost.Length > 0 && ShowAds )
  				{
  					// create row for "sponsered" message
--- 291,301 ----
  			pds.PageSize = Pager.PageSize;
  
!             using ( DataTable dt0 = YAF.Classes.Data.DB.post_list(PageContext.PageTopicID, IsPostBack ? 0 : 1, PageContext.BoardSettings.ShowDeletedMessages))
  			{
  				bool ShowAds = true;
  				if ( User != null )
! 					ShowAds = PageContext.BoardSettings.ShowAdsToSignedInUsers;
  
! 				if ( PageContext.BoardSettings.AdPost != null && PageContext.BoardSettings.AdPost.Length > 0 && ShowAds )
  				{
  					// create row for "sponsered" message
***************
*** 336,340 ****
  					{
  						// Find next unread
! 						using ( DataTable dtUnread = YAF.Classes.Data.DB.message_findunread( PageTopicID, Mession.LastVisit ) )
  						{
  							foreach ( DataRow row in dtUnread.Rows )
--- 338,342 ----
  					{
  						// Find next unread
! 						using ( DataTable dtUnread = YAF.Classes.Data.DB.message_findunread( PageContext.PageTopicID, Mession.LastVisit ) )
  						{
  							foreach ( DataRow row in dtUnread.Rows )
***************
*** 348,352 ****
  				catch ( Exception x )
  				{
! 					YAF.Classes.Data.DB.eventlog_create( PageUserID, this, x );
  				}
  
--- 350,354 ----
  				catch ( Exception x )
  				{
! 					YAF.Classes.Data.DB.eventlog_create( PageContext.PageUserID, this, x );
  				}
  
***************
*** 395,399 ****
  			sponserRow ["UserName"] = GetText( "AD_USERNAME" );
  			sponserRow ["UserID"] = 1;
! 			sponserRow ["Message"] = BoardSettings.AdPost;
  			sponserRow ["HasAvatarImage"] = false;
  			sponserRow ["HasAttachments"] = false;
--- 397,401 ----
  			sponserRow ["UserName"] = GetText( "AD_USERNAME" );
  			sponserRow ["UserID"] = 1;
! 			sponserRow ["Message"] = PageContext.BoardSettings.AdPost;
  			sponserRow ["HasAvatarImage"] = false;
  			sponserRow ["HasAttachments"] = false;
***************
*** 419,425 ****
  		private bool HandleWatchTopic()
  		{
! 			if ( IsGuest ) return false;
  			// check if this forum is being watched by this user
! 			using ( DataTable dt = YAF.Classes.Data.DB.watchtopic_check( PageUserID, PageTopicID ) )
  			{
  				if ( dt.Rows.Count > 0 )
--- 421,427 ----
  		private bool HandleWatchTopic()
  		{
! 			if ( PageContext.IsGuest ) return false;
  			// check if this forum is being watched by this user
! 			using ( DataTable dt = YAF.Classes.Data.DB.watchtopic_check( PageContext.PageUserID, PageContext.PageTopicID ) )
  			{
  				if ( dt.Rows.Count > 0 )
***************
*** 445,462 ****
  		protected void DeleteTopic_Click( object sender, System.EventArgs e )
  		{
! 			if ( !ForumModeratorAccess )
! 				Data.AccessDenied(/*"You don't have access to delete topics."*/);
  
  			// Take away 150 points once!
! 			YAF.Classes.Data.DB.user_removepointsByTopicID( PageTopicID, 150 );
! 			YAF.Classes.Data.DB.topic_delete( PageTopicID );
! 			Forum.Redirect( ForumPages.topics, "f={0}", PageForumID );
  		}
  
  		protected void LockTopic_Click( object sender, System.EventArgs e )
  		{
! 			YAF.Classes.Data.DB.topic_lock( PageTopicID, true );
  			BindData();
! 			AddLoadMessage( GetText( "INFO_TOPIC_LOCKED" ) );
  			LockTopic1.Visible = !LockTopic1.Visible;
  			UnlockTopic1.Visible = !UnlockTopic1.Visible;
--- 447,464 ----
  		protected void DeleteTopic_Click( object sender, System.EventArgs e )
  		{
! 			if ( !PageContext.ForumModeratorAccess )
! 				yaf_BuildLink.AccessDenied(/*"You don't have access to delete topics."*/);
  
  			// Take away 150 points once!
! 			YAF.Classes.Data.DB.user_removepointsByTopicID( PageContext.PageTopicID, 150 );
! 			YAF.Classes.Data.DB.topic_delete( PageContext.PageTopicID );
! 			YAF.Classes.Utils.yaf_BuildLink.Redirect( YAF.Clas...
 
[truncated message content]

[Yafdotnet-cvs] yafsrc/pages/moderate forum.ascx.cs, 1.15, 1.16 index.ascx, 1.7, 1.8 index.ascx.cs, 1.12, 1.13

[Jaben C. <ja...@us...>]

Update of /cvsroot/yafdotnet/yafsrc/pages/moderate
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv4847/pages/moderate

Modified Files:
	forum.ascx.cs index.ascx index.ascx.cs 
Log Message:
Next round of commits... getting better. still plenty more to do!

Index: index.ascx
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/moderate/index.ascx,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** index.ascx	14 Dec 2006 17:19:49 -0000	1.7
--- index.ascx	19 Jan 2007 13:16:18 -0000	1.8
***************
*** 21,25 ****
  			<td><img src='<%# GetThemeContents("ICONS","FORUM") %>'/></td>
  			<td>
! 				<b><a href='<%# YAF.Forum.GetLink(YAF.ForumPages.moderate_forum,"f={0}",Eval("ForumID")) %>'><%# Eval("ForumName") %></a></b><br/>
  				<%# GetText("MODERATE_DEFAULT","CATEGORY") %>: <%# Eval("CategoryName") %>
  			</td>
--- 21,25 ----
  			<td><img src='<%# GetThemeContents("ICONS","FORUM") %>'/></td>
  			<td>
! 				<b><a href='<%# YAF.Classes.Utils.yaf_BuildLink.GetLink(YAF.Classes.Utils.ForumPages.moderate_forum,"f={0}",Eval("ForumID")) %>'><%# Eval("ForumName") %></a></b><br/>
  				<%# GetText("MODERATE_DEFAULT","CATEGORY") %>: <%# Eval("CategoryName") %>
  			</td>

Index: index.ascx.cs
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/moderate/index.ascx.cs,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** index.ascx.cs	14 Dec 2006 17:19:49 -0000	1.12
--- index.ascx.cs	19 Jan 2007 13:16:18 -0000	1.13
***************
*** 9,12 ****
--- 9,14 ----
  using System.Web.UI.WebControls;
  using System.Web.UI.HtmlControls;
+ using YAF.Classes.Utils;
+ using YAF.Classes.Data;
  
  namespace YAF.Pages.moderate
***************
*** 15,19 ****
  	/// Summary description for _default.
  	/// </summary>
! 	public partial class index : ForumPage
  	{
  
--- 17,21 ----
  	/// Summary description for _default.
  	/// </summary>
! 	public partial class index : YAF.Classes.Base.ForumPage
  	{
  
***************
*** 24,33 ****
  		protected void Page_Load(object sender, System.EventArgs e)
  		{
! 			if(!IsModerator) 
! 				Data.AccessDenied();
  
  			if(!IsPostBack) 
  			{
! 				PageLinks.AddLink(BoardSettings.Name,Forum.GetLink( ForumPages.forum));
  				PageLinks.AddLink(GetText("MODERATE_DEFAULT","TITLE"),"");
  				BindData();
--- 26,35 ----
  		protected void Page_Load(object sender, System.EventArgs e)
  		{
! 			if(!PageContext.IsModerator) 
! 				yaf_BuildLink.AccessDenied();
  
  			if(!IsPostBack) 
  			{
! 				PageLinks.AddLink(PageContext.BoardSettings.Name,YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.forum));
  				PageLinks.AddLink(GetText("MODERATE_DEFAULT","TITLE"),"");
  				BindData();

Index: forum.ascx.cs
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/moderate/forum.ascx.cs,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** forum.ascx.cs	21 Dec 2006 16:01:57 -0000	1.15
--- forum.ascx.cs	19 Jan 2007 13:16:18 -0000	1.16
***************
*** 8,11 ****
--- 8,13 ----
  using System.Web.UI.WebControls;
  using System.Web.UI.HtmlControls;
+ using YAF.Classes.Utils;
+ using YAF.Classes.Data;
  
  namespace YAF.Pages.moderate
***************
*** 14,73 ****
  	/// Summary description for _default.
  	/// </summary>
! 	public partial class forum : ForumPage
  	{
  
! 		public forum() : base("MODERATE_FORUM")
  		{
  		}
  
! 		protected void Page_Load(object sender, System.EventArgs e)
  		{
! 			if(!IsModerator || !ForumModeratorAccess) 
! 				Data.AccessDenied();
  
! 			if(!IsPostBack) 
  			{
! 				PageLinks.AddLink(BoardSettings.Name,Forum.GetLink( ForumPages.forum));
! 				PageLinks.AddLink(GetText("MODERATE_DEFAULT","TITLE"),"");
! 				PageLinks.AddForumLinks(PageForumID);
  				BindData();
  			}
  		}
  
! 		protected void Delete_Load(object sender, System.EventArgs e) 
  		{
! 			((LinkButton)sender).Attributes["onclick"] = String.Format("return confirm('{0}')",GetText("MODERATE_FORUM","ASK_DELETE"));
  		}
  
! 		private void BindData() 
  		{
! 			List.DataSource = YAF.Classes.Data.DB.message_unapproved(PageForumID);
  			DataBind();
  		}
  
! 		protected string FormatMessage(DataRowView row) 
  		{
! 			string msg = row["Message"].ToString();
! 			
! 			if(msg.IndexOf('<')>=0)
  				return msg;
  
! 			return FormatMsg.ForumCodeToHtml(this,row["Message"].ToString());
  		}
  
! 		private void List_ItemCommand(object sender,RepeaterCommandEventArgs e) 
  		{
! 			switch(e.CommandName.ToLower()) 
  			{
  				case "approve":
! 					YAF.Classes.Data.DB.message_approve(e.CommandArgument);
  					BindData();
! 					AddLoadMessage(GetText("MODERATE_FORUM","APPROVED"));
! 					Utils.CreateWatchEmail(this,e.CommandArgument);
  					break;
  				case "delete":
!                     YAF.Classes.Data.DB.message_delete(e.CommandArgument, true, "", 1, true);
  					BindData();
! 					AddLoadMessage(GetText("MODERATE_FORUM","DELETED"));
  					break;
  			}
--- 16,76 ----
  	/// Summary description for _default.
  	/// </summary>
! 	public partial class forum : YAF.Classes.Base.ForumPage
  	{
  
! 		public forum()
! 			: base( "MODERATE_FORUM" )
  		{
  		}
  
! 		protected void Page_Load( object sender, System.EventArgs e )
  		{
! 			if ( !PageContext.IsModerator || !PageContext.ForumModeratorAccess )
! 				yaf_BuildLink.AccessDenied();
  
! 			if ( !IsPostBack )
  			{
! 				PageLinks.AddLink( PageContext.BoardSettings.Name, YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.forum ) );
! 				PageLinks.AddLink( GetText( "MODERATE_DEFAULT", "TITLE" ), "" );
! 				PageLinks.AddForumLinks( PageContext.PageForumID );
  				BindData();
  			}
  		}
  
! 		protected void Delete_Load( object sender, System.EventArgs e )
  		{
! 			( ( LinkButton ) sender ).Attributes ["onclick"] = String.Format( "return confirm('{0}')", GetText( "MODERATE_FORUM", "ASK_DELETE" ) );
  		}
  
! 		private void BindData()
  		{
! 			List.DataSource = YAF.Classes.Data.DB.message_unapproved( PageContext.PageForumID );
  			DataBind();
  		}
  
! 		protected string FormatMessage( DataRowView row )
  		{
! 			string msg = row ["Message"].ToString();
! 
! 			if ( msg.IndexOf( '<' ) >= 0 )
  				return msg;
  
! 			return row ["Message"].ToString();
  		}
  
! 		private void List_ItemCommand( object sender, RepeaterCommandEventArgs e )
  		{
! 			switch ( e.CommandName.ToLower() )
  			{
  				case "approve":
! 					YAF.Classes.Data.DB.message_approve( e.CommandArgument );
  					BindData();
! 					PageContext.AddLoadMessage( GetText( "MODERATE_FORUM", "APPROVED" ) );
! 					General.CreateWatchEmail( e.CommandArgument );
  					break;
  				case "delete":
! 					YAF.Classes.Data.DB.message_delete( e.CommandArgument, true, "", 1, true );
  					BindData();
! 					PageContext.AddLoadMessage( GetText( "MODERATE_FORUM", "DELETED" ) );
  					break;
  			}
***************
*** 75,88 ****
  
  		#region Web Form Designer generated code
! 		override protected void OnInit(EventArgs e)
  		{
! 			List.ItemCommand += new RepeaterCommandEventHandler(List_ItemCommand);
  			//
  			// 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
--- 78,91 ----
  
  		#region Web Form Designer generated code
! 		override protected void OnInit( EventArgs e )
  		{
! 			List.ItemCommand += new RepeaterCommandEventHandler( List_ItemCommand );
  			//
  			// 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
***************
*** 90,94 ****
  		/// </summary>
  		private void InitializeComponent()
! 		{    
  		}
  		#endregion
--- 93,97 ----
  		/// </summary>
  		private void InitializeComponent()
! 		{
  		}
  		#endregion

[Yafdotnet-cvs] yafsrc/pages/help index.ascx.cs, 1.6, 1.7 recover.ascx.cs, 1.6, 1.7

[Jaben C. <ja...@us...>]

Update of /cvsroot/yafdotnet/yafsrc/pages/help
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv4847/pages/help

Modified Files:
	index.ascx.cs recover.ascx.cs 
Log Message:
Next round of commits... getting better. still plenty more to do!

Index: index.ascx.cs
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/help/index.ascx.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** index.ascx.cs	14 Dec 2006 17:19:49 -0000	1.6
--- index.ascx.cs	19 Jan 2007 13:16:18 -0000	1.7
***************
*** 27,30 ****
--- 27,32 ----
  using System.Web.UI.WebControls;
  using System.Web.UI.HtmlControls;
+ using YAF.Classes.Utils;
+ using YAF.Classes.Data;
  
  namespace YAF.Pages.help
***************
*** 33,37 ****
  	/// Summary description for main.
  	/// </summary>
! 	public partial class index : ForumPage
  	{
  
--- 35,39 ----
  	/// Summary description for main.
  	/// </summary>
! 	public partial class index : YAF.Classes.Base.ForumPage
  	{
  
***************
*** 44,49 ****
  			if(!IsPostBack) 
  			{
! 				PageLinks.AddLink(BoardSettings.Name,Forum.GetLink( ForumPages.forum));
! 				PageLinks.AddLink("Help",Forum.GetLink( ForumPages.help_index));
  				BindData();
  			}
--- 46,51 ----
  			if(!IsPostBack) 
  			{
! 				PageLinks.AddLink(PageContext.BoardSettings.Name,YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.forum));
! 				PageLinks.AddLink("Help",YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.help_index));
  				BindData();
  			}

Index: recover.ascx.cs
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/pages/help/recover.ascx.cs,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** recover.ascx.cs	14 Dec 2006 17:19:49 -0000	1.6
--- recover.ascx.cs	19 Jan 2007 13:16:18 -0000	1.7
***************
*** 27,30 ****
--- 27,32 ----
  using System.Web.UI.WebControls;
  using System.Web.UI.HtmlControls;
+ using YAF.Classes.Utils;
+ using YAF.Classes.Data;
  
  namespace YAF.Pages.help
***************
*** 33,37 ****
  	/// Summary description for main.
  	/// </summary>
! 	public partial class recover : ForumPage
  	{
  
--- 35,39 ----
  	/// Summary description for main.
  	/// </summary>
! 	public partial class recover : YAF.Classes.Base.ForumPage
  	{
  
***************
*** 44,50 ****
  			if(!IsPostBack) 
  			{
! 				PageLinks.AddLink(BoardSettings.Name,Forum.GetLink( ForumPages.forum));
! 				PageLinks.AddLink("Help",Forum.GetLink( ForumPages.help_index));
! 				PageLinks.AddLink("Recover lost passwords",Forum.GetLink( ForumPages.help_recover));
  				BindData();
  			}
--- 46,52 ----
  			if(!IsPostBack) 
  			{
! 				PageLinks.AddLink(PageContext.BoardSettings.Name,YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.forum));
! 				PageLinks.AddLink("Help",YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.help_index));
! 				PageLinks.AddLink("Recover lost passwords",YAF.Classes.Utils.yaf_BuildLink.GetLink( YAF.Classes.Utils.ForumPages.help_recover));
  				BindData();
  			}

[Yafdotnet-cvs] yafsrc/install default.aspx.cs,1.36,1.37

[Jaben C. <ja...@us...>]

Update of /cvsroot/yafdotnet/yafsrc/install
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv4711/install

Modified Files:
	default.aspx.cs 
Log Message:
Next round of commits... getting better.

Index: default.aspx.cs
===================================================================
RCS file: /cvsroot/yafdotnet/yafsrc/install/default.aspx.cs,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** default.aspx.cs	16 Dec 2006 13:36:12 -0000	1.36
--- default.aspx.cs	19 Jan 2007 13:15:48 -0000	1.37
***************
*** 32,35 ****
--- 32,37 ----
  using System.Web.UI.HtmlControls;
  using System.Globalization;
+ using YAF.Classes.Utils;
+ using YAF.Classes.Data;
  
  namespace YAF.Install
***************
*** 61,65 ****
                      InstallWizard.ActiveStepIndex = 0;
  
! 				TimeZones.DataSource = Data.TimeZones();
  				DataBind();
  				TimeZones.Items.FindByValue( "0" ).Selected = true;
--- 63,67 ----
                      InstallWizard.ActiveStepIndex = 0;
  
! 				TimeZones.DataSource = yaf_StaticData.TimeZones();
  				DataBind();
  				TimeZones.Items.FindByValue( "0" ).Selected = true;
***************
*** 69,76 ****
  		void Wizard_FinishButtonClick( object sender, WizardNavigationEventArgs e )
  		{
! 			if ( YAF.Classes.Utils.Config.IsDotNetNuke )
  			{
  				//Redirect back to the portal main page.
! 				string rPath = Data.ForumRoot;
  				int pos = rPath.IndexOf( "/", 2 );
  				rPath = rPath.Substring( 0, pos );
--- 71,78 ----
  		void Wizard_FinishButtonClick( object sender, WizardNavigationEventArgs e )
  		{
! 			if ( YAF.Classes.Config.IsDotNetNuke )
  			{
  				//Redirect back to the portal main page.
! 				string rPath = yaf_ForumInfo.ForumRoot;
  				int pos = rPath.IndexOf( "/", 2 );
  				rPath = rPath.Substring( 0, pos );
***************
*** 220,225 ****
  				{
  					cmd.CommandType = CommandType.StoredProcedure;
! 					cmd.Parameters.AddWithValue( "@Version", Data.AppVersion );
! 					cmd.Parameters.AddWithValue( "@VersionName", Data.AppVersionName );
  					YAF.Classes.Data.DB.ExecuteNonQuery( cmd );
  				}
--- 222,227 ----
  				{
  					cmd.CommandType = CommandType.StoredProcedure;
! 					cmd.Parameters.AddWithValue( "@Version", yaf_ForumInfo.AppVersion );
! 					cmd.Parameters.AddWithValue( "@VersionName", yaf_ForumInfo.AppVersionName );
  					YAF.Classes.Data.DB.ExecuteNonQuery( cmd );
  				}
***************
*** 324,329 ****
  				{
  					cmd.CommandType = CommandType.StoredProcedure;
! 					cmd.Parameters.AddWithValue( "@Version", Data.AppVersion );
! 					cmd.Parameters.AddWithValue( "@VersionName", Data.AppVersionName );
  					YAF.Classes.Data.DB.ExecuteNonQuery( cmd );
  				}
--- 326,331 ----
  				{
  					cmd.CommandType = CommandType.StoredProcedure;
! 					cmd.Parameters.AddWithValue( "@Version", yaf_ForumInfo.AppVersion );
! 					cmd.Parameters.AddWithValue( "@VersionName", yaf_ForumInfo.AppVersionName );
  					YAF.Classes.Data.DB.ExecuteNonQuery( cmd );
  				}
***************
*** 381,385 ****
  				try
  				{
! 					return int.Parse( YAF.Classes.Utils.Config.BoardID );
  				}
  				catch
--- 383,387 ----
  				try
  				{
! 					return int.Parse( YAF.Classes.Config.BoardID );
  				}
  				catch