From 2b39bb505fbe770b9c0f53cf89eb2a4f71aefde0 Mon Sep 17 00:00:00 2001 From: inga-lovinde <52715130+inga-lovinde@users.noreply.github.com> Date: Fri, 30 Dec 2011 13:53:49 +0000 Subject: [PATCH] Namespaces refactoring --- Builder/IISMainHandler/build.txt | 2 +- Common/BBCodes/Quote.cs | 2 +- Common/BBCodes/helpers/TexProcessor.cs | 2 +- Common/BBCodes/helpers/UrlProcessor.cs | 4 +- Common/Config.cs | 8 +-- Common/ISqlObjectTableSpec.cs | 2 +- Common/SqlObject.cs | 6 +- Common/TableManager.cs | 2 +- Common/UBBParser.cs | 2 +- Common/URL/AbstractUrl.cs | 2 +- Common/URL/upload/Info.cs | 2 +- Common/URL/upload/Item.cs | 2 +- Common/UploadManager.cs | 6 +- Common/UserContext.cs | 6 +- Common/actions/AbstractChange.cs | 2 +- Common/actions/ChangeSet.cs | 4 +- Common/actions/ChangeSetUtil.cs | 2 +- Common/actions/InsertChange.cs | 2 +- Common/actions/InsertOrUpdateChange.cs | 6 +- Common/actions/UpdateChange.cs | 2 +- Common/dataobjects/Account.cs | 6 +- Common/dataobjects/AccountIndicator.cs | 6 +- Common/dataobjects/AccountSettings.cs | 6 +- Common/dataobjects/AnonymousUserSettings.cs | 2 +- Common/dataobjects/AvatarsSettings.cs | 6 +- Common/dataobjects/Board.cs | 10 +-- Common/dataobjects/Category.cs | 10 +-- Common/dataobjects/Invite.cs | 6 +- Common/dataobjects/LocalNetwork.cs | 8 +-- Common/dataobjects/Machichara.cs | 8 +-- Common/dataobjects/Moderator.cs | 6 +- Common/dataobjects/ModernSkin.cs | 8 +-- Common/dataobjects/PMConversation.cs | 6 +- Common/dataobjects/PMMessage.cs | 4 +- Common/dataobjects/Poll.cs | 6 +- Common/dataobjects/Post.cs | 6 +- Common/dataobjects/PostLayer.cs | 8 +-- Common/dataobjects/Punishment.cs | 6 +- Common/dataobjects/PunishmentLayerChange.cs | 6 +- Common/dataobjects/PunishmentTransfer.cs | 6 +- Common/dataobjects/PunishmentType.cs | 8 +-- Common/dataobjects/QuickLink.cs | 6 +- Common/dataobjects/Restriction.cs | 6 +- Common/dataobjects/Revision.cs | 2 +- Common/dataobjects/Session.cs | 6 +- Common/dataobjects/Skin.cs | 8 +-- Common/dataobjects/TexImage.cs | 8 +-- Common/dataobjects/Thread.cs | 10 +-- Common/dataobjects/Upload.cs | 6 +- Common/dataobjects/User.cs | 6 +- Common/dataobjects/UserGroup.cs | 6 +- Core/Cache.cs | 2 +- Core/Config.cs | 2 +- Core/Core.csproj | 2 +- Core/DB/ColumnOrValue.cs | 2 +- Core/DB/ColumnSpec.cs | 2 +- Core/DB/Diapasone.cs | 2 +- Core/DB/IDBConnection.cs | 4 +- Core/DB/ILock.cs | 2 +- Core/DB/ITableSpec.cs | 2 +- Core/DB/JoinSpec.cs | 2 +- Core/DB/SortSpec.cs | 2 +- Core/DB/Transaction.cs | 2 +- Core/DB/conditions/AbstractCondition.cs | 2 +- Core/DB/conditions/ComparisonCondition.cs | 2 +- Core/DB/conditions/ComparisonType.cs | 2 +- Core/DB/conditions/ComplexCondition.cs | 2 +- Core/DB/conditions/ConditionsJoinType.cs | 2 +- Core/DB/conditions/EmptyCondition.cs | 2 +- Core/DB/conditions/IsNullCondition.cs | 2 +- Core/DB/conditions/MultiValueCondition.cs | 2 +- Core/DB/conditions/NotEmptyCondition.cs | 2 +- Core/DB/conditions/NotIsNullCondition.cs | 2 +- Core/DB/conditions/SimpleCondition.cs | 2 +- Core/DataObject.cs | 2 +- Core/IDataObject.cs | 2 +- Core/Network/IPv4.cs | 2 +- Core/Network/IPv4Address.cs | 2 +- Core/Network/IPv4Subnet.cs | 2 +- Core/Registry.cs | 2 +- Core/RegistryCleaner.cs | 2 +- Core/Switch.cs | 2 +- Core/Util.cs | 2 +- Core/delegates/Lazy.cs | 2 +- Core/delegates/Predicate.cs | 2 +- Core/exceptions/AccessDeniedException.cs | 2 +- Core/exceptions/CriticalException.cs | 2 +- Core/exceptions/FLocalException.cs | 2 +- Core/exceptions/NotFoundInDBException.cs | 4 +- .../ObjectDoesntHaveAnIdException.cs | 2 +- Core/extensions/Delegate.cs | 2 +- Core/extensions/Extensions.cs | 2 +- Core/extensions/String.cs | 2 +- IISMainHandler/Extensions.cs | 4 +- IISMainHandler/HandlersFactory.cs | 2 +- IISMainHandler/MainHandler.cs | 4 +- IISMainHandler/PageOuter.cs | 4 +- IISMainHandler/TemplateEngine.cs | 2 +- IISMainHandler/WebContext.cs | 14 ++--- IISMainHandler/designs/IDesign.cs | 2 +- .../exceptions/RedirectException.cs | 2 +- .../exceptions/WrongUrlException.cs | 2 +- IISMainHandler/handlers/BoardHandler.cs | 4 +- IISMainHandler/handlers/BoardsHandler.cs | 6 +- IISMainHandler/handlers/DebugHandler.cs | 2 +- IISMainHandler/handlers/PostHandler.cs | 2 +- IISMainHandler/handlers/StaticHandler.cs | 2 +- IISMainHandler/handlers/ThreadHandler.cs | 6 +- IISMainHandler/handlers/WrongUrlHandler.cs | 2 +- .../request/AbstractNewAccountHandler.cs | 4 +- .../request/AbstractNewMessageHandler.cs | 2 +- .../handlers/request/AbstractPostHandler.cs | 2 +- .../handlers/request/CreatePollHandler.cs | 2 +- .../handlers/request/LoginHandler.cs | 4 +- .../handlers/request/LogoutHandler.cs | 4 +- .../request/MarkThreadAsReadHandler.cs | 4 +- .../handlers/request/MigrateAccountHandler.cs | 4 +- .../request/RegisterByInviteHandler.cs | 4 +- .../handlers/request/RegisterHandler.cs | 4 +- .../handlers/request/SettingsHandler.cs | 2 +- .../handlers/request/UploadHandler.cs | 4 +- .../handlers/request/UserDataHandler.cs | 2 +- .../handlers/request/VoteHandler.cs | 2 +- .../handlers/request/avatars/AddHandler.cs | 4 +- .../handlers/request/avatars/RemoveHandler.cs | 4 +- .../request/avatars/SetAsDefaultHandler.cs | 4 +- .../request/maintenance/CleanCacheHandler.cs | 2 +- .../response/AbstractNewMessageHandler.cs | 2 +- .../response/AbstractUserGetHandler.cs | 6 +- .../response/ActiveAccountListHandler.cs | 8 +-- .../handlers/response/AllPostsHandler.cs | 6 +- .../handlers/response/AllThreadsHandler.cs | 6 +- .../response/AvatarsSettingsHandler.cs | 2 +- .../handlers/response/BoardAsThread.cs | 2 +- .../handlers/response/ConversationHandler.cs | 6 +- .../handlers/response/ConversationsHandler.cs | 4 +- .../handlers/response/CreatePollHandler.cs | 2 +- .../handlers/response/CreateThreadHandler.cs | 2 +- .../handlers/response/EditHandler.cs | 2 +- .../response/LocalNetworksListHandler.cs | 6 +- .../handlers/response/LoginHandler.cs | 2 +- .../response/MigrateAccountHandler.cs | 2 +- .../handlers/response/PMReplyHandler.cs | 2 +- .../handlers/response/PMReplyToPostHandler.cs | 2 +- .../handlers/response/PMSendHandler.cs | 2 +- .../handlers/response/PollHandler.cs | 6 +- .../handlers/response/PollsListHandler.cs | 6 +- .../handlers/response/PunishHandler.cs | 2 +- .../handlers/response/QuickLinkHandler.cs | 2 +- .../response/RegisterByInviteHandler.cs | 2 +- .../handlers/response/ReplyHandler.cs | 2 +- .../handlers/response/RobotsHandler.cs | 2 +- .../handlers/response/SettingsHandler.cs | 2 +- .../handlers/response/UploadHandler.cs | 8 +-- .../handlers/response/UploadInfoHandler.cs | 6 +- .../handlers/response/UploadListHandler.cs | 6 +- .../handlers/response/UploadNewHandler.cs | 6 +- .../handlers/response/UserDataHandler.cs | 2 +- .../handlers/response/UserInfoHandler.cs | 6 +- .../handlers/response/UserListHandler.cs | 2 +- .../response/UserPollsParticipatedHandler.cs | 6 +- .../handlers/response/UserPostsHandler.cs | 6 +- .../handlers/response/UserRepliesHandler.cs | 6 +- .../handlers/response/UserThreadsHandler.cs | 6 +- .../handlers/response/WhoIsOnlineHandler.cs | 10 +-- .../response/maintenance/CleanCacheHandler.cs | 2 +- IISUploadHandler/Config.cs | 2 +- IISUploadHandler/IISUploadHandler.csproj | 2 +- IISUploadHandler/UploadHandler.cs | 4 +- ImportConsole/ImportConsole.csproj | 2 +- ImportConsole/Program.cs | 6 +- ImportConsole/ShallerDBProcessor.cs | 62 +++++++++---------- ImportConsole/ThreadedHTMLProcessor.cs | 24 +++---- ImportConsole/UploadProcessor.cs | 20 +++--- ImportConsole/UsersImporter.cs | 14 ++--- Importer/DictionaryConverter.cs | 2 +- Importer/FileInfo.cs | 2 +- Importer/Importer.csproj | 2 +- Importer/ShallerConnector.cs | 2 +- Importer/ShallerGateway.cs | 2 +- MySQLConnector/ConditionCompiler.cs | 6 +- MySQLConnector/Connection.cs | 28 ++++----- MySQLConnector/Extensions.cs | 4 +- MySQLConnector/IDBTraits.cs | 4 +- MySQLConnector/MySQLConnector.csproj | 2 +- MySQLConnector/MySQLDBTraits.cs | 4 +- MySQLConnector/ParamsHolder.cs | 2 +- MySQLConnector/PostgresDBTraits.cs | 4 +- MySQLConnector/Transaction.cs | 6 +- TexCompiler/Compiler.cs | 2 +- TexCompiler/TexCompiler.csproj | 2 +- 191 files changed, 422 insertions(+), 422 deletions(-) diff --git a/Builder/IISMainHandler/build.txt b/Builder/IISMainHandler/build.txt index 6f41660..527a5c7 100644 --- a/Builder/IISMainHandler/build.txt +++ b/Builder/IISMainHandler/build.txt @@ -1 +1 @@ -1919 \ No newline at end of file +1925 \ No newline at end of file diff --git a/Common/BBCodes/Quote.cs b/Common/BBCodes/Quote.cs index 55ee874..ed0f2fe 100644 --- a/Common/BBCodes/Quote.cs +++ b/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 { diff --git a/Common/BBCodes/helpers/TexProcessor.cs b/Common/BBCodes/helpers/TexProcessor.cs index b4b5dfc..6576636 100644 --- a/Common/BBCodes/helpers/TexProcessor.cs +++ b/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 { diff --git a/Common/BBCodes/helpers/UrlProcessor.cs b/Common/BBCodes/helpers/UrlProcessor.cs index 55fb547..83e634a 100644 --- a/Common/BBCodes/helpers/UrlProcessor.cs +++ b/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); diff --git a/Common/Config.cs b/Common/Config.cs index 6b816f1..1501da5 100644 --- a/Common/Config.cs +++ b/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 action) { - using(Core.DB.Transaction transaction = Core.DB.IDBConnectionExtensions.beginTransaction(instance.mainConnection)) { + public static void Transactional(Action action) { + using(Web.Core.DB.Transaction transaction = Web.Core.DB.IDBConnectionExtensions.beginTransaction(instance.mainConnection)) { bool success = false; try { action(transaction); diff --git a/Common/ISqlObjectTableSpec.cs b/Common/ISqlObjectTableSpec.cs index fff6dcc..6e85e3f 100644 --- a/Common/ISqlObjectTableSpec.cs +++ b/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 { diff --git a/Common/SqlObject.cs b/Common/SqlObject.cs index a979619..5d71a9a 100644 --- a/Common/SqlObject.cs +++ b/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 : Core.DataObject + abstract public class SqlObject : Web.Core.DataObject where T : SqlObject, new() where TKey : struct { diff --git a/Common/TableManager.cs b/Common/TableManager.cs index 4a46834..b196ced 100644 --- a/Common/TableManager.cs +++ b/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 { diff --git a/Common/UBBParser.cs b/Common/UBBParser.cs index b6a2f94..c465e28 100644 --- a/Common/UBBParser.cs +++ b/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 { diff --git a/Common/URL/AbstractUrl.cs b/Common/URL/AbstractUrl.cs index 91564b9..b5d2c06 100644 --- a/Common/URL/AbstractUrl.cs +++ b/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 { diff --git a/Common/URL/upload/Info.cs b/Common/URL/upload/Info.cs index d8ed225..1d326aa 100644 --- a/Common/URL/upload/Info.cs +++ b/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 { diff --git a/Common/URL/upload/Item.cs b/Common/URL/upload/Item.cs index e0da765..d5acf92 100644 --- a/Common/URL/upload/Item.cs +++ b/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 { diff --git a/Common/UploadManager.cs b/Common/UploadManager.cs index b5c6203..2ae6f43 100644 --- a/Common/UploadManager.cs +++ b/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 { diff --git a/Common/UserContext.cs b/Common/UserContext.cs index 2e75057..2163e59 100644 --- a/Common/UserContext.cs +++ b/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.instance.get(exception, () => Guid.NewGuid()); + return Web.Core.Cache.instance.get(exception, () => Guid.NewGuid()); } public static XElement ToXml(this Exception exception) { diff --git a/Common/actions/AbstractChange.cs b/Common/actions/AbstractChange.cs index 31b77c6..e01b1fd 100644 --- a/Common/actions/AbstractChange.cs +++ b/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 { diff --git a/Common/actions/ChangeSet.cs b/Common/actions/ChangeSet.cs index ce40aee..2503344 100644 --- a/Common/actions/ChangeSet.cs +++ b/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 { diff --git a/Common/actions/ChangeSetUtil.cs b/Common/actions/ChangeSetUtil.cs index dfd4cac..5491459 100644 --- a/Common/actions/ChangeSetUtil.cs +++ b/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 { diff --git a/Common/actions/InsertChange.cs b/Common/actions/InsertChange.cs index cd3965e..1355314 100644 --- a/Common/actions/InsertChange.cs +++ b/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 { diff --git a/Common/actions/InsertOrUpdateChange.cs b/Common/actions/InsertOrUpdateChange.cs index 8f3b9c1..ec607dc 100644 --- a/Common/actions/InsertOrUpdateChange.cs +++ b/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 { diff --git a/Common/actions/UpdateChange.cs b/Common/actions/UpdateChange.cs index b99e1f6..958a960 100644 --- a/Common/actions/UpdateChange.cs +++ b/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 { diff --git a/Common/dataobjects/Account.cs b/Common/dataobjects/Account.cs index b6892c7..8f71dbe 100644 --- a/Common/dataobjects/Account.cs +++ b/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 { diff --git a/Common/dataobjects/AccountIndicator.cs b/Common/dataobjects/AccountIndicator.cs index fc20457..67c761a 100644 --- a/Common/dataobjects/AccountIndicator.cs +++ b/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 { diff --git a/Common/dataobjects/AccountSettings.cs b/Common/dataobjects/AccountSettings.cs index 38272ce..7added0 100644 --- a/Common/dataobjects/AccountSettings.cs +++ b/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 { diff --git a/Common/dataobjects/AnonymousUserSettings.cs b/Common/dataobjects/AnonymousUserSettings.cs index 7aad59b..592a2c3 100644 --- a/Common/dataobjects/AnonymousUserSettings.cs +++ b/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 { diff --git a/Common/dataobjects/AvatarsSettings.cs b/Common/dataobjects/AvatarsSettings.cs index 347f089..f8ab716 100644 --- a/Common/dataobjects/AvatarsSettings.cs +++ b/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 { diff --git a/Common/dataobjects/Board.cs b/Common/dataobjects/Board.cs index 4affa79..d885c1f 100644 --- a/Common/dataobjects/Board.cs +++ b/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 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 diff --git a/Common/dataobjects/Category.cs b/Common/dataobjects/Category.cs index 12621a0..efb4ad1 100644 --- a/Common/dataobjects/Category.cs +++ b/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 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 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 diff --git a/Common/dataobjects/Invite.cs b/Common/dataobjects/Invite.cs index f6dd335..b6c1666 100644 --- a/Common/dataobjects/Invite.cs +++ b/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 { diff --git a/Common/dataobjects/LocalNetwork.cs b/Common/dataobjects/LocalNetwork.cs index 43733e7..7d6f77d 100644 --- a/Common/dataobjects/LocalNetwork.cs +++ b/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 { diff --git a/Common/dataobjects/Machichara.cs b/Common/dataobjects/Machichara.cs index 7473d61..517a2ee 100644 --- a/Common/dataobjects/Machichara.cs +++ b/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 { @@ -43,7 +43,7 @@ namespace FLocal.Common.dataobjects { () => { List 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); diff --git a/Common/dataobjects/Moderator.cs b/Common/dataobjects/Moderator.cs index 6387632..ee17f34 100644 --- a/Common/dataobjects/Moderator.cs +++ b/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 { diff --git a/Common/dataobjects/ModernSkin.cs b/Common/dataobjects/ModernSkin.cs index 487d9af..33d198b 100644 --- a/Common/dataobjects/ModernSkin.cs +++ b/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 { @@ -43,7 +43,7 @@ namespace FLocal.Common.dataobjects { () => { List 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); diff --git a/Common/dataobjects/PMConversation.cs b/Common/dataobjects/PMConversation.cs index b48e2e1..d32e16b 100644 --- a/Common/dataobjects/PMConversation.cs +++ b/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 { diff --git a/Common/dataobjects/PMMessage.cs b/Common/dataobjects/PMMessage.cs index 3194215..7bc95ca 100644 --- a/Common/dataobjects/PMMessage.cs +++ b/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; diff --git a/Common/dataobjects/Poll.cs b/Common/dataobjects/Poll.cs index a6c03ad..5f15362 100644 --- a/Common/dataobjects/Poll.cs +++ b/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 { diff --git a/Common/dataobjects/Post.cs b/Common/dataobjects/Post.cs index 643959a..93ebe65 100644 --- a/Common/dataobjects/Post.cs +++ b/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; diff --git a/Common/dataobjects/PostLayer.cs b/Common/dataobjects/PostLayer.cs index 3a38715..4259394 100644 --- a/Common/dataobjects/PostLayer.cs +++ b/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 { @@ -58,7 +58,7 @@ namespace FLocal.Common.dataobjects { () => { List 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); diff --git a/Common/dataobjects/Punishment.cs b/Common/dataobjects/Punishment.cs index fab6666..d19b4cc 100644 --- a/Common/dataobjects/Punishment.cs +++ b/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 { diff --git a/Common/dataobjects/PunishmentLayerChange.cs b/Common/dataobjects/PunishmentLayerChange.cs index 7bd4479..e555ca3 100644 --- a/Common/dataobjects/PunishmentLayerChange.cs +++ b/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 { diff --git a/Common/dataobjects/PunishmentTransfer.cs b/Common/dataobjects/PunishmentTransfer.cs index b60341b..b62d312 100644 --- a/Common/dataobjects/PunishmentTransfer.cs +++ b/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 { diff --git a/Common/dataobjects/PunishmentType.cs b/Common/dataobjects/PunishmentType.cs index 0951f31..9ae4fe1 100644 --- a/Common/dataobjects/PunishmentType.cs +++ b/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 { @@ -83,7 +83,7 @@ namespace FLocal.Common.dataobjects { () => { List 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); diff --git a/Common/dataobjects/QuickLink.cs b/Common/dataobjects/QuickLink.cs index f218f76..43a2641 100644 --- a/Common/dataobjects/QuickLink.cs +++ b/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 { diff --git a/Common/dataobjects/Restriction.cs b/Common/dataobjects/Restriction.cs index 1d2fcfc..b8279d5 100644 --- a/Common/dataobjects/Restriction.cs +++ b/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 { diff --git a/Common/dataobjects/Revision.cs b/Common/dataobjects/Revision.cs index 2453c77..e7696d4 100644 --- a/Common/dataobjects/Revision.cs +++ b/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 { diff --git a/Common/dataobjects/Session.cs b/Common/dataobjects/Session.cs index dd9de09..b8560a1 100644 --- a/Common/dataobjects/Session.cs +++ b/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 { diff --git a/Common/dataobjects/Skin.cs b/Common/dataobjects/Skin.cs index 059aa97..836493d 100644 --- a/Common/dataobjects/Skin.cs +++ b/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 { @@ -43,7 +43,7 @@ namespace FLocal.Common.dataobjects { () => { List 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); diff --git a/Common/dataobjects/TexImage.cs b/Common/dataobjects/TexImage.cs index 0817ff3..c44c88b 100644 --- a/Common/dataobjects/TexImage.cs +++ b/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 { diff --git a/Common/dataobjects/Thread.cs b/Common/dataobjects/Thread.cs index 3cc4279..bce218e 100644 --- a/Common/dataobjects/Thread.cs +++ b/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]); } diff --git a/Common/dataobjects/Upload.cs b/Common/dataobjects/Upload.cs index 48ef94c..3a69af5 100644 --- a/Common/dataobjects/Upload.cs +++ b/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 { diff --git a/Common/dataobjects/User.cs b/Common/dataobjects/User.cs index 3ff92bf..9b1540d 100644 --- a/Common/dataobjects/User.cs +++ b/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 { diff --git a/Common/dataobjects/UserGroup.cs b/Common/dataobjects/UserGroup.cs index 9d002cf..cfa7900 100644 --- a/Common/dataobjects/UserGroup.cs +++ b/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 { diff --git a/Core/Cache.cs b/Core/Cache.cs index ac572ba..6d70b54 100644 --- a/Core/Cache.cs +++ b/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 { public static readonly Cache instance = new Cache(); diff --git a/Core/Config.cs b/Core/Config.cs index 2c895ad..9829412 100644 --- a/Core/Config.cs +++ b/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 : IDisposable where T : Config { diff --git a/Core/Core.csproj b/Core/Core.csproj index bc1f798..6bfb3a3 100644 --- a/Core/Core.csproj +++ b/Core/Core.csproj @@ -8,7 +8,7 @@ {6F532626-E9F8-498E-9683-1538E7CD62CB} Library Properties - FLocal.Core + Web.Core Core v3.5 512 diff --git a/Core/DB/ColumnOrValue.cs b/Core/DB/ColumnOrValue.cs index 7f60f7a..e1ba15a 100644 --- a/Core/DB/ColumnOrValue.cs +++ b/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; diff --git a/Core/DB/ColumnSpec.cs b/Core/DB/ColumnSpec.cs index 328c1cc..18df8c6 100644 --- a/Core/DB/ColumnSpec.cs +++ b/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; diff --git a/Core/DB/Diapasone.cs b/Core/DB/Diapasone.cs index 6ecd903..e936744 100644 --- a/Core/DB/Diapasone.cs +++ b/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; diff --git a/Core/DB/IDBConnection.cs b/Core/DB/IDBConnection.cs index 529976f..93630c7 100644 --- a/Core/DB/IDBConnection.cs +++ b/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> LoadByIds(ITableSpec table, List ids); diff --git a/Core/DB/ILock.cs b/Core/DB/ILock.cs index 99769a9..b479329 100644 --- a/Core/DB/ILock.cs +++ b/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 { } } diff --git a/Core/DB/ITableSpec.cs b/Core/DB/ITableSpec.cs index 1d90875..54e2fde 100644 --- a/Core/DB/ITableSpec.cs +++ b/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; diff --git a/Core/DB/JoinSpec.cs b/Core/DB/JoinSpec.cs index 84fb2fc..2c79619 100644 --- a/Core/DB/JoinSpec.cs +++ b/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 { diff --git a/Core/DB/SortSpec.cs b/Core/DB/SortSpec.cs index 4e4e4fb..5795bea 100644 --- a/Core/DB/SortSpec.cs +++ b/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; diff --git a/Core/DB/Transaction.cs b/Core/DB/Transaction.cs index 7a86396..ea849f5 100644 --- a/Core/DB/Transaction.cs +++ b/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 { diff --git a/Core/DB/conditions/AbstractCondition.cs b/Core/DB/conditions/AbstractCondition.cs index 5f05ff1..db53c98 100644 --- a/Core/DB/conditions/AbstractCondition.cs +++ b/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 { } diff --git a/Core/DB/conditions/ComparisonCondition.cs b/Core/DB/conditions/ComparisonCondition.cs index a9cbf69..0944382 100644 --- a/Core/DB/conditions/ComparisonCondition.cs +++ b/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; diff --git a/Core/DB/conditions/ComparisonType.cs b/Core/DB/conditions/ComparisonType.cs index 41008e4..efceb08 100644 --- a/Core/DB/conditions/ComparisonType.cs +++ b/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, diff --git a/Core/DB/conditions/ComplexCondition.cs b/Core/DB/conditions/ComplexCondition.cs index 87a08c1..3b3183a 100644 --- a/Core/DB/conditions/ComplexCondition.cs +++ b/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; diff --git a/Core/DB/conditions/ConditionsJoinType.cs b/Core/DB/conditions/ConditionsJoinType.cs index 55b73da..c1e232c 100644 --- a/Core/DB/conditions/ConditionsJoinType.cs +++ b/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, diff --git a/Core/DB/conditions/EmptyCondition.cs b/Core/DB/conditions/EmptyCondition.cs index dedbae2..12cb46e 100644 --- a/Core/DB/conditions/EmptyCondition.cs +++ b/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 { } } diff --git a/Core/DB/conditions/IsNullCondition.cs b/Core/DB/conditions/IsNullCondition.cs index c82d8a7..a90be7b 100644 --- a/Core/DB/conditions/IsNullCondition.cs +++ b/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; diff --git a/Core/DB/conditions/MultiValueCondition.cs b/Core/DB/conditions/MultiValueCondition.cs index 84d8a70..08b788b 100644 --- a/Core/DB/conditions/MultiValueCondition.cs +++ b/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; diff --git a/Core/DB/conditions/NotEmptyCondition.cs b/Core/DB/conditions/NotEmptyCondition.cs index 1f0e6b1..a93664d 100644 --- a/Core/DB/conditions/NotEmptyCondition.cs +++ b/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 { } } diff --git a/Core/DB/conditions/NotIsNullCondition.cs b/Core/DB/conditions/NotIsNullCondition.cs index 27f26d0..27bd6b4 100644 --- a/Core/DB/conditions/NotIsNullCondition.cs +++ b/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; diff --git a/Core/DB/conditions/SimpleCondition.cs b/Core/DB/conditions/SimpleCondition.cs index 90fbf0b..ad92b3c 100644 --- a/Core/DB/conditions/SimpleCondition.cs +++ b/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 { } } diff --git a/Core/DataObject.cs b/Core/DataObject.cs index 5914dd9..01df9a7 100644 --- a/Core/DataObject.cs +++ b/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 : IDataObject where T : DataObject, new() diff --git a/Core/IDataObject.cs b/Core/IDataObject.cs index 45640e3..dec4fa3 100644 --- a/Core/IDataObject.cs +++ b/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 where TData : IDataObject, new() diff --git a/Core/Network/IPv4.cs b/Core/Network/IPv4.cs index 9a90290..919cb4f 100644 --- a/Core/Network/IPv4.cs +++ b/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; diff --git a/Core/Network/IPv4Address.cs b/Core/Network/IPv4Address.cs index cd84df7..33435cc 100644 --- a/Core/Network/IPv4Address.cs +++ b/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; diff --git a/Core/Network/IPv4Subnet.cs b/Core/Network/IPv4Subnet.cs index 0af23d3..1991c7a 100644 --- a/Core/Network/IPv4Subnet.cs +++ b/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; diff --git a/Core/Registry.cs b/Core/Registry.cs index 16ae28c..2ccf9f1 100644 --- a/Core/Registry.cs +++ b/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 where TData : IDataObject, new() where TKey : struct { diff --git a/Core/RegistryCleaner.cs b/Core/RegistryCleaner.cs index ed51622..5bff8d9 100644 --- a/Core/RegistryCleaner.cs +++ b/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() where TKey : struct where TData : IDataObject, new() { diff --git a/Core/Switch.cs b/Core/Switch.cs index abcf7da..761050b 100644 --- a/Core/Switch.cs +++ b/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 : List>> { diff --git a/Core/Util.cs b/Core/Util.cs index b553344..46ea6a3 100644 --- a/Core/Util.cs +++ b/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 { diff --git a/Core/delegates/Lazy.cs b/Core/delegates/Lazy.cs index 855bf58..d7b74ea 100644 --- a/Core/delegates/Lazy.cs +++ b/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(); } diff --git a/Core/delegates/Predicate.cs b/Core/delegates/Predicate.cs index b270987..07afd3b 100644 --- a/Core/delegates/Predicate.cs +++ b/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(); diff --git a/Core/exceptions/AccessDeniedException.cs b/Core/exceptions/AccessDeniedException.cs index f22ba14..a790574 100644 --- a/Core/exceptions/AccessDeniedException.cs +++ b/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 { diff --git a/Core/exceptions/CriticalException.cs b/Core/exceptions/CriticalException.cs index 4dbc920..72bc522 100644 --- a/Core/exceptions/CriticalException.cs +++ b/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 { diff --git a/Core/exceptions/FLocalException.cs b/Core/exceptions/FLocalException.cs index bb7e69f..1816095 100644 --- a/Core/exceptions/FLocalException.cs +++ b/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 { diff --git a/Core/exceptions/NotFoundInDBException.cs b/Core/exceptions/NotFoundInDBException.cs index bcf161f..31003e3 100644 --- a/Core/exceptions/NotFoundInDBException.cs +++ b/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 { diff --git a/Core/exceptions/ObjectDoesntHaveAnIdException.cs b/Core/exceptions/ObjectDoesntHaveAnIdException.cs index 6b2bc12..d6bf071 100644 --- a/Core/exceptions/ObjectDoesntHaveAnIdException.cs +++ b/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 { diff --git a/Core/extensions/Delegate.cs b/Core/extensions/Delegate.cs index 52e3eb2..d1b208d 100644 --- a/Core/extensions/Delegate.cs +++ b/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 { diff --git a/Core/extensions/Extensions.cs b/Core/extensions/Extensions.cs index 6dadd00..d3e920f 100644 --- a/Core/extensions/Extensions.cs +++ b/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 { diff --git a/Core/extensions/String.cs b/Core/extensions/String.cs index 85cc103..bf509ee 100644 --- a/Core/extensions/String.cs +++ b/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 { diff --git a/IISMainHandler/Extensions.cs b/IISMainHandler/Extensions.cs index 8feb7b1..6e39ef4 100644 --- a/IISMainHandler/Extensions.cs +++ b/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) { diff --git a/IISMainHandler/HandlersFactory.cs b/IISMainHandler/HandlersFactory.cs index bbad401..e54b185 100644 --- a/IISMainHandler/HandlersFactory.cs +++ b/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; diff --git a/IISMainHandler/MainHandler.cs b/IISMainHandler/MainHandler.cs index 7c77bb7..d7083cc 100644 --- a/IISMainHandler/MainHandler.cs +++ b/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; diff --git a/IISMainHandler/PageOuter.cs b/IISMainHandler/PageOuter.cs index 99dfccd..37fd1c8 100644 --- a/IISMainHandler/PageOuter.cs +++ b/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 { diff --git a/IISMainHandler/TemplateEngine.cs b/IISMainHandler/TemplateEngine.cs index f4e368c..5fd02d4 100644 --- a/IISMainHandler/TemplateEngine.cs +++ b/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 { diff --git a/IISMainHandler/WebContext.cs b/IISMainHandler/WebContext.cs index a191f3e..dd018bd 100644 --- a/IISMainHandler/WebContext.cs +++ b/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()); diff --git a/IISMainHandler/designs/IDesign.cs b/IISMainHandler/designs/IDesign.cs index 9428662..721b571 100644 --- a/IISMainHandler/designs/IDesign.cs +++ b/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); diff --git a/IISMainHandler/exceptions/RedirectException.cs b/IISMainHandler/exceptions/RedirectException.cs index 9af2144..255d411 100644 --- a/IISMainHandler/exceptions/RedirectException.cs +++ b/IISMainHandler/exceptions/RedirectException.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; namespace FLocal.IISHandler { - class RedirectException : FLocal.Core.FLocalException { + class RedirectException : Web.Core.FLocalException { public readonly string newUrl; diff --git a/IISMainHandler/exceptions/WrongUrlException.cs b/IISMainHandler/exceptions/WrongUrlException.cs index dbfad89..0379d0e 100644 --- a/IISMainHandler/exceptions/WrongUrlException.cs +++ b/IISMainHandler/exceptions/WrongUrlException.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using FLocal.Core; +using Web.Core; namespace FLocal.IISHandler { class WrongUrlException : FLocalException { diff --git a/IISMainHandler/handlers/BoardHandler.cs b/IISMainHandler/handlers/BoardHandler.cs index e2d039d..92cbdb4 100644 --- a/IISMainHandler/handlers/BoardHandler.cs +++ b/IISMainHandler/handlers/BoardHandler.cs @@ -6,8 +6,8 @@ using System.Web; using System.Xml.Linq; using FLocal.Common; using FLocal.Common.dataobjects; -using FLocal.Core; -using FLocal.Core.DB; +using Web.Core; +using Web.Core.DB; namespace FLocal.IISHandler.handlers { diff --git a/IISMainHandler/handlers/BoardsHandler.cs b/IISMainHandler/handlers/BoardsHandler.cs index f4f5461..e94a0b5 100644 --- a/IISMainHandler/handlers/BoardsHandler.cs +++ b/IISMainHandler/handlers/BoardsHandler.cs @@ -6,9 +6,9 @@ using System.Web; using System.Xml.Linq; using FLocal.Common; using FLocal.Common.dataobjects; -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.IISHandler.handlers { diff --git a/IISMainHandler/handlers/DebugHandler.cs b/IISMainHandler/handlers/DebugHandler.cs index def7d3f..f45c070 100644 --- a/IISMainHandler/handlers/DebugHandler.cs +++ b/IISMainHandler/handlers/DebugHandler.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Web; -using FLocal.Core.DB; +using Web.Core.DB; using FLocal.Common.dataobjects; namespace FLocal.IISHandler.handlers { diff --git a/IISMainHandler/handlers/PostHandler.cs b/IISMainHandler/handlers/PostHandler.cs index 499c89b..81ba155 100644 --- a/IISMainHandler/handlers/PostHandler.cs +++ b/IISMainHandler/handlers/PostHandler.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Web; using System.Xml.Linq; -using FLocal.Core; +using Web.Core; using FLocal.Common; using FLocal.Common.dataobjects; diff --git a/IISMainHandler/handlers/StaticHandler.cs b/IISMainHandler/handlers/StaticHandler.cs index 1753dd0..911a759 100644 --- a/IISMainHandler/handlers/StaticHandler.cs +++ b/IISMainHandler/handlers/StaticHandler.cs @@ -5,7 +5,7 @@ using System.Text; using System.Web; using System.Text.RegularExpressions; using System.IO; -using FLocal.Core; +using Web.Core; namespace FLocal.IISHandler.handlers { class StaticHandler : AbstractGetHandler { diff --git a/IISMainHandler/handlers/ThreadHandler.cs b/IISMainHandler/handlers/ThreadHandler.cs index e353630..bc9a4b3 100644 --- a/IISMainHandler/handlers/ThreadHandler.cs +++ b/IISMainHandler/handlers/ThreadHandler.cs @@ -6,9 +6,9 @@ using System.Web; using System.Xml.Linq; using FLocal.Common; using FLocal.Common.dataobjects; -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.IISHandler.handlers { diff --git a/IISMainHandler/handlers/WrongUrlHandler.cs b/IISMainHandler/handlers/WrongUrlHandler.cs index 870b5c0..1afa604 100644 --- a/IISMainHandler/handlers/WrongUrlHandler.cs +++ b/IISMainHandler/handlers/WrongUrlHandler.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Web; using System.Xml.Linq; -using FLocal.Core; +using Web.Core; namespace FLocal.IISHandler.handlers { class WrongUrlHandler : AbstractGetHandler { diff --git a/IISMainHandler/handlers/request/AbstractNewAccountHandler.cs b/IISMainHandler/handlers/request/AbstractNewAccountHandler.cs index 4c916cc..38289ef 100644 --- a/IISMainHandler/handlers/request/AbstractNewAccountHandler.cs +++ b/IISMainHandler/handlers/request/AbstractNewAccountHandler.cs @@ -4,9 +4,9 @@ using System.Linq; using System.Text; using System.Xml.Linq; using FLocal.Common.dataobjects; -using FLocal.Importer; +using FLocal.Migration.Gateway; using System.Text.RegularExpressions; -using FLocal.Core; +using Web.Core; using FLocal.Common; using FLocal.Common.actions; diff --git a/IISMainHandler/handlers/request/AbstractNewMessageHandler.cs b/IISMainHandler/handlers/request/AbstractNewMessageHandler.cs index 5ecad17..79d64d5 100644 --- a/IISMainHandler/handlers/request/AbstractNewMessageHandler.cs +++ b/IISMainHandler/handlers/request/AbstractNewMessageHandler.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using FLocal.Core; +using Web.Core; namespace FLocal.IISHandler.handlers.request { abstract class AbstractNewMessageHandler : AbstractPostHandler { diff --git a/IISMainHandler/handlers/request/AbstractPostHandler.cs b/IISMainHandler/handlers/request/AbstractPostHandler.cs index 9aeec9e..573d70e 100644 --- a/IISMainHandler/handlers/request/AbstractPostHandler.cs +++ b/IISMainHandler/handlers/request/AbstractPostHandler.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Xml.Linq; -using FLocal.Core; +using Web.Core; using FLocal.Common; namespace FLocal.IISHandler.handlers.request { diff --git a/IISMainHandler/handlers/request/CreatePollHandler.cs b/IISMainHandler/handlers/request/CreatePollHandler.cs index 040aeec..06d8d6b 100644 --- a/IISMainHandler/handlers/request/CreatePollHandler.cs +++ b/IISMainHandler/handlers/request/CreatePollHandler.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Xml.Linq; -using FLocal.Core; +using Web.Core; using FLocal.Common.dataobjects; namespace FLocal.IISHandler.handlers.request { diff --git a/IISMainHandler/handlers/request/LoginHandler.cs b/IISMainHandler/handlers/request/LoginHandler.cs index 28c2bce..63161e1 100644 --- a/IISMainHandler/handlers/request/LoginHandler.cs +++ b/IISMainHandler/handlers/request/LoginHandler.cs @@ -4,9 +4,9 @@ using System.Linq; using System.Text; using System.Xml.Linq; using FLocal.Common.dataobjects; -using FLocal.Importer; +using FLocal.Migration.Gateway; using System.Text.RegularExpressions; -using FLocal.Core; +using Web.Core; using FLocal.Common; using FLocal.Common.actions; using System.Web; diff --git a/IISMainHandler/handlers/request/LogoutHandler.cs b/IISMainHandler/handlers/request/LogoutHandler.cs index a6c6357..7e459bf 100644 --- a/IISMainHandler/handlers/request/LogoutHandler.cs +++ b/IISMainHandler/handlers/request/LogoutHandler.cs @@ -4,9 +4,9 @@ using System.Linq; using System.Text; using System.Xml.Linq; using FLocal.Common.dataobjects; -using FLocal.Importer; +using FLocal.Migration.Gateway; using System.Text.RegularExpressions; -using FLocal.Core; +using Web.Core; using FLocal.Common; using FLocal.Common.actions; using System.Web; diff --git a/IISMainHandler/handlers/request/MarkThreadAsReadHandler.cs b/IISMainHandler/handlers/request/MarkThreadAsReadHandler.cs index 1cafe33..07dacfe 100644 --- a/IISMainHandler/handlers/request/MarkThreadAsReadHandler.cs +++ b/IISMainHandler/handlers/request/MarkThreadAsReadHandler.cs @@ -4,9 +4,9 @@ using System.Linq; using System.Text; using System.Xml.Linq; using FLocal.Common.dataobjects; -using FLocal.Importer; +using FLocal.Migration.Gateway; using System.Text.RegularExpressions; -using FLocal.Core; +using Web.Core; using FLocal.Common; using FLocal.Common.actions; using System.Web; diff --git a/IISMainHandler/handlers/request/MigrateAccountHandler.cs b/IISMainHandler/handlers/request/MigrateAccountHandler.cs index 5be5a1c..bccc0bd 100644 --- a/IISMainHandler/handlers/request/MigrateAccountHandler.cs +++ b/IISMainHandler/handlers/request/MigrateAccountHandler.cs @@ -4,9 +4,9 @@ using System.Linq; using System.Text; using System.Xml.Linq; using FLocal.Common.dataobjects; -using FLocal.Importer; +using FLocal.Migration.Gateway; using System.Text.RegularExpressions; -using FLocal.Core; +using Web.Core; using FLocal.Common; using FLocal.Common.actions; diff --git a/IISMainHandler/handlers/request/RegisterByInviteHandler.cs b/IISMainHandler/handlers/request/RegisterByInviteHandler.cs index 10cb215..34765bf 100644 --- a/IISMainHandler/handlers/request/RegisterByInviteHandler.cs +++ b/IISMainHandler/handlers/request/RegisterByInviteHandler.cs @@ -4,9 +4,9 @@ using System.Linq; using System.Text; using System.Xml.Linq; using FLocal.Common.dataobjects; -using FLocal.Importer; +using FLocal.Migration.Gateway; using System.Text.RegularExpressions; -using FLocal.Core; +using Web.Core; using FLocal.Common; using FLocal.Common.actions; diff --git a/IISMainHandler/handlers/request/RegisterHandler.cs b/IISMainHandler/handlers/request/RegisterHandler.cs index 6176e4c..ef1b2a7 100644 --- a/IISMainHandler/handlers/request/RegisterHandler.cs +++ b/IISMainHandler/handlers/request/RegisterHandler.cs @@ -4,9 +4,9 @@ using System.Linq; using System.Text; using System.Xml.Linq; using FLocal.Common.dataobjects; -using FLocal.Importer; +using FLocal.Migration.Gateway; using System.Text.RegularExpressions; -using FLocal.Core; +using Web.Core; using FLocal.Common; using FLocal.Common.actions; diff --git a/IISMainHandler/handlers/request/SettingsHandler.cs b/IISMainHandler/handlers/request/SettingsHandler.cs index fb85330..bea78f6 100644 --- a/IISMainHandler/handlers/request/SettingsHandler.cs +++ b/IISMainHandler/handlers/request/SettingsHandler.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Xml.Linq; -using FLocal.Core; +using Web.Core; using FLocal.Common.dataobjects; namespace FLocal.IISHandler.handlers.request { diff --git a/IISMainHandler/handlers/request/UploadHandler.cs b/IISMainHandler/handlers/request/UploadHandler.cs index bdaee20..06a3652 100644 --- a/IISMainHandler/handlers/request/UploadHandler.cs +++ b/IISMainHandler/handlers/request/UploadHandler.cs @@ -4,9 +4,9 @@ using System.Linq; using System.Text; using System.Xml.Linq; using FLocal.Common.dataobjects; -using FLocal.Importer; +using FLocal.Migration.Gateway; using System.Text.RegularExpressions; -using FLocal.Core; +using Web.Core; using FLocal.Common; using FLocal.Common.actions; using System.Web; diff --git a/IISMainHandler/handlers/request/UserDataHandler.cs b/IISMainHandler/handlers/request/UserDataHandler.cs index ed7756d..b0194be 100644 --- a/IISMainHandler/handlers/request/UserDataHandler.cs +++ b/IISMainHandler/handlers/request/UserDataHandler.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Xml.Linq; -using FLocal.Core; +using Web.Core; using FLocal.Common.dataobjects; namespace FLocal.IISHandler.handlers.request { diff --git a/IISMainHandler/handlers/request/VoteHandler.cs b/IISMainHandler/handlers/request/VoteHandler.cs index 49c2e85..0331e9d 100644 --- a/IISMainHandler/handlers/request/VoteHandler.cs +++ b/IISMainHandler/handlers/request/VoteHandler.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Xml.Linq; -using FLocal.Core; +using Web.Core; using FLocal.Common.dataobjects; namespace FLocal.IISHandler.handlers.request { diff --git a/IISMainHandler/handlers/request/avatars/AddHandler.cs b/IISMainHandler/handlers/request/avatars/AddHandler.cs index 8cfdd4e..0ba3a40 100644 --- a/IISMainHandler/handlers/request/avatars/AddHandler.cs +++ b/IISMainHandler/handlers/request/avatars/AddHandler.cs @@ -4,9 +4,9 @@ using System.Linq; using System.Text; using System.Xml.Linq; using FLocal.Common.dataobjects; -using FLocal.Importer; +using FLocal.Migration.Gateway; using System.Text.RegularExpressions; -using FLocal.Core; +using Web.Core; using FLocal.Common; using FLocal.Common.actions; using System.Web; diff --git a/IISMainHandler/handlers/request/avatars/RemoveHandler.cs b/IISMainHandler/handlers/request/avatars/RemoveHandler.cs index 377081c..5b9d094 100644 --- a/IISMainHandler/handlers/request/avatars/RemoveHandler.cs +++ b/IISMainHandler/handlers/request/avatars/RemoveHandler.cs @@ -4,9 +4,9 @@ using System.Linq; using System.Text; using System.Xml.Linq; using FLocal.Common.dataobjects; -using FLocal.Importer; +using FLocal.Migration.Gateway; using System.Text.RegularExpressions; -using FLocal.Core; +using Web.Core; using FLocal.Common; using FLocal.Common.actions; using System.Web; diff --git a/IISMainHandler/handlers/request/avatars/SetAsDefaultHandler.cs b/IISMainHandler/handlers/request/avatars/SetAsDefaultHandler.cs index e5d3d69..cb90907 100644 --- a/IISMainHandler/handlers/request/avatars/SetAsDefaultHandler.cs +++ b/IISMainHandler/handlers/request/avatars/SetAsDefaultHandler.cs @@ -4,9 +4,9 @@ using System.Linq; using System.Text; using System.Xml.Linq; using FLocal.Common.dataobjects; -using FLocal.Importer; +using FLocal.Migration.Gateway; using System.Text.RegularExpressions; -using FLocal.Core; +using Web.Core; using FLocal.Common; using FLocal.Common.actions; using System.Web; diff --git a/IISMainHandler/handlers/request/maintenance/CleanCacheHandler.cs b/IISMainHandler/handlers/request/maintenance/CleanCacheHandler.cs index cef6ba1..11119c1 100644 --- a/IISMainHandler/handlers/request/maintenance/CleanCacheHandler.cs +++ b/IISMainHandler/handlers/request/maintenance/CleanCacheHandler.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Xml.Linq; -using FLocal.Core; +using Web.Core; using FLocal.Common; namespace FLocal.IISHandler.handlers.request.maintenance { diff --git a/IISMainHandler/handlers/response/AbstractNewMessageHandler.cs b/IISMainHandler/handlers/response/AbstractNewMessageHandler.cs index 121d326..367e426 100644 --- a/IISMainHandler/handlers/response/AbstractNewMessageHandler.cs +++ b/IISMainHandler/handlers/response/AbstractNewMessageHandler.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Xml.Linq; -using FLocal.Core; +using Web.Core; using FLocal.Common; namespace FLocal.IISHandler.handlers.response { diff --git a/IISMainHandler/handlers/response/AbstractUserGetHandler.cs b/IISMainHandler/handlers/response/AbstractUserGetHandler.cs index 790b43a..cad47eb 100644 --- a/IISMainHandler/handlers/response/AbstractUserGetHandler.cs +++ b/IISMainHandler/handlers/response/AbstractUserGetHandler.cs @@ -6,9 +6,9 @@ using System.Web; using System.Xml.Linq; using FLocal.Common; using FLocal.Common.dataobjects; -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.IISHandler.handlers.response { diff --git a/IISMainHandler/handlers/response/ActiveAccountListHandler.cs b/IISMainHandler/handlers/response/ActiveAccountListHandler.cs index 30e35f7..493bcd7 100644 --- a/IISMainHandler/handlers/response/ActiveAccountListHandler.cs +++ b/IISMainHandler/handlers/response/ActiveAccountListHandler.cs @@ -6,8 +6,8 @@ using System.Web; using System.Xml.Linq; using FLocal.Common; using FLocal.Common.dataobjects; -using FLocal.Core.DB; -using FLocal.Core.DB.conditions; +using Web.Core.DB; +using Web.Core.DB.conditions; namespace FLocal.IISHandler.handlers.response { @@ -24,9 +24,9 @@ namespace FLocal.IISHandler.handlers.response { IEnumerable accounts = Account.LoadByIds( from stringId in Config.instance.mainConnection.LoadIdsByConditions( Account.TableSpec.instance, - new Core.DB.conditions.ComparisonCondition( + new Web.Core.DB.conditions.ComparisonCondition( Account.TableSpec.instance.getColumnSpec(Account.TableSpec.FIELD_NEEDSMIGRATION), - Core.DB.conditions.ComparisonType.EQUAL, + Web.Core.DB.conditions.ComparisonType.EQUAL, "0" ), pageOuter diff --git a/IISMainHandler/handlers/response/AllPostsHandler.cs b/IISMainHandler/handlers/response/AllPostsHandler.cs index 9dfa537..7be6dca 100644 --- a/IISMainHandler/handlers/response/AllPostsHandler.cs +++ b/IISMainHandler/handlers/response/AllPostsHandler.cs @@ -6,9 +6,9 @@ using System.Web; using System.Xml.Linq; using FLocal.Common; using FLocal.Common.dataobjects; -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.IISHandler.handlers.response { diff --git a/IISMainHandler/handlers/response/AllThreadsHandler.cs b/IISMainHandler/handlers/response/AllThreadsHandler.cs index 07995c9..33465ba 100644 --- a/IISMainHandler/handlers/response/AllThreadsHandler.cs +++ b/IISMainHandler/handlers/response/AllThreadsHandler.cs @@ -6,9 +6,9 @@ using System.Web; using System.Xml.Linq; using FLocal.Common; using FLocal.Common.dataobjects; -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.IISHandler.handlers.response { diff --git a/IISMainHandler/handlers/response/AvatarsSettingsHandler.cs b/IISMainHandler/handlers/response/AvatarsSettingsHandler.cs index 8178415..0400492 100644 --- a/IISMainHandler/handlers/response/AvatarsSettingsHandler.cs +++ b/IISMainHandler/handlers/response/AvatarsSettingsHandler.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Web; using System.Xml.Linq; -using FLocal.Core; +using Web.Core; using FLocal.Common; using FLocal.Common.dataobjects; diff --git a/IISMainHandler/handlers/response/BoardAsThread.cs b/IISMainHandler/handlers/response/BoardAsThread.cs index 63dd555..b89ebd3 100644 --- a/IISMainHandler/handlers/response/BoardAsThread.cs +++ b/IISMainHandler/handlers/response/BoardAsThread.cs @@ -6,7 +6,7 @@ using System.Web; using System.Xml.Linq; using FLocal.Common; using FLocal.Common.dataobjects; -using FLocal.Core.DB; +using Web.Core.DB; namespace FLocal.IISHandler.handlers.response { diff --git a/IISMainHandler/handlers/response/ConversationHandler.cs b/IISMainHandler/handlers/response/ConversationHandler.cs index 3fc6e5b..6380319 100644 --- a/IISMainHandler/handlers/response/ConversationHandler.cs +++ b/IISMainHandler/handlers/response/ConversationHandler.cs @@ -6,9 +6,9 @@ using System.Web; using System.Xml.Linq; using FLocal.Common; using FLocal.Common.dataobjects; -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.IISHandler.handlers.response { diff --git a/IISMainHandler/handlers/response/ConversationsHandler.cs b/IISMainHandler/handlers/response/ConversationsHandler.cs index a585765..90f3a9e 100644 --- a/IISMainHandler/handlers/response/ConversationsHandler.cs +++ b/IISMainHandler/handlers/response/ConversationsHandler.cs @@ -6,8 +6,8 @@ using System.Web; using System.Xml.Linq; using FLocal.Common; using FLocal.Common.dataobjects; -using FLocal.Core; -using FLocal.Core.DB; +using Web.Core; +using Web.Core.DB; namespace FLocal.IISHandler.handlers.response { diff --git a/IISMainHandler/handlers/response/CreatePollHandler.cs b/IISMainHandler/handlers/response/CreatePollHandler.cs index c402485..bb9a895 100644 --- a/IISMainHandler/handlers/response/CreatePollHandler.cs +++ b/IISMainHandler/handlers/response/CreatePollHandler.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Web; using System.Xml.Linq; -using FLocal.Core; +using Web.Core; using FLocal.Common; using FLocal.Common.dataobjects; diff --git a/IISMainHandler/handlers/response/CreateThreadHandler.cs b/IISMainHandler/handlers/response/CreateThreadHandler.cs index cd195fd..f0b1579 100644 --- a/IISMainHandler/handlers/response/CreateThreadHandler.cs +++ b/IISMainHandler/handlers/response/CreateThreadHandler.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Web; using System.Xml.Linq; -using FLocal.Core; +using Web.Core; using FLocal.Common; using FLocal.Common.dataobjects; diff --git a/IISMainHandler/handlers/response/EditHandler.cs b/IISMainHandler/handlers/response/EditHandler.cs index 01d6dc6..b336d8f 100644 --- a/IISMainHandler/handlers/response/EditHandler.cs +++ b/IISMainHandler/handlers/response/EditHandler.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Web; using System.Xml.Linq; -using FLocal.Core; +using Web.Core; using FLocal.Common; using FLocal.Common.dataobjects; diff --git a/IISMainHandler/handlers/response/LocalNetworksListHandler.cs b/IISMainHandler/handlers/response/LocalNetworksListHandler.cs index 76f4b58..d19db54 100644 --- a/IISMainHandler/handlers/response/LocalNetworksListHandler.cs +++ b/IISMainHandler/handlers/response/LocalNetworksListHandler.cs @@ -6,8 +6,8 @@ using System.Web; using System.Xml.Linq; using FLocal.Common; using FLocal.Common.dataobjects; -using FLocal.Core.DB; -using FLocal.Core.DB.conditions; +using Web.Core.DB; +using Web.Core.DB.conditions; namespace FLocal.IISHandler.handlers.response { @@ -23,7 +23,7 @@ namespace FLocal.IISHandler.handlers.response { IEnumerable localNetworks = LocalNetwork.LoadByIds( from stringId in Config.instance.mainConnection.LoadIdsByConditions( LocalNetwork.TableSpec.instance, - new Core.DB.conditions.EmptyCondition(), + new Web.Core.DB.conditions.EmptyCondition(), Diapasone.unlimited ) select int.Parse(stringId) ); diff --git a/IISMainHandler/handlers/response/LoginHandler.cs b/IISMainHandler/handlers/response/LoginHandler.cs index 3d612aa..fa48b5e 100644 --- a/IISMainHandler/handlers/response/LoginHandler.cs +++ b/IISMainHandler/handlers/response/LoginHandler.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using FLocal.Core; +using Web.Core; using FLocal.Common; using System.Xml.Linq; using FLocal.Common.dataobjects; diff --git a/IISMainHandler/handlers/response/MigrateAccountHandler.cs b/IISMainHandler/handlers/response/MigrateAccountHandler.cs index 7164f6c..c248f33 100644 --- a/IISMainHandler/handlers/response/MigrateAccountHandler.cs +++ b/IISMainHandler/handlers/response/MigrateAccountHandler.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using FLocal.Core; +using Web.Core; using FLocal.Common; using System.Xml.Linq; using FLocal.Common.dataobjects; diff --git a/IISMainHandler/handlers/response/PMReplyHandler.cs b/IISMainHandler/handlers/response/PMReplyHandler.cs index dab39b7..6ac637e 100644 --- a/IISMainHandler/handlers/response/PMReplyHandler.cs +++ b/IISMainHandler/handlers/response/PMReplyHandler.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Web; using System.Xml.Linq; -using FLocal.Core; +using Web.Core; using FLocal.Common; using FLocal.Common.dataobjects; diff --git a/IISMainHandler/handlers/response/PMReplyToPostHandler.cs b/IISMainHandler/handlers/response/PMReplyToPostHandler.cs index 916678f..3e71dea 100644 --- a/IISMainHandler/handlers/response/PMReplyToPostHandler.cs +++ b/IISMainHandler/handlers/response/PMReplyToPostHandler.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Web; using System.Xml.Linq; -using FLocal.Core; +using Web.Core; using FLocal.Common; using FLocal.Common.dataobjects; diff --git a/IISMainHandler/handlers/response/PMSendHandler.cs b/IISMainHandler/handlers/response/PMSendHandler.cs index c88552a..b67b100 100644 --- a/IISMainHandler/handlers/response/PMSendHandler.cs +++ b/IISMainHandler/handlers/response/PMSendHandler.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Web; using System.Xml.Linq; -using FLocal.Core; +using Web.Core; using FLocal.Common; using FLocal.Common.dataobjects; diff --git a/IISMainHandler/handlers/response/PollHandler.cs b/IISMainHandler/handlers/response/PollHandler.cs index a0e9b8b..9a1dd3f 100644 --- a/IISMainHandler/handlers/response/PollHandler.cs +++ b/IISMainHandler/handlers/response/PollHandler.cs @@ -6,9 +6,9 @@ using System.Web; using System.Xml.Linq; using FLocal.Common; using FLocal.Common.dataobjects; -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.IISHandler.handlers.response { diff --git a/IISMainHandler/handlers/response/PollsListHandler.cs b/IISMainHandler/handlers/response/PollsListHandler.cs index bf625d4..d69cd65 100644 --- a/IISMainHandler/handlers/response/PollsListHandler.cs +++ b/IISMainHandler/handlers/response/PollsListHandler.cs @@ -6,9 +6,9 @@ using System.Web; using System.Xml.Linq; using FLocal.Common; using FLocal.Common.dataobjects; -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.IISHandler.handlers.response { diff --git a/IISMainHandler/handlers/response/PunishHandler.cs b/IISMainHandler/handlers/response/PunishHandler.cs index ff7b48e..8b52ed9 100644 --- a/IISMainHandler/handlers/response/PunishHandler.cs +++ b/IISMainHandler/handlers/response/PunishHandler.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Web; using System.Xml.Linq; -using FLocal.Core; +using Web.Core; using FLocal.Common; using FLocal.Common.dataobjects; diff --git a/IISMainHandler/handlers/response/QuickLinkHandler.cs b/IISMainHandler/handlers/response/QuickLinkHandler.cs index bf3b2e2..23dedad 100644 --- a/IISMainHandler/handlers/response/QuickLinkHandler.cs +++ b/IISMainHandler/handlers/response/QuickLinkHandler.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using FLocal.Core; +using Web.Core; using FLocal.Common; using FLocal.Common.dataobjects; diff --git a/IISMainHandler/handlers/response/RegisterByInviteHandler.cs b/IISMainHandler/handlers/response/RegisterByInviteHandler.cs index 43f753e..2b77efd 100644 --- a/IISMainHandler/handlers/response/RegisterByInviteHandler.cs +++ b/IISMainHandler/handlers/response/RegisterByInviteHandler.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Xml.Linq; -using FLocal.Core; +using Web.Core; using FLocal.Common.dataobjects; namespace FLocal.IISHandler.handlers.response { diff --git a/IISMainHandler/handlers/response/ReplyHandler.cs b/IISMainHandler/handlers/response/ReplyHandler.cs index eb78e44..989c43e 100644 --- a/IISMainHandler/handlers/response/ReplyHandler.cs +++ b/IISMainHandler/handlers/response/ReplyHandler.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Web; using System.Xml.Linq; -using FLocal.Core; +using Web.Core; using FLocal.Common; using FLocal.Common.dataobjects; diff --git a/IISMainHandler/handlers/response/RobotsHandler.cs b/IISMainHandler/handlers/response/RobotsHandler.cs index d3abe93..b3213ef 100644 --- a/IISMainHandler/handlers/response/RobotsHandler.cs +++ b/IISMainHandler/handlers/response/RobotsHandler.cs @@ -5,7 +5,7 @@ using System.Text; using System.Web; using System.Text.RegularExpressions; using System.IO; -using FLocal.Core; +using Web.Core; using FLocal.Common; namespace FLocal.IISHandler.handlers.response { diff --git a/IISMainHandler/handlers/response/SettingsHandler.cs b/IISMainHandler/handlers/response/SettingsHandler.cs index bca6b68..b19dc70 100644 --- a/IISMainHandler/handlers/response/SettingsHandler.cs +++ b/IISMainHandler/handlers/response/SettingsHandler.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Web; using System.Xml.Linq; -using FLocal.Core; +using Web.Core; using FLocal.Common; using FLocal.Common.dataobjects; diff --git a/IISMainHandler/handlers/response/UploadHandler.cs b/IISMainHandler/handlers/response/UploadHandler.cs index d22f4ad..c2bfd70 100644 --- a/IISMainHandler/handlers/response/UploadHandler.cs +++ b/IISMainHandler/handlers/response/UploadHandler.cs @@ -2,12 +2,12 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using FLocal.Core; +using Web.Core; using FLocal.Common; using System.Xml.Linq; using FLocal.Common.dataobjects; -using FLocal.Core.DB; -using FLocal.Core.DB.conditions; +using Web.Core.DB; +using Web.Core.DB.conditions; namespace FLocal.IISHandler.handlers.response { class UploadHandler : RedirectGetHandler { @@ -22,7 +22,7 @@ namespace FLocal.IISHandler.handlers.response { Uri referer = context.httprequest.UrlReferrer; if(referer == null || referer.Host != context.httprequest.Url.Host) { //throw new AccessDeniedException(); - return new Common.URL.upload.Info(this.url.upload.id.ToString(), null).canonical; + return new FLocal.Common.URL.upload.Info(this.url.upload.id.ToString(), null).canonical; } string mime = Util.getMimeByExtension(this.url.upload.extension); diff --git a/IISMainHandler/handlers/response/UploadInfoHandler.cs b/IISMainHandler/handlers/response/UploadInfoHandler.cs index f1f33ba..7f2d881 100644 --- a/IISMainHandler/handlers/response/UploadInfoHandler.cs +++ b/IISMainHandler/handlers/response/UploadInfoHandler.cs @@ -2,12 +2,12 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using FLocal.Core; +using Web.Core; using FLocal.Common; using System.Xml.Linq; using FLocal.Common.dataobjects; -using FLocal.Core.DB; -using FLocal.Core.DB.conditions; +using Web.Core.DB; +using Web.Core.DB.conditions; namespace FLocal.IISHandler.handlers.response { class UploadInfoHandler : AbstractGetHandler { diff --git a/IISMainHandler/handlers/response/UploadListHandler.cs b/IISMainHandler/handlers/response/UploadListHandler.cs index 3f20911..19db582 100644 --- a/IISMainHandler/handlers/response/UploadListHandler.cs +++ b/IISMainHandler/handlers/response/UploadListHandler.cs @@ -2,12 +2,12 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using FLocal.Core; +using Web.Core; using FLocal.Common; using System.Xml.Linq; using FLocal.Common.dataobjects; -using FLocal.Core.DB; -using FLocal.Core.DB.conditions; +using Web.Core.DB; +using Web.Core.DB.conditions; namespace FLocal.IISHandler.handlers.response { class UploadListHandler : AbstractGetHandler { diff --git a/IISMainHandler/handlers/response/UploadNewHandler.cs b/IISMainHandler/handlers/response/UploadNewHandler.cs index 2a7bebe..3a8b560 100644 --- a/IISMainHandler/handlers/response/UploadNewHandler.cs +++ b/IISMainHandler/handlers/response/UploadNewHandler.cs @@ -2,12 +2,12 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using FLocal.Core; +using Web.Core; using FLocal.Common; using System.Xml.Linq; using FLocal.Common.dataobjects; -using FLocal.Core.DB; -using FLocal.Core.DB.conditions; +using Web.Core.DB; +using Web.Core.DB.conditions; namespace FLocal.IISHandler.handlers.response { class UploadNewHandler : AbstractGetHandler { diff --git a/IISMainHandler/handlers/response/UserDataHandler.cs b/IISMainHandler/handlers/response/UserDataHandler.cs index c3ecf4e..cd41737 100644 --- a/IISMainHandler/handlers/response/UserDataHandler.cs +++ b/IISMainHandler/handlers/response/UserDataHandler.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Web; using System.Xml.Linq; -using FLocal.Core; +using Web.Core; using FLocal.Common; using FLocal.Common.dataobjects; diff --git a/IISMainHandler/handlers/response/UserInfoHandler.cs b/IISMainHandler/handlers/response/UserInfoHandler.cs index 96828de..45d219b 100644 --- a/IISMainHandler/handlers/response/UserInfoHandler.cs +++ b/IISMainHandler/handlers/response/UserInfoHandler.cs @@ -6,9 +6,9 @@ using System.Web; using System.Xml.Linq; using FLocal.Common; using FLocal.Common.dataobjects; -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.IISHandler.handlers.response { diff --git a/IISMainHandler/handlers/response/UserListHandler.cs b/IISMainHandler/handlers/response/UserListHandler.cs index 4f755f5..cf73ff5 100644 --- a/IISMainHandler/handlers/response/UserListHandler.cs +++ b/IISMainHandler/handlers/response/UserListHandler.cs @@ -6,7 +6,7 @@ using System.Web; using System.Xml.Linq; using FLocal.Common; using FLocal.Common.dataobjects; -using FLocal.Core.DB; +using Web.Core.DB; namespace FLocal.IISHandler.handlers.response { diff --git a/IISMainHandler/handlers/response/UserPollsParticipatedHandler.cs b/IISMainHandler/handlers/response/UserPollsParticipatedHandler.cs index 2d866b9..0cdd206 100644 --- a/IISMainHandler/handlers/response/UserPollsParticipatedHandler.cs +++ b/IISMainHandler/handlers/response/UserPollsParticipatedHandler.cs @@ -6,9 +6,9 @@ using System.Web; using System.Xml.Linq; using FLocal.Common; using FLocal.Common.dataobjects; -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.IISHandler.handlers.response { diff --git a/IISMainHandler/handlers/response/UserPostsHandler.cs b/IISMainHandler/handlers/response/UserPostsHandler.cs index b4441d5..e7bce5c 100644 --- a/IISMainHandler/handlers/response/UserPostsHandler.cs +++ b/IISMainHandler/handlers/response/UserPostsHandler.cs @@ -6,9 +6,9 @@ using System.Web; using System.Xml.Linq; using FLocal.Common; using FLocal.Common.dataobjects; -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.IISHandler.handlers.response { diff --git a/IISMainHandler/handlers/response/UserRepliesHandler.cs b/IISMainHandler/handlers/response/UserRepliesHandler.cs index 542edd6..e353641 100644 --- a/IISMainHandler/handlers/response/UserRepliesHandler.cs +++ b/IISMainHandler/handlers/response/UserRepliesHandler.cs @@ -6,9 +6,9 @@ using System.Web; using System.Xml.Linq; using FLocal.Common; using FLocal.Common.dataobjects; -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.IISHandler.handlers.response { diff --git a/IISMainHandler/handlers/response/UserThreadsHandler.cs b/IISMainHandler/handlers/response/UserThreadsHandler.cs index e9f517f..a051e90 100644 --- a/IISMainHandler/handlers/response/UserThreadsHandler.cs +++ b/IISMainHandler/handlers/response/UserThreadsHandler.cs @@ -6,9 +6,9 @@ using System.Web; using System.Xml.Linq; using FLocal.Common; using FLocal.Common.dataobjects; -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.IISHandler.handlers.response { diff --git a/IISMainHandler/handlers/response/WhoIsOnlineHandler.cs b/IISMainHandler/handlers/response/WhoIsOnlineHandler.cs index 9503441..e529474 100644 --- a/IISMainHandler/handlers/response/WhoIsOnlineHandler.cs +++ b/IISMainHandler/handlers/response/WhoIsOnlineHandler.cs @@ -6,9 +6,9 @@ using System.Web; using System.Xml.Linq; using FLocal.Common; using FLocal.Common.dataobjects; -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.URL; namespace FLocal.IISHandler.handlers.response { @@ -30,12 +30,12 @@ namespace FLocal.IISHandler.handlers.response { ConditionsJoinType.AND, new ComparisonCondition( Session.TableSpec.instance.getColumnSpec(Session.TableSpec.FIELD_LASTHUMANACTIVITY), - Core.DB.conditions.ComparisonType.GREATEROREQUAL, + Web.Core.DB.conditions.ComparisonType.GREATEROREQUAL, DateTime.Now.Subtract(Config.instance.ActivityThreshold).ToUTCString() ), new ComparisonCondition( Session.TableSpec.instance.getColumnSpec(Session.TableSpec.FIELD_ISDELETED), - Core.DB.conditions.ComparisonType.EQUAL, + Web.Core.DB.conditions.ComparisonType.EQUAL, "0" ) ), diff --git a/IISMainHandler/handlers/response/maintenance/CleanCacheHandler.cs b/IISMainHandler/handlers/response/maintenance/CleanCacheHandler.cs index b300687..0bfd272 100644 --- a/IISMainHandler/handlers/response/maintenance/CleanCacheHandler.cs +++ b/IISMainHandler/handlers/response/maintenance/CleanCacheHandler.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Web; using System.Xml.Linq; -using FLocal.Core; +using Web.Core; using FLocal.Common; using FLocal.Common.dataobjects; diff --git a/IISUploadHandler/Config.cs b/IISUploadHandler/Config.cs index dee9498..7b8d57c 100644 --- a/IISUploadHandler/Config.cs +++ b/IISUploadHandler/Config.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Configuration; -namespace FLocal.IISUploadHandler { +namespace Web.IISUploadHandler { class Config { public static readonly Config instance = new Config(); diff --git a/IISUploadHandler/IISUploadHandler.csproj b/IISUploadHandler/IISUploadHandler.csproj index c5c8e05..05451b2 100644 --- a/IISUploadHandler/IISUploadHandler.csproj +++ b/IISUploadHandler/IISUploadHandler.csproj @@ -8,7 +8,7 @@ {09F13185-3B2A-4FCB-AB6A-750112FFF920} Library Properties - FLocal.IISUploadHandler + Web.IISUploadHandler IISUploadHandler v3.5 512 diff --git a/IISUploadHandler/UploadHandler.cs b/IISUploadHandler/UploadHandler.cs index e257284..abe6981 100644 --- a/IISUploadHandler/UploadHandler.cs +++ b/IISUploadHandler/UploadHandler.cs @@ -4,9 +4,9 @@ using System.Linq; using System.Text; using System.Web; using System.IO; -using FLocal.Core; +using Web.Core; -namespace FLocal.IISUploadHandler { +namespace Web.IISUploadHandler { class UploadHandler : IHttpHandler { public bool IsReusable { diff --git a/ImportConsole/ImportConsole.csproj b/ImportConsole/ImportConsole.csproj index 9087bae..e2b328f 100644 --- a/ImportConsole/ImportConsole.csproj +++ b/ImportConsole/ImportConsole.csproj @@ -8,7 +8,7 @@ {208B84AF-A5DD-4C20-83D5-160EA243BA43} Exe Properties - FLocal.ImportConsole + FLocal.Migration.Console ImportConsole v3.5 512 diff --git a/ImportConsole/Program.cs b/ImportConsole/Program.cs index 0208817..1763658 100644 --- a/ImportConsole/Program.cs +++ b/ImportConsole/Program.cs @@ -6,7 +6,7 @@ using System.Configuration; using NConsoler; using FLocal.Common; -namespace FLocal.ImportConsole { +namespace FLocal.Migration.Console { class Program { public static void Main(string[] args) { Consolery.Run(typeof(Program), args); @@ -28,8 +28,8 @@ namespace FLocal.ImportConsole { try { UsersImporter.ImportUsers(); } catch(Exception e) { - Console.WriteLine(e.GetType().FullName + ": " + e.Message); - Console.WriteLine(e.StackTrace); + System.Console.WriteLine(e.GetType().FullName + ": " + e.Message); + System.Console.WriteLine(e.StackTrace); } } diff --git a/ImportConsole/ShallerDBProcessor.cs b/ImportConsole/ShallerDBProcessor.cs index 83f999d..b7216cd 100644 --- a/ImportConsole/ShallerDBProcessor.cs +++ b/ImportConsole/ShallerDBProcessor.cs @@ -3,15 +3,15 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.IO; -using FLocal.Core; -using FLocal.Importer; +using Web.Core; +using FLocal.Migration.Gateway; using FLocal.Common; using FLocal.Common.actions; using FLocal.Common.dataobjects; -using FLocal.Core.DB; -using FLocal.Core.DB.conditions; +using Web.Core.DB; +using Web.Core.DB.conditions; -namespace FLocal.ImportConsole { +namespace FLocal.Migration.Console { static class ShallerDBProcessor { private readonly static Dictionary discussions = new Dictionary { @@ -158,20 +158,20 @@ namespace FLocal.ImportConsole { continue; } if(i%1000 == 0) { - Console.Write("[" + (int)(i/1000) + "]"); + System.Console.Write("[" + (int)(i/1000) + "]"); } Dictionary data; try { data = DictionaryConverter.FromDump(line); } catch(Exception e) { - Console.Error.WriteLine("Error while trying to parse line: " + e.GetType().FullName + ": " + e.Message); - Console.Error.WriteLine(e.StackTrace); + System.Console.Error.WriteLine("Error while trying to parse line: " + e.GetType().FullName + ": " + e.Message); + System.Console.Error.WriteLine(e.StackTrace); continue; } int postId = int.Parse(data["Number"]); try { if(inserts.ContainsKey(postId)) { - Console.Write("-"); + System.Console.Write("-"); } else if(Config.instance.mainConnection.GetCountByConditions(Post.TableSpec.instance, new ComparisonCondition(Post.TableSpec.instance.getIdSpec(), ComparisonType.EQUAL, postId.ToString())) > 0) { /* Post post = Post.LoadById(postId); if(post.title.StartsWith("%") || post.title.StartsWith("Re%3A") || post.body.StartsWith("%") || (post.thread.firstPost.id == post.id && post.thread.title.StartsWith("%"))) { @@ -206,7 +206,7 @@ namespace FLocal.ImportConsole { } else { Console.Write("-"); }*/ - Console.Write("-"); + System.Console.Write("-"); } else { int localMain = int.Parse(data["Local_Main"]); int main = int.Parse(data["Main"]); @@ -225,7 +225,7 @@ namespace FLocal.ImportConsole { try { user = User.LoadByName(username); } catch(NotFoundInDBException) { - Console.Error.WriteLine("Cannot find user '" + username + "'; creating one..."); + System.Console.Error.WriteLine("Cannot find user '" + username + "'; creating one..."); ChangeSetUtil.ApplyChanges( new InsertChange( User.TableSpec.instance, @@ -284,54 +284,54 @@ namespace FLocal.ImportConsole { post.Reply(user, title, body, layer, date, postId); } }; - Console.Write("+"); + System.Console.Write("+"); } } catch(Exception e) { - Console.Error.WriteLine("Cannot process post #" + postId + ": " + e.GetType().FullName + ": " + e.Message); - Console.Error.WriteLine(e.StackTrace); - Console.Write("!"); + System.Console.Error.WriteLine("Cannot process post #" + postId + ": " + e.GetType().FullName + ": " + e.Message); + System.Console.Error.WriteLine(e.StackTrace); + System.Console.Write("!"); // Console.ReadLine(); } finally { i++; if((i%50000)==0) { - Core.RegistryCleaner.CleanRegistry(); - Core.RegistryCleaner.CleanRegistry(); + Web.Core.RegistryCleaner.CleanRegistry(); + Web.Core.RegistryCleaner.CleanRegistry(); GC.Collect(); - Console.Error.WriteLine(); - Console.Error.WriteLine("Registry cleaned; garbage collected"); - Console.Error.WriteLine(); + System.Console.Error.WriteLine(); + System.Console.Error.WriteLine("Registry cleaned; garbage collected"); + System.Console.Error.WriteLine(); } } } } - Console.WriteLine("Finished parsing"); - Console.ReadLine(); + System.Console.WriteLine("Finished parsing"); + System.Console.ReadLine(); int j=0; foreach(var insert in inserts) { if(j%1000 == 0) { - Console.Write("[" + (int)(j/1000) + "]"); + System.Console.Write("[" + (int)(j/1000) + "]"); } try { insert.Value(); - Console.Write("+"); + System.Console.Write("+"); } catch(Exception e) { - Console.Error.WriteLine("Cannot process post #" + insert.Key + ": " + e.GetType().FullName + ": " + e.Message); - Console.Error.WriteLine(e.StackTrace); - Console.Write("!"); + System.Console.Error.WriteLine("Cannot process post #" + insert.Key + ": " + e.GetType().FullName + ": " + e.Message); + System.Console.Error.WriteLine(e.StackTrace); + System.Console.Write("!"); // Console.ReadLine(); } finally { j++; } } - Console.WriteLine("Not found discussions:"); + System.Console.WriteLine("Not found discussions:"); foreach(int discussionId in discussionsIds.OrderBy(id => id)) { - Console.WriteLine(discussionId); + System.Console.WriteLine(discussionId); } } catch(Exception e) { - Console.Error.WriteLine(e.GetType().FullName + ": " + e.Message); - Console.Error.WriteLine(e.StackTrace); + System.Console.Error.WriteLine(e.GetType().FullName + ": " + e.Message); + System.Console.Error.WriteLine(e.StackTrace); } } diff --git a/ImportConsole/ThreadedHTMLProcessor.cs b/ImportConsole/ThreadedHTMLProcessor.cs index fb1e421..b21c6ee 100644 --- a/ImportConsole/ThreadedHTMLProcessor.cs +++ b/ImportConsole/ThreadedHTMLProcessor.cs @@ -5,7 +5,7 @@ using System.Text; using System.IO; using System.Text.RegularExpressions; -namespace FLocal.ImportConsole { +namespace FLocal.Migration.Console { class ThreadedHTMLProcessor { private readonly static DateTime UNIX = new DateTime(1970, 1, 1, 0, 0, 0); @@ -43,7 +43,7 @@ namespace FLocal.ImportConsole { int i=0; foreach(FileSystemInfo _info in directoryInfo.GetFiles()) { if(i%100 == 0) { - Console.Write("[" + (int)(i/100) + "]"); + System.Console.Write("[" + (int)(i/100) + "]"); } if(!(_info is FileInfo)) continue; FileInfo info = (FileInfo)_info; @@ -59,7 +59,7 @@ namespace FLocal.ImportConsole { string contentPoster; int contentLayerId = 1; string contentBoard; - using(StreamReader reader = new StreamReader(info.FullName, Importer.ShallerGateway.encoding)) { + using(StreamReader reader = new StreamReader(info.FullName, FLocal.Migration.Gateway.ShallerGateway.encoding)) { string raw = reader.ReadToEnd(); if(raw.Contains("-CATJUMP-1")) { //full mode @@ -76,11 +76,11 @@ namespace FLocal.ImportConsole { if(endPos <= 0) { Match endBodyMatch = POST_ENDMARKER_FULL.Match(afterBegin); if(!endBodyMatch.Success) { - Console.WriteLine("afterBegin:"); - Console.WriteLine("==========================="); - Console.WriteLine(afterBegin); - Console.WriteLine("==========================="); - Console.WriteLine(POST_ENDMARKER_FULL.ToString()); + System.Console.WriteLine("afterBegin:"); + System.Console.WriteLine("==========================="); + System.Console.WriteLine(afterBegin); + System.Console.WriteLine("==========================="); + System.Console.WriteLine(POST_ENDMARKER_FULL.ToString()); throw new ApplicationException("cannot match body end"); } endPos = endBodyMatch.Index; @@ -300,7 +300,7 @@ namespace FLocal.ImportConsole { Console.WriteLine("Body: " + contentPost); Console.ReadLine();*/ writer.WriteLine( - Importer.DictionaryConverter.ToDump( + FLocal.Migration.Gateway.DictionaryConverter.ToDump( new Dictionary { { "Subject", contentTitle }, { "Board", contentBoard }, @@ -314,10 +314,10 @@ namespace FLocal.ImportConsole { } ) ); - Console.Write("+"); + System.Console.Write("+"); } catch(Exception e) { - Console.Error.WriteLine("Could not process post #" + postId + ": " + e.GetType().FullName + ": " + e.Message); - Console.Error.WriteLine(e.StackTrace); + System.Console.Error.WriteLine("Could not process post #" + postId + ": " + e.GetType().FullName + ": " + e.Message); + System.Console.Error.WriteLine(e.StackTrace); } finally { i++; } diff --git a/ImportConsole/UploadProcessor.cs b/ImportConsole/UploadProcessor.cs index f618d55..3444c29 100644 --- a/ImportConsole/UploadProcessor.cs +++ b/ImportConsole/UploadProcessor.cs @@ -3,11 +3,11 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.IO; -using FLocal.Core; +using Web.Core; using FLocal.Common; using FLocal.Common.dataobjects; -namespace FLocal.ImportConsole { +namespace FLocal.Migration.Console { class UploadProcessor { public static void ProcessUpload(string pathToUpload) { User uploader = User.LoadByName("Guest 127.0.0.1"); @@ -15,12 +15,12 @@ namespace FLocal.ImportConsole { int i=0; foreach(FileSystemInfo _info in directoryInfo.GetFiles()) { if(i%100 == 0) { - Console.Write("[" + (int)(i/100) + "]"); + System.Console.Write("[" + (int)(i/100) + "]"); } FileInfo info = _info as FileInfo; //Console.WriteLine("Processing " + info.FullName); if(!info.Name.StartsWith("file")) { - Console.Write("!"); + System.Console.Write("!"); } else { string[] parts = info.Name.Split('.'); if(parts.Length != 2) throw new FLocalException("wrong file name"); @@ -42,7 +42,7 @@ namespace FLocal.ImportConsole { if(info != null) { try { Upload.LoadById(id); - Console.Write("-"); + System.Console.Write("-"); } catch(NotFoundInDBException) { try { UploadManager.UploadFile( @@ -53,14 +53,14 @@ namespace FLocal.ImportConsole { id ); } catch(UploadManager.AlreadyUploadedException e) { - Console.WriteLine(id + " md5 is equal to that of " + e.uploadId); - Console.ReadLine(); + System.Console.WriteLine(id + " md5 is equal to that of " + e.uploadId); + System.Console.ReadLine(); } catch(Exception e) { - Console.WriteLine(e.GetType().FullName + ": " + e.Message); - Console.WriteLine(e.StackTrace); + System.Console.WriteLine(e.GetType().FullName + ": " + e.Message); + System.Console.WriteLine(e.StackTrace); throw; } - Console.Write("+"); + System.Console.Write("+"); //Console.WriteLine("Processed " + info.FullName); } } diff --git a/ImportConsole/UsersImporter.cs b/ImportConsole/UsersImporter.cs index 470a8ff..15e2c8a 100644 --- a/ImportConsole/UsersImporter.cs +++ b/ImportConsole/UsersImporter.cs @@ -2,24 +2,24 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using FLocal.Core; -using FLocal.Importer; +using Web.Core; +using FLocal.Migration.Gateway; using FLocal.Common; using FLocal.Common.dataobjects; using FLocal.Common.actions; -namespace FLocal.ImportConsole { +namespace FLocal.Migration.Console { class UsersImporter { public static void ImportUsers() { for(int i=1; i<800; i++) { - Console.Write("[" + i + "]"); + System.Console.Write("[" + i + "]"); foreach(string userName in ShallerGateway.getUserNames(i)) { User user; try { User.LoadByName(userName); - Console.Write("-"); + System.Console.Write("-"); } catch(NotFoundInDBException) { Dictionary userData = ShallerGateway.getUserInfo(userName); AbstractChange addUser = new InsertChange( @@ -56,7 +56,7 @@ namespace FLocal.ImportConsole { ChangeSetUtil.ApplyChanges(addUser, addAccount, addIndicator); user = User.LoadById(addUser.getId().Value); - Console.Write("."); + System.Console.Write("."); if(userData["avatar"] != null && userData["avatar"] != "") { Upload avatar; @@ -78,7 +78,7 @@ namespace FLocal.ImportConsole { user.id ) ); - Console.Write("a"); + System.Console.Write("a"); } } diff --git a/Importer/DictionaryConverter.cs b/Importer/DictionaryConverter.cs index d689577..47359d8 100644 --- a/Importer/DictionaryConverter.cs +++ b/Importer/DictionaryConverter.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Web; -namespace FLocal.Importer { +namespace FLocal.Migration.Gateway { public static class DictionaryConverter { public static string ToDump(Dictionary dict) { diff --git a/Importer/FileInfo.cs b/Importer/FileInfo.cs index 521bc22..3eaea62 100644 --- a/Importer/FileInfo.cs +++ b/Importer/FileInfo.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.IO; -namespace FLocal.Importer { +namespace FLocal.Migration.Gateway { public struct FileInfo { public Stream dataStream; diff --git a/Importer/Importer.csproj b/Importer/Importer.csproj index 4e32764..ed14ae9 100644 --- a/Importer/Importer.csproj +++ b/Importer/Importer.csproj @@ -8,7 +8,7 @@ {E2ECF86C-C0BA-4782-A485-E267BB213BB2} Library Properties - FLocal.Importer + FLocal.Migration.Gateway Importer v3.5 512 diff --git a/Importer/ShallerConnector.cs b/Importer/ShallerConnector.cs index 68f9c32..9a82084 100644 --- a/Importer/ShallerConnector.cs +++ b/Importer/ShallerConnector.cs @@ -7,7 +7,7 @@ using System.Net; using System.Configuration; using System.IO; -namespace FLocal.Importer { +namespace FLocal.Migration.Gateway { class ShallerConnector { public static readonly Encoding encoding = Encoding.GetEncoding(1251); diff --git a/Importer/ShallerGateway.cs b/Importer/ShallerGateway.cs index 93cec1d..1694913 100644 --- a/Importer/ShallerGateway.cs +++ b/Importer/ShallerGateway.cs @@ -7,7 +7,7 @@ using System.Net; using System.Web; using System.IO; -namespace FLocal.Importer { +namespace FLocal.Migration.Gateway { public class ShallerGateway { public static readonly Encoding encoding = ShallerConnector.encoding; diff --git a/MySQLConnector/ConditionCompiler.cs b/MySQLConnector/ConditionCompiler.cs index 820cfd0..2588d7b 100644 --- a/MySQLConnector/ConditionCompiler.cs +++ b/MySQLConnector/ConditionCompiler.cs @@ -2,10 +2,10 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using FLocal.Core.DB; -using FLocal.Core.DB.conditions; +using Web.Core.DB; +using Web.Core.DB.conditions; -namespace FLocal.MySQLConnector { +namespace MySQLConnector { class ConditionCompiler { private readonly ParamsHolder paramsholder; diff --git a/MySQLConnector/Connection.cs b/MySQLConnector/Connection.cs index 58c2684..46eaba0 100644 --- a/MySQLConnector/Connection.cs +++ b/MySQLConnector/Connection.cs @@ -3,10 +3,10 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Data.Common; -using FLocal.Core; -using FLocal.Core.DB; +using Web.Core; +using Web.Core.DB; -namespace FLocal.MySQLConnector { +namespace MySQLConnector { public class Connection : IDBConnection { @@ -85,7 +85,7 @@ namespace FLocal.MySQLConnector { } } - private List _LoadIdsByConditions(DbCommand command, ITableSpec table, FLocal.Core.DB.conditions.AbstractCondition conditions, Diapasone diapasone, JoinSpec[] joins, SortSpec[] sorts, bool allowHugeLists) { + private List _LoadIdsByConditions(DbCommand command, ITableSpec table, Web.Core.DB.conditions.AbstractCondition conditions, Diapasone diapasone, JoinSpec[] joins, SortSpec[] sorts, bool allowHugeLists) { command.CommandType = System.Data.CommandType.Text; var conditionsCompiled = ConditionCompiler.Compile(conditions, this.traits); @@ -158,7 +158,7 @@ namespace FLocal.MySQLConnector { } } - public List LoadIdsByConditions(ITableSpec table, FLocal.Core.DB.conditions.AbstractCondition conditions, Diapasone diapasone, JoinSpec[] joins, SortSpec[] sorts, bool allowHugeLists) { + public List LoadIdsByConditions(ITableSpec table, Web.Core.DB.conditions.AbstractCondition conditions, Diapasone diapasone, JoinSpec[] joins, SortSpec[] sorts, bool allowHugeLists) { using(DbConnection connection = this.createConnection()) { using(DbCommand command = connection.CreateCommand()) { return this._LoadIdsByConditions(command, table, conditions, diapasone, joins, sorts, allowHugeLists); @@ -166,7 +166,7 @@ namespace FLocal.MySQLConnector { } } - public long GetCountByConditions(ITableSpec table, FLocal.Core.DB.conditions.AbstractCondition conditions, params JoinSpec[] joins) { + public long GetCountByConditions(ITableSpec table, Web.Core.DB.conditions.AbstractCondition conditions, params JoinSpec[] joins) { using(DbConnection connection = this.createConnection()) { using(DbCommand command = connection.CreateCommand()) { @@ -196,7 +196,7 @@ namespace FLocal.MySQLConnector { } } - public FLocal.Core.DB.Transaction beginTransaction(System.Data.IsolationLevel iso) { + public Web.Core.DB.Transaction beginTransaction(System.Data.IsolationLevel iso) { lock(this) { Transaction transaction = new Transaction(this, iso); try { @@ -209,7 +209,7 @@ namespace FLocal.MySQLConnector { } } - public void lockTable(FLocal.Core.DB.Transaction _transaction, ITableSpec table) { + public void lockTable(Web.Core.DB.Transaction _transaction, ITableSpec table) { Transaction transaction = (Transaction)_transaction; lock(transaction) { using(DbCommand command = transaction.sqlconnection.CreateCommand()) { @@ -221,7 +221,7 @@ namespace FLocal.MySQLConnector { } } - public void lockRow(FLocal.Core.DB.Transaction _transaction, ITableSpec table, string id) { + public void lockRow(Web.Core.DB.Transaction _transaction, ITableSpec table, string id) { Transaction transaction = (Transaction)_transaction; lock(transaction) { using(DbCommand command = transaction.sqlconnection.CreateCommand()) { @@ -234,7 +234,7 @@ namespace FLocal.MySQLConnector { } } - public List> LoadByIds(FLocal.Core.DB.Transaction _transaction, ITableSpec table, List ids) { + public List> LoadByIds(Web.Core.DB.Transaction _transaction, ITableSpec table, List ids) { Transaction transaction = (Transaction)_transaction; lock(transaction) { using(DbCommand command = transaction.sqlconnection.CreateCommand()) { @@ -244,7 +244,7 @@ namespace FLocal.MySQLConnector { } } - public List LoadIdsByConditions(FLocal.Core.DB.Transaction _transaction, ITableSpec table, FLocal.Core.DB.conditions.AbstractCondition conditions, Diapasone diapasone, JoinSpec[] joins, SortSpec[] sorts, bool allowHugeLists) { + public List LoadIdsByConditions(Web.Core.DB.Transaction _transaction, ITableSpec table, Web.Core.DB.conditions.AbstractCondition conditions, Diapasone diapasone, JoinSpec[] joins, SortSpec[] sorts, bool allowHugeLists) { Transaction transaction = (Transaction)_transaction; lock(transaction) { using(DbCommand command = transaction.sqlconnection.CreateCommand()) { @@ -254,7 +254,7 @@ namespace FLocal.MySQLConnector { } } - public void update(FLocal.Core.DB.Transaction _transaction, ITableSpec table, string id, Dictionary data) { + public void update(Web.Core.DB.Transaction _transaction, ITableSpec table, string id, Dictionary data) { Transaction transaction = (Transaction)_transaction; lock(transaction) { using(DbCommand command = transaction.sqlconnection.CreateCommand()) { @@ -277,7 +277,7 @@ namespace FLocal.MySQLConnector { } } - public string insert(FLocal.Core.DB.Transaction _transaction, ITableSpec table, Dictionary data) { + public string insert(Web.Core.DB.Transaction _transaction, ITableSpec table, Dictionary data) { Transaction transaction = (Transaction)_transaction; lock(transaction) { using(DbCommand command = transaction.sqlconnection.CreateCommand()) { @@ -302,7 +302,7 @@ namespace FLocal.MySQLConnector { } } - public void delete(FLocal.Core.DB.Transaction _transaction, ITableSpec table, string id) { + public void delete(Web.Core.DB.Transaction _transaction, ITableSpec table, string id) { Transaction transaction = (Transaction)_transaction; lock(transaction) { using(DbCommand command = transaction.sqlconnection.CreateCommand()) { diff --git a/MySQLConnector/Extensions.cs b/MySQLConnector/Extensions.cs index 4066738..ca9c538 100644 --- a/MySQLConnector/Extensions.cs +++ b/MySQLConnector/Extensions.cs @@ -2,10 +2,10 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using FLocal.Core.DB; +using Web.Core.DB; using System.Data.Common; -namespace FLocal.MySQLConnector { +namespace MySQLConnector { static class Extensions { public static string compile(this ITableSpec table, IDBTraits traits) { diff --git a/MySQLConnector/IDBTraits.cs b/MySQLConnector/IDBTraits.cs index e1c4f64..0078d33 100644 --- a/MySQLConnector/IDBTraits.cs +++ b/MySQLConnector/IDBTraits.cs @@ -3,9 +3,9 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Data.Common; -using FLocal.Core.DB; +using Web.Core.DB; -namespace FLocal.MySQLConnector { +namespace MySQLConnector { public interface IDBTraits { DbConnection createConnection(string connectionString); diff --git a/MySQLConnector/MySQLConnector.csproj b/MySQLConnector/MySQLConnector.csproj index e9e78ce..2571c01 100644 --- a/MySQLConnector/MySQLConnector.csproj +++ b/MySQLConnector/MySQLConnector.csproj @@ -8,7 +8,7 @@ {E38DE5B1-F9C2-43BA-A5DF-0743ABD4DFC7} Library Properties - FLocal.MySQLConnector + MySQLConnector MySQLConnector v3.5 512 diff --git a/MySQLConnector/MySQLDBTraits.cs b/MySQLConnector/MySQLDBTraits.cs index 1fad495..f805909 100644 --- a/MySQLConnector/MySQLDBTraits.cs +++ b/MySQLConnector/MySQLDBTraits.cs @@ -4,9 +4,9 @@ using System.Linq; using System.Text; using System.Data.Common; //using MySql.Data.MySqlClient; -using FLocal.Core.DB; +using Web.Core.DB; -namespace FLocal.MySQLConnector { +namespace MySQLConnector { /* public class MySQLDBTraits : IDBTraits { diff --git a/MySQLConnector/ParamsHolder.cs b/MySQLConnector/ParamsHolder.cs index 08c9511..5951d1a 100644 --- a/MySQLConnector/ParamsHolder.cs +++ b/MySQLConnector/ParamsHolder.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; -namespace FLocal.MySQLConnector { +namespace MySQLConnector { class ParamsHolder { public Dictionary data = new Dictionary(); diff --git a/MySQLConnector/PostgresDBTraits.cs b/MySQLConnector/PostgresDBTraits.cs index 33400df..db31604 100644 --- a/MySQLConnector/PostgresDBTraits.cs +++ b/MySQLConnector/PostgresDBTraits.cs @@ -4,9 +4,9 @@ using System.Linq; using System.Text; using System.Data.Common; using Npgsql; -using FLocal.Core.DB; +using Web.Core.DB; -namespace FLocal.MySQLConnector { +namespace MySQLConnector { public class PostgresDBTraits : IDBTraits { public static readonly PostgresDBTraits instance = new PostgresDBTraits(); diff --git a/MySQLConnector/Transaction.cs b/MySQLConnector/Transaction.cs index 774d311..5a14d8f 100644 --- a/MySQLConnector/Transaction.cs +++ b/MySQLConnector/Transaction.cs @@ -2,11 +2,11 @@ using System.Collections.Generic; using System.Linq; using System.Text; -using FLocal.Core; +using Web.Core; using System.Data.Common; -namespace FLocal.MySQLConnector { - class Transaction : Core.DB.Transaction { +namespace MySQLConnector { + class Transaction : Web.Core.DB.Transaction { internal Connection connection; internal DbConnection sqlconnection; diff --git a/TexCompiler/Compiler.cs b/TexCompiler/Compiler.cs index e49ee30..38b19a6 100644 --- a/TexCompiler/Compiler.cs +++ b/TexCompiler/Compiler.cs @@ -6,7 +6,7 @@ using System.IO; using System.Net; using System.Web; -namespace FLocal.TexCompiler { +namespace TexCompiler { public static class Compiler { private static readonly Encoding ENCODING = Encoding.UTF8; diff --git a/TexCompiler/TexCompiler.csproj b/TexCompiler/TexCompiler.csproj index 025ba8b..02ba0db 100644 --- a/TexCompiler/TexCompiler.csproj +++ b/TexCompiler/TexCompiler.csproj @@ -8,7 +8,7 @@ {7D2A38F8-C42D-4F9F-AF64-1DDD5842C7EC} Library Properties - FLocal.TexCompiler + TexCompiler TexCompiler v3.5 512