Namespaces refactoring

Builder/IISMainHandler/build.txt

@@ -1 +1 @@
-1919
+1925

Common/BBCodes/Quote.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using FLocal.Core;
+using Web.Core;
 using PJonDevelopment.BBCode;
 
 namespace FLocal.Common.BBCodes {

Common/BBCodes/helpers/TexProcessor.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using FLocal.TexCompiler;
+using TexCompiler;
 using System.IO;
 
 namespace FLocal.Common.BBCodes.helpers {

Common/BBCodes/helpers/UrlProcessor.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Web;
-using FLocal.Core;
+using Web.Core;
 
 namespace FLocal.Common.BBCodes {
 	class UrlProcessor {
@@ -35,7 +35,7 @@ namespace FLocal.Common.BBCodes {
 			try {
 				uri = new Uri(url);
 			} catch(UriFormatException) {
-				throw new Core.FLocalException("wrong url: " + url);
+				throw new Web.Core.FLocalException("wrong url: " + url);
 			}
 			if (Config.instance.AdditionalHosts.Contains(uri.Host.ToLower()) || uri.Host.ToLower().EndsWith(Config.instance.BaseHost)) {
 				return new UrlInfo(true, uri.PathAndQuery);

Common/Config.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Collections.Specialized;
-using FLocal.Core;
+using Web.Core;
 
 namespace FLocal.Common {
 
@@ -11,7 +11,7 @@ namespace FLocal.Common {
 
 		public readonly string InitTime;
 
-		public readonly Core.DB.IDBConnection mainConnection;
+		public readonly Web.Core.DB.IDBConnection mainConnection;
 
 		public readonly string dataDir;
 
@@ -86,8 +86,8 @@ namespace FLocal.Common {
 			base.Dispose();
 		}
 
-		public static void Transactional(Action<Core.DB.Transaction> action) {
-			using(Core.DB.Transaction transaction = Core.DB.IDBConnectionExtensions.beginTransaction(instance.mainConnection)) {
+		public static void Transactional(Action<Web.Core.DB.Transaction> action) {
+			using(Web.Core.DB.Transaction transaction = Web.Core.DB.IDBConnectionExtensions.beginTransaction(instance.mainConnection)) {
 				bool success = false;
 				try {
 					action(transaction);

Common/ISqlObjectTableSpec.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using FLocal.Core.DB;
+using Web.Core.DB;
 
 namespace FLocal.Common {
 	public interface ISqlObjectTableSpec : ITableSpec {

Common/SqlObject.cs

@@ -2,11 +2,11 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using FLocal.Core;
-using FLocal.Core.DB;
+using Web.Core;
+using Web.Core.DB;
 
 namespace FLocal.Common {
-	abstract public class SqlObject<TKey, T> : Core.DataObject<TKey, T>
+	abstract public class SqlObject<TKey, T> : Web.Core.DataObject<TKey, T>
 		where T : SqlObject<TKey, T>, new()
 		where TKey : struct {
 

Common/TableManager.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using FLocal.Core;
+using Web.Core;
 
 namespace FLocal.Common {
 	public static class TableManager {

Common/UBBParser.cs

@@ -6,7 +6,7 @@ using System.Web;
 using System.Text.RegularExpressions;
 using PJonDevelopment.BBCode;
 using System.IO;
-using FLocal.Core;
+using Web.Core;
 
 namespace FLocal.Common {
 	public static class UBBParser {

Common/URL/AbstractUrl.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using FLocal.Core;
+using Web.Core;
 
 namespace FLocal.Common.URL {
 	public abstract class AbstractUrl {

Common/URL/upload/Info.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using FLocal.Core;
+using Web.Core;
 using FLocal.Common.dataobjects;
 
 namespace FLocal.Common.URL.upload {

Common/URL/upload/Item.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using FLocal.Core;
+using Web.Core;
 using FLocal.Common.dataobjects;
 
 namespace FLocal.Common.URL.upload {

Common/UploadManager.cs

@@ -3,10 +3,10 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.IO;
-using FLocal.Core;
+using Web.Core;
 using FLocal.Common.dataobjects;
-using FLocal.Core.DB;
-using FLocal.Core.DB.conditions;
+using Web.Core.DB;
+using Web.Core.DB.conditions;
 using System.Net;
 
 namespace FLocal.Common {

Common/UserContext.cs

@@ -7,9 +7,9 @@ using System.Xml.Linq;
 namespace FLocal.Common {
 	abstract public class UserContext {
 	
-		public Common.Config config {
+		public FLocal.Common.Config config {
 			get {
-				return Common.Config.instance;
+				return FLocal.Common.Config.instance;
 			}
 		}
 
@@ -62,7 +62,7 @@ namespace FLocal.Common {
 		}
 
 		public static Guid GetGuid(this Exception exception) {
-			return Core.Cache<Guid>.instance.get(exception, () => Guid.NewGuid());
+			return Web.Core.Cache<Guid>.instance.get(exception, () => Guid.NewGuid());
 		}
 
 		public static XElement ToXml(this Exception exception) {

Common/actions/AbstractChange.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using FLocal.Core.DB;
+using Web.Core.DB;
 
 namespace FLocal.Common.actions {
 	abstract public class AbstractChange {

Common/actions/ChangeSet.cs

@@ -2,8 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using FLocal.Core;
-using FLocal.Core.DB;
+using Web.Core;
+using Web.Core.DB;
 
 namespace FLocal.Common.actions {
 

Common/actions/ChangeSetUtil.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using FLocal.Core.DB;
+using Web.Core.DB;
 
 namespace FLocal.Common.actions {
 	public static class ChangeSetUtil {

Common/actions/InsertChange.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using FLocal.Core.DB;
+using Web.Core.DB;
 
 namespace FLocal.Common.actions {
 	public class InsertChange : AbstractChange {

Common/actions/InsertOrUpdateChange.cs

@@ -2,9 +2,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using FLocal.Core;
-using FLocal.Core.DB;
-using FLocal.Core.DB.conditions;
+using Web.Core;
+using Web.Core.DB;
+using Web.Core.DB.conditions;
 
 namespace FLocal.Common.actions {
 	class InsertOrUpdateChange : AbstractChange {

Common/actions/UpdateChange.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using FLocal.Core.DB;
+using Web.Core.DB;
 
 namespace FLocal.Common.actions {
 	public class UpdateChange : AbstractChange {

Common/dataobjects/Account.cs

@@ -3,9 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Xml.Linq;
-using FLocal.Core;
-using FLocal.Core.DB;
-using FLocal.Core.DB.conditions;
+using Web.Core;
+using Web.Core.DB;
+using Web.Core.DB.conditions;
 using FLocal.Common.actions;
 
 namespace FLocal.Common.dataobjects {

Common/dataobjects/AccountIndicator.cs

@@ -3,9 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Xml.Linq;
-using FLocal.Core;
-using FLocal.Core.DB;
-using FLocal.Core.DB.conditions;
+using Web.Core;
+using Web.Core.DB;
+using Web.Core.DB.conditions;
 using FLocal.Common.actions;
 
 namespace FLocal.Common.dataobjects {

Common/dataobjects/AccountSettings.cs

@@ -3,9 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Xml.Linq;
-using FLocal.Core;
-using FLocal.Core.DB;
-using FLocal.Core.DB.conditions;
+using Web.Core;
+using Web.Core.DB;
+using Web.Core.DB.conditions;
 using FLocal.Common.actions;
 
 namespace FLocal.Common.dataobjects {

Common/dataobjects/AnonymousUserSettings.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using FLocal.Core;
+using Web.Core;
 
 namespace FLocal.Common.dataobjects {
 	public class AnonymousUserSettings : IUserSettings {

Common/dataobjects/AvatarsSettings.cs

@@ -3,9 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Xml.Linq;
-using FLocal.Core;
-using FLocal.Core.DB;
-using FLocal.Core.DB.conditions;
+using Web.Core;
+using Web.Core.DB;
+using Web.Core.DB.conditions;
 using FLocal.Common.actions;
 
 namespace FLocal.Common.dataobjects {

Common/dataobjects/Board.cs

@@ -3,9 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Xml.Linq;
-using FLocal.Core;
-using FLocal.Core.DB;
-using FLocal.Core.DB.conditions;
+using Web.Core;
+using Web.Core.DB;
+using Web.Core.DB.conditions;
 using FLocal.Common.actions;
 
 namespace FLocal.Common.dataobjects {
@@ -212,9 +212,9 @@ namespace FLocal.Common.dataobjects {
 						() => {
 							IEnumerable<int> ids = (from stringId in Config.instance.mainConnection.LoadIdsByConditions(
 								TableSpec.instance,
-								new FLocal.Core.DB.conditions.ComparisonCondition(
+								new Web.Core.DB.conditions.ComparisonCondition(
 									TableSpec.instance.getColumnSpec(Board.TableSpec.FIELD_PARENTBOARDID),
-									FLocal.Core.DB.conditions.ComparisonType.EQUAL,
+									Web.Core.DB.conditions.ComparisonType.EQUAL,
 									this.id.ToString()
 								),
 								Diapasone.unlimited

Common/dataobjects/Category.cs

@@ -2,8 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using FLocal.Core;
-using FLocal.Core.DB;
+using Web.Core;
+using Web.Core.DB;
 using System.Xml.Linq;
 
 namespace FLocal.Common.dataobjects {
@@ -57,7 +57,7 @@ namespace FLocal.Common.dataobjects {
 						() => {
 							IEnumerable<int> ids = (from stringId in Config.instance.mainConnection.LoadIdsByConditions(
 								TableSpec.instance,
-								new FLocal.Core.DB.conditions.EmptyCondition(),
+								new Web.Core.DB.conditions.EmptyCondition(),
 								Diapasone.unlimited
 							) select int.Parse(stringId)).ToList();
 							Category.LoadByIds(ids);
@@ -82,9 +82,9 @@ namespace FLocal.Common.dataobjects {
 						() => {
 							IEnumerable<int> ids = (from stringId in Config.instance.mainConnection.LoadIdsByConditions(
 								Board.TableSpec.instance,
-								new FLocal.Core.DB.conditions.ComparisonCondition(
+								new Web.Core.DB.conditions.ComparisonCondition(
 									Board.TableSpec.instance.getColumnSpec(Board.TableSpec.FIELD_CATEGORYID),
-									FLocal.Core.DB.conditions.ComparisonType.EQUAL,
+									Web.Core.DB.conditions.ComparisonType.EQUAL,
 									this.id.ToString()
 								),
 								Diapasone.unlimited

Common/dataobjects/Invite.cs

@@ -3,9 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Xml.Linq;
-using FLocal.Core;
-using FLocal.Core.DB;
-using FLocal.Core.DB.conditions;
+using Web.Core;
+using Web.Core.DB;
+using Web.Core.DB.conditions;
 using FLocal.Common.actions;
 
 namespace FLocal.Common.dataobjects {

Common/dataobjects/LocalNetwork.cs

@@ -3,10 +3,10 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Xml.Linq;
-using FLocal.Core;
-using FLocal.Core.DB;
-using FLocal.Core.DB.conditions;
-using FLocal.Core.Network;
+using Web.Core;
+using Web.Core.DB;
+using Web.Core.DB.conditions;
+using Web.Core.Network;
 
 namespace FLocal.Common.dataobjects {
 	public class LocalNetwork : SqlObject<LocalNetwork> {

Common/dataobjects/Machichara.cs

@@ -3,9 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Xml.Linq;
-using FLocal.Core;
-using FLocal.Core.DB;
-using FLocal.Core.DB.conditions;
+using Web.Core;
+using Web.Core.DB;
+using Web.Core.DB.conditions;
 
 namespace FLocal.Common.dataobjects {
 	public class Machichara : SqlObject<Machichara> {
@@ -43,7 +43,7 @@ namespace FLocal.Common.dataobjects {
 						() => {
 							List<int> ids = (from stringId in Config.instance.mainConnection.LoadIdsByConditions(
 								TableSpec.instance,
-								new FLocal.Core.DB.conditions.EmptyCondition(),
+								new Web.Core.DB.conditions.EmptyCondition(),
 								Diapasone.unlimited
 							) select int.Parse(stringId)).ToList();
 							Machichara.LoadByIds(ids);

Common/dataobjects/Moderator.cs

@@ -3,9 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Xml.Linq;
-using FLocal.Core;
-using FLocal.Core.DB;
-using FLocal.Core.DB.conditions;
+using Web.Core;
+using Web.Core.DB;
+using Web.Core.DB.conditions;
 
 namespace FLocal.Common.dataobjects {
 	public class Moderator : SqlObject<Moderator> {

Common/dataobjects/ModernSkin.cs

@@ -3,9 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Xml.Linq;
-using FLocal.Core;
-using FLocal.Core.DB;
-using FLocal.Core.DB.conditions;
+using Web.Core;
+using Web.Core.DB;
+using Web.Core.DB.conditions;
 
 namespace FLocal.Common.dataobjects {
 	public class ModernSkin : SqlObject<ModernSkin> {
@@ -43,7 +43,7 @@ namespace FLocal.Common.dataobjects {
 						() => {
 							List<int> ids = (from stringId in Config.instance.mainConnection.LoadIdsByConditions(
 								TableSpec.instance,
-								new FLocal.Core.DB.conditions.EmptyCondition(),
+								new Web.Core.DB.conditions.EmptyCondition(),
 								Diapasone.unlimited
 							) select int.Parse(stringId)).ToList();
 							ModernSkin.LoadByIds(ids);

Common/dataobjects/PMConversation.cs

@@ -3,9 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Xml.Linq;
-using FLocal.Core;
-using FLocal.Core.DB;
-using FLocal.Core.DB.conditions;
+using Web.Core;
+using Web.Core.DB;
+using Web.Core.DB.conditions;
 using FLocal.Common.actions;
 
 namespace FLocal.Common.dataobjects {

Common/dataobjects/PMMessage.cs

@@ -3,8 +3,8 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Xml.Linq;
-using FLocal.Core;
-using FLocal.Core.DB;
+using Web.Core;
+using Web.Core.DB;
 using FLocal.Common;
 using FLocal.Common.actions;
 

Common/dataobjects/Poll.cs

@@ -3,9 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Xml.Linq;
-using FLocal.Core;
-using FLocal.Core.DB;
-using FLocal.Core.DB.conditions;
+using Web.Core;
+using Web.Core.DB;
+using Web.Core.DB.conditions;
 using FLocal.Common.actions;
 
 namespace FLocal.Common.dataobjects {

Common/dataobjects/Post.cs

@@ -3,9 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Xml.Linq;
-using FLocal.Core;
-using FLocal.Core.DB;
-using FLocal.Core.DB.conditions;
+using Web.Core;
+using Web.Core.DB;
+using Web.Core.DB.conditions;
 using FLocal.Common;
 using FLocal.Common.actions;
 

Common/dataobjects/PostLayer.cs

@@ -3,9 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Xml.Linq;
-using FLocal.Core;
-using FLocal.Core.DB;
-using FLocal.Core.DB.conditions;
+using Web.Core;
+using Web.Core.DB;
+using Web.Core.DB.conditions;
 
 namespace FLocal.Common.dataobjects {
 	public class PostLayer : SqlObject<PostLayer> {
@@ -58,7 +58,7 @@ namespace FLocal.Common.dataobjects {
 						() => {
 							List<int> ids = (from stringId in Config.instance.mainConnection.LoadIdsByConditions(
 								TableSpec.instance,
-								new FLocal.Core.DB.conditions.EmptyCondition(),
+								new Web.Core.DB.conditions.EmptyCondition(),
 								Diapasone.unlimited
 							) select int.Parse(stringId)).ToList();
 							PostLayer.LoadByIds(ids);

Common/dataobjects/Punishment.cs

@@ -3,9 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Xml.Linq;
-using FLocal.Core;
-using FLocal.Core.DB;
-using FLocal.Core.DB.conditions;
+using Web.Core;
+using Web.Core.DB;
+using Web.Core.DB.conditions;
 
 namespace FLocal.Common.dataobjects {
 	public class Punishment : SqlObject<Punishment> {

Common/dataobjects/PunishmentLayerChange.cs

@@ -3,9 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Xml.Linq;
-using FLocal.Core;
-using FLocal.Core.DB;
-using FLocal.Core.DB.conditions;
+using Web.Core;
+using Web.Core.DB;
+using Web.Core.DB.conditions;
 
 namespace FLocal.Common.dataobjects {
 	public class PunishmentLayerChange : SqlObject<PunishmentLayerChange> {

Common/dataobjects/PunishmentTransfer.cs

@@ -3,9 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Xml.Linq;
-using FLocal.Core;
-using FLocal.Core.DB;
-using FLocal.Core.DB.conditions;
+using Web.Core;
+using Web.Core.DB;
+using Web.Core.DB.conditions;
 
 namespace FLocal.Common.dataobjects {
 	public class PunishmentTransfer : SqlObject<PunishmentTransfer> {

Common/dataobjects/PunishmentType.cs

@@ -3,9 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Xml.Linq;
-using FLocal.Core;
-using FLocal.Core.DB;
-using FLocal.Core.DB.conditions;
+using Web.Core;
+using Web.Core.DB;
+using Web.Core.DB.conditions;
 
 namespace FLocal.Common.dataobjects {
 	public class PunishmentType : SqlObject<PunishmentType> {
@@ -83,7 +83,7 @@ namespace FLocal.Common.dataobjects {
 						() => {
 							List<int> ids = (from stringId in Config.instance.mainConnection.LoadIdsByConditions(
 								TableSpec.instance,
-								new FLocal.Core.DB.conditions.EmptyCondition(),
+								new Web.Core.DB.conditions.EmptyCondition(),
 								Diapasone.unlimited
 							) select int.Parse(stringId)).ToList();
 							PunishmentType.LoadByIds(ids);

Common/dataobjects/QuickLink.cs

@@ -3,9 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Xml.Linq;
-using FLocal.Core;
-using FLocal.Core.DB;
-using FLocal.Core.DB.conditions;
+using Web.Core;
+using Web.Core.DB;
+using Web.Core.DB.conditions;
 
 namespace FLocal.Common.dataobjects {
 	public class QuickLink : SqlObject<QuickLink> {

Common/dataobjects/Restriction.cs

@@ -3,9 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Xml.Linq;
-using FLocal.Core;
-using FLocal.Core.DB;
-using FLocal.Core.DB.conditions;
+using Web.Core;
+using Web.Core.DB;
+using Web.Core.DB.conditions;
 using FLocal.Common.actions;
 
 namespace FLocal.Common.dataobjects {

Common/dataobjects/Revision.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using FLocal.Core;
+using Web.Core;
 using System.Xml.Linq;
 
 namespace FLocal.Common.dataobjects {

Common/dataobjects/Session.cs

@@ -3,9 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Xml.Linq;
-using FLocal.Core;
-using FLocal.Core.DB;
-using FLocal.Core.DB.conditions;
+using Web.Core;
+using Web.Core.DB;
+using Web.Core.DB.conditions;
 using FLocal.Common.actions;
 
 namespace FLocal.Common.dataobjects {

Common/dataobjects/Skin.cs

@@ -3,9 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Xml.Linq;
-using FLocal.Core;
-using FLocal.Core.DB;
-using FLocal.Core.DB.conditions;
+using Web.Core;
+using Web.Core.DB;
+using Web.Core.DB.conditions;
 
 namespace FLocal.Common.dataobjects {
 	public class Skin : SqlObject<Skin> {
@@ -43,7 +43,7 @@ namespace FLocal.Common.dataobjects {
 						() => {
 							List<int> ids = (from stringId in Config.instance.mainConnection.LoadIdsByConditions(
 								TableSpec.instance,
-								new FLocal.Core.DB.conditions.EmptyCondition(),
+								new Web.Core.DB.conditions.EmptyCondition(),
 								Diapasone.unlimited
 							) select int.Parse(stringId)).ToList();
 							Skin.LoadByIds(ids);

Common/dataobjects/TexImage.cs

@@ -3,11 +3,11 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Xml.Linq;
-using FLocal.Core;
-using FLocal.Core.DB;
-using FLocal.Core.DB.conditions;
+using Web.Core;
+using Web.Core.DB;
+using Web.Core.DB.conditions;
 using FLocal.Common.actions;
-using FLocal.TexCompiler;
+using TexCompiler;
 
 namespace FLocal.Common.dataobjects {
 	public class TexImage : SqlObject<TexImage> {

Common/dataobjects/Thread.cs

@@ -3,9 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Xml.Linq;
-using FLocal.Core;
-using FLocal.Core.DB;
-using FLocal.Core.DB.conditions;
+using Web.Core;
+using Web.Core.DB;
+using Web.Core.DB.conditions;
 using FLocal.Common.actions;
 
 namespace FLocal.Common.dataobjects {
@@ -174,8 +174,8 @@ namespace FLocal.Common.dataobjects {
 			this._title = data[TableSpec.FIELD_TITLE];
 			this._lastPostId = int.Parse(data[TableSpec.FIELD_LASTPOSTID]);
 			this._lastPostDate = new DateTime(long.Parse(data[TableSpec.FIELD_LASTPOSTDATE]));
-			this._isAnnouncement = FLocal.Core.Util.string2bool(data[TableSpec.FIELD_ISANNOUNCEMENT]);
-			this._isLocked = FLocal.Core.Util.string2bool(data[TableSpec.FIELD_ISLOCKED]);
+			this._isAnnouncement = Web.Core.Util.string2bool(data[TableSpec.FIELD_ISANNOUNCEMENT]);
+			this._isLocked = Web.Core.Util.string2bool(data[TableSpec.FIELD_ISLOCKED]);
 			this._totalPosts = int.Parse(data[TableSpec.FIELD_TOTALPOSTS]);
 			this._totalViews = int.Parse(data[TableSpec.FIELD_TOTALVIEWS]);
 		}

Common/dataobjects/Upload.cs

@@ -3,9 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Xml.Linq;
-using FLocal.Core;
-using FLocal.Core.DB;
-using FLocal.Core.DB.conditions;
+using Web.Core;
+using Web.Core.DB;
+using Web.Core.DB.conditions;
 
 namespace FLocal.Common.dataobjects {
 	public class Upload : SqlObject<Upload> {

Common/dataobjects/User.cs

@@ -3,9 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Xml.Linq;
-using FLocal.Core;
-using FLocal.Core.DB;
-using FLocal.Core.DB.conditions;
+using Web.Core;
+using Web.Core.DB;
+using Web.Core.DB.conditions;
 using FLocal.Common.actions;
 
 namespace FLocal.Common.dataobjects {

Common/dataobjects/UserGroup.cs

@@ -3,9 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Xml.Linq;
-using FLocal.Core;
-using FLocal.Core.DB;
-using FLocal.Core.DB.conditions;
+using Web.Core;
+using Web.Core.DB;
+using Web.Core.DB.conditions;
 
 namespace FLocal.Common.dataobjects {
 	public class UserGroup : SqlObject<UserGroup> {

Core/Cache.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace FLocal.Core {
+namespace Web.Core {
 	public class Cache<T> {
 
 		public static readonly Cache<T> instance = new Cache<T>();

Core/Config.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Collections.Specialized;
 
-namespace FLocal.Core {
+namespace Web.Core {
 
 	public abstract class Config<T> : IDisposable where T : Config<T> {
 

Core/Core.csproj

@@ -8,7 +8,7 @@
     <ProjectGuid>{6F532626-E9F8-498E-9683-1538E7CD62CB}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>FLocal.Core</RootNamespace>
+    <RootNamespace>Web.Core</RootNamespace>
     <AssemblyName>Core</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>

Core/DB/ColumnOrValue.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace FLocal.Core.DB {
+namespace Web.Core.DB {
 	public class ColumnOrValue {
 
 		private bool _isColumn;

Core/DB/ColumnSpec.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace FLocal.Core.DB {
+namespace Web.Core.DB {
 	public class ColumnSpec {
 
 		public readonly ITableSpec table;

Core/DB/Diapasone.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace FLocal.Core.DB {
+namespace Web.Core.DB {
 	public class Diapasone {
 
 		public readonly long start;

Core/DB/IDBConnection.cs

@@ -2,9 +2,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using FLocal.Core.DB.conditions;
+using Web.Core.DB.conditions;
 
-namespace FLocal.Core.DB {
+namespace Web.Core.DB {
 	public interface IDBConnection : IDisposable {
 
 		List<Dictionary<string, string>> LoadByIds(ITableSpec table, List<string> ids);

Core/DB/ILock.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace FLocal.Core.DB {
+namespace Web.Core.DB {
 	public interface ILock : IDisposable {
 	}
 }

Core/DB/ITableSpec.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace FLocal.Core.DB {
+namespace Web.Core.DB {
 	public interface ITableSpec {
 		string name {
 			get;

Core/DB/JoinSpec.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace FLocal.Core.DB {
+namespace Web.Core.DB {
 	public class JoinSpec {
 
 		private class TableSpec : ITableSpec {

Core/DB/SortSpec.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace FLocal.Core.DB {
+namespace Web.Core.DB {
 	public class SortSpec {
 
 		public readonly ColumnSpec column;

Core/DB/Transaction.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace FLocal.Core.DB {
+namespace Web.Core.DB {
 
 	abstract public class Transaction : IDisposable {
 

Core/DB/conditions/AbstractCondition.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace FLocal.Core.DB.conditions {
+namespace Web.Core.DB.conditions {
 	public abstract class AbstractCondition {
 
 	}

Core/DB/conditions/ComparisonCondition.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace FLocal.Core.DB.conditions {
+namespace Web.Core.DB.conditions {
 	public class ComparisonCondition : SimpleCondition {
 
 		public readonly ColumnSpec left;

Core/DB/conditions/ComparisonType.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace FLocal.Core.DB.conditions {
+namespace Web.Core.DB.conditions {
 	public enum ComparisonType {
 		EQUAL,
 		NOTEQUAL,

Core/DB/conditions/ComplexCondition.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace FLocal.Core.DB.conditions {
+namespace Web.Core.DB.conditions {
 	public class ComplexCondition : NotEmptyCondition {
 
 		public readonly ConditionsJoinType type;

Core/DB/conditions/ConditionsJoinType.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace FLocal.Core.DB.conditions {
+namespace Web.Core.DB.conditions {
 	public enum ConditionsJoinType {
 		AND,
 		OR,

Core/DB/conditions/EmptyCondition.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace FLocal.Core.DB.conditions {
+namespace Web.Core.DB.conditions {
 	public class EmptyCondition : AbstractCondition {
 	}
 }

Core/DB/conditions/IsNullCondition.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace FLocal.Core.DB.conditions {
+namespace Web.Core.DB.conditions {
 	public class IsNullCondition : SimpleCondition {
 
 		public readonly ColumnSpec column;

Core/DB/conditions/MultiValueCondition.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace FLocal.Core.DB.conditions {
+namespace Web.Core.DB.conditions {
 	public class MultiValueCondition : SimpleCondition {
 
 		public readonly ColumnSpec column;

Core/DB/conditions/NotEmptyCondition.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace FLocal.Core.DB.conditions {
+namespace Web.Core.DB.conditions {
 	public abstract class NotEmptyCondition : AbstractCondition {
 	}
 }

Core/DB/conditions/NotIsNullCondition.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace FLocal.Core.DB.conditions {
+namespace Web.Core.DB.conditions {
 	public class NotIsNullCondition : SimpleCondition {
 
 		public readonly ColumnSpec column;

Core/DB/conditions/SimpleCondition.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace FLocal.Core.DB.conditions {
+namespace Web.Core.DB.conditions {
 	public abstract class SimpleCondition : NotEmptyCondition {
 	}
 }

Core/DataObject.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Diagnostics;
 
-namespace FLocal.Core {
+namespace Web.Core {
 
 	abstract public class DataObject<TKey, T> : IDataObject<TKey, T>
         where T : DataObject<TKey, T>, new()

Core/IDataObject.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace FLocal.Core {
+namespace Web.Core {
 
 	public abstract class IDataObject<TKey, TData>
         where TData : IDataObject<TKey, TData>, new()

Core/Network/IPv4.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace FLocal.Core.Network {
+namespace Web.Core.Network {
 	class IPv4 {
 
 		public const ulong UNIT = 256;

Core/Network/IPv4Address.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace FLocal.Core.Network {
+namespace Web.Core.Network {
 	public class IPv4Address {
 
 		private const ulong MAX = IPv4.UNIT * IPv4.UNIT * IPv4.UNIT * IPv4.UNIT;

Core/Network/IPv4Subnet.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace FLocal.Core.Network {
+namespace Web.Core.Network {
 	public class IPv4Subnet {
 
 		private readonly IPv4Address prefix;

Core/Registry.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace FLocal.Core {
+namespace Web.Core {
     class Registry<TKey, TData>
         where TData : IDataObject<TKey, TData>, new()
         where TKey : struct {

Core/RegistryCleaner.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace FLocal.Core {
+namespace Web.Core {
 	public static class RegistryCleaner {
 
 		public static void CleanRegistry<TKey, TData>() where TKey : struct where TData : IDataObject<TKey, TData>, new() {

Core/Switch.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace FLocal.Core {
+namespace Web.Core {
 
     class Switch<TResult> : List<KeyValuePair<Predicate, Func<TResult>>> {
 

Core/Util.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.IO;
 
-namespace FLocal.Core {
+namespace Web.Core {
 
     public class Util {
 

Core/delegates/Lazy.cs

@@ -3,6 +3,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace FLocal.Core {
+namespace Web.Core {
     delegate T Lazy<T>();
 }

Core/delegates/Predicate.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace FLocal.Core {
+namespace Web.Core {
 
     delegate bool Predicate();
 

Core/exceptions/AccessDeniedException.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace FLocal.Core {
+namespace Web.Core {
 
     public partial class AccessDeniedException : FLocalException {
 

Core/exceptions/CriticalException.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace FLocal.Core {
+namespace Web.Core {
 
     public partial class CriticalException : FLocalException {
 

Core/exceptions/FLocalException.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace FLocal.Core {
+namespace Web.Core {
 
     public partial class FLocalException : ApplicationException {
 

Core/exceptions/NotFoundInDBException.cs

@@ -2,9 +2,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using FLocal.Core.DB;
+using Web.Core.DB;
 
-namespace FLocal.Core {
+namespace Web.Core {
 
     public partial class NotFoundInDBException : FLocalException {
 

Core/exceptions/ObjectDoesntHaveAnIdException.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace FLocal.Core {
+namespace Web.Core {
 
     public partial class ObjectDoesntHaveAnIdException : FLocalException {
 

Core/extensions/Delegate.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace FLocal.Core {
+namespace Web.Core {
     
 	static class DelegateExtension {
 

Core/extensions/Extensions.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.IO;
 
-namespace FLocal.Core {
+namespace Web.Core {
 	
 	public static class ExtensionMethods {
 

Core/extensions/String.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace FLocal.Core {
+namespace Web.Core {
 
 	public static class StringExtension {
 

IISMainHandler/Extensions.cs

@@ -4,14 +4,14 @@ using System.Linq;
 using System.Text;
 using System.Web;
 using System.Xml.Linq;
-using FLocal.Core;
+using Web.Core;
 
 namespace FLocal.IISHandler {
 	static class Extensions {
 
 		public static void WriteLine(this HttpResponse response, string toWrite) {
 			response.Write(toWrite);
-			response.Write(Core.Util.EOL);
+			response.Write(Web.Core.Util.EOL);
 		}
 
 		public static string[] Split(this string str, string separator, StringSplitOptions options) {

IISMainHandler/HandlersFactory.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Web;
-using FLocal.Core;
+using Web.Core;
 using FLocal.Common.URL;
 using URL = FLocal.Common.URL;
 

IISMainHandler/MainHandler.cs

@@ -25,10 +25,10 @@ namespace FLocal.IISHandler {
 
 			Uri current = httpcontext.Request.Url;
 			if(!current.Host.EndsWith(Config.instance.BaseHost)) {
-				throw new FLocal.Core.FLocalException("Wrong host: " + current.Host + " (expected *" + Config.instance.BaseHost + ")");
+				throw new Web.Core.FLocalException("Wrong host: " + current.Host + " (expected *" + Config.instance.BaseHost + ")");
 			}
 			if(Config.instance.forceHttps && !httpcontext.Request.IsSecureConnection) {
-				throw new FLocal.Core.FLocalException("Only HTTPS connections are allowed");
+				throw new Web.Core.FLocalException("Only HTTPS connections are allowed");
 			}
 
 			Uri referer = httpcontext.Request.UrlReferrer;

IISMainHandler/PageOuter.cs

@@ -2,9 +2,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using FLocal.Core.DB;
+using Web.Core.DB;
 using System.Xml.Linq;
-using FLocal.Core;
+using Web.Core;
 
 namespace FLocal.IISHandler {
 	class PageOuter : Diapasone {

IISMainHandler/TemplateEngine.cs

@@ -7,7 +7,7 @@ using System.Xml.Linq;
 using System.Xml.Xsl;
 using System.IO;
 using System.Globalization;
-using FLocal.Core;
+using Web.Core;
 
 namespace FLocal.IISHandler {
 	class TemplateEngine {

IISMainHandler/WebContext.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Web;
-using FLocal.Core;
+using Web.Core;
 using FLocal.Common;
 using FLocal.Common.dataobjects;
 using FLocal.Common.actions;
@@ -11,7 +11,7 @@ using System.Xml.Linq;
 using System.IO;
 
 namespace FLocal.IISHandler {
-	class WebContext : Common.UserContext {
+	class WebContext : FLocal.Common.UserContext {
 
 		private static readonly Encoding OutputEncoding = Encoding.UTF8;
 
@@ -60,7 +60,7 @@ namespace FLocal.IISHandler {
 			private set;
 		}
 
-		public override Common.IOutputParams outputParams {
+		public override FLocal.Common.IOutputParams outputParams {
 			get {
 				return this.design;
 			}
@@ -190,18 +190,18 @@ namespace FLocal.IISHandler {
 			return result;
 		}
 
-		public Core.Network.IPv4Address remoteHost {
+		public Web.Core.Network.IPv4Address remoteHost {
 			get {
-				return new Core.Network.IPv4Address(this.httprequest.UserHostAddress);
+				return new Web.Core.Network.IPv4Address(this.httprequest.UserHostAddress);
 			}
 		}
 
 		public void LogError(Exception e) {
 			string dir;
 			if(e is AccessDeniedException) {
-				dir = Common.Config.instance.dataDir + "Logs\\AccessDenied\\";
+				dir = FLocal.Common.Config.instance.dataDir + "Logs\\AccessDenied\\";
 			} else {
-				dir = Common.Config.instance.dataDir + "Logs\\";
+				dir = FLocal.Common.Config.instance.dataDir + "Logs\\";
 			}
 			using(StreamWriter writer = new StreamWriter(dir + DateTime.Now.ToString("yyyy-MM-dd_HH-mm-ss") + "." + e.GetGuid().ToString() + ".txt")) {
 				writer.WriteLine("Requested url: " + this.httprequest.Url.ToString());

IISMainHandler/designs/IDesign.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 
 namespace FLocal.IISHandler.designs {
-	interface IDesign : Common.IOutputParams {
+	interface IDesign : FLocal.Common.IOutputParams {
 
 		string GetFSName(string template);