From 87910dba4014ac67ba45ab4a5f7c50595437358d Mon Sep 17 00:00:00 2001 From: inga-lovinde <52715130+inga-lovinde@users.noreply.github.com> Date: Wed, 14 Jul 2010 06:48:11 +0000 Subject: [PATCH] Slight refactoring of AbstractGetHandler (and derived handlers); message preview implemented --- Builder/IISMainHandler/build.txt | 2 +- IISMainHandler/IISMainHandler.csproj | 1 + IISMainHandler/handlers/AbstractGetHandler.cs | 2 +- IISMainHandler/handlers/BoardHandler.cs | 2 +- IISMainHandler/handlers/BoardsHandler.cs | 2 +- IISMainHandler/handlers/PostHandler.cs | 2 +- IISMainHandler/handlers/RootHandler.cs | 2 +- IISMainHandler/handlers/ThreadHandler.cs | 2 +- IISMainHandler/handlers/WrongUrlHandler.cs | 2 +- .../request/AbstractNewMessageHandler.cs | 2 +- .../response/AbstractNewMessageHandler.cs | 27 ++++++++ .../response/ActiveAccountListHandler.cs | 2 +- .../handlers/response/AllPostsHandler.cs | 2 +- .../handlers/response/BoardAsThread.cs | 2 +- .../handlers/response/ConversationHandler.cs | 2 +- .../handlers/response/ConversationsHandler.cs | 2 +- .../handlers/response/CreatePollHandler.cs | 2 +- .../handlers/response/CreateThreadHandler.cs | 4 +- .../handlers/response/EditHandler.cs | 4 +- .../handlers/response/LoginHandler.cs | 2 +- .../response/MigrateAccountHandler.cs | 2 +- .../handlers/response/PMReplyHandler.cs | 4 +- .../handlers/response/PMReplyToPostHandler.cs | 4 +- .../handlers/response/PMSendHandler.cs | 4 +- .../handlers/response/PollHandler.cs | 2 +- .../handlers/response/RedirectGetHandler.cs | 2 +- .../handlers/response/ReplyHandler.cs | 4 +- .../handlers/response/SettingsHandler.cs | 2 +- .../handlers/response/UploadHandler.cs | 2 +- .../handlers/response/UploadListHandler.cs | 2 +- .../handlers/response/UploadNewHandler.cs | 2 +- .../handlers/response/UserInfoHandler.cs | 2 +- .../handlers/response/UserListHandler.cs | 2 +- .../response/UserPollsParticipatedHandler.cs | 2 +- .../handlers/response/UserPostsHandler.cs | 2 +- .../handlers/response/UserRepliesHandler.cs | 2 +- .../handlers/response/WhoIsOnlineHandler.cs | 2 +- .../response/maintenance/CleanCacheHandler.cs | 2 +- static/js/common.js | 9 +++ templates/Full/NewPoll.xslt | 1 - templates/Full/NewThread.xslt | 9 --- templates/Full/PMReply.xslt | 9 --- templates/Full/PMReplyToPost.xslt | 9 --- templates/Full/PMSend.xslt | 9 --- templates/Full/PostEdit.xslt | 9 --- templates/Full/PostReply.xslt | 9 --- templates/Full/elems/TextEditor.xslt | 68 ++++++++++++++++++- 47 files changed, 146 insertions(+), 98 deletions(-) create mode 100644 IISMainHandler/handlers/response/AbstractNewMessageHandler.cs diff --git a/Builder/IISMainHandler/build.txt b/Builder/IISMainHandler/build.txt index bbc7758..2e94716 100644 --- a/Builder/IISMainHandler/build.txt +++ b/Builder/IISMainHandler/build.txt @@ -1 +1 @@ -832 \ No newline at end of file +844 \ No newline at end of file diff --git a/IISMainHandler/IISMainHandler.csproj b/IISMainHandler/IISMainHandler.csproj index f3397b3..8a280f3 100644 --- a/IISMainHandler/IISMainHandler.csproj +++ b/IISMainHandler/IISMainHandler.csproj @@ -75,6 +75,7 @@ + diff --git a/IISMainHandler/handlers/AbstractGetHandler.cs b/IISMainHandler/handlers/AbstractGetHandler.cs index e16530f..8471d3d 100644 --- a/IISMainHandler/handlers/AbstractGetHandler.cs +++ b/IISMainHandler/handlers/AbstractGetHandler.cs @@ -12,7 +12,7 @@ namespace FLocal.IISHandler.handlers { get; } - abstract protected XElement[] getSpecificData(WebContext context); + abstract protected IEnumerable getSpecificData(WebContext context); private XDocument getData(WebContext context) { return new XDocument( diff --git a/IISMainHandler/handlers/BoardHandler.cs b/IISMainHandler/handlers/BoardHandler.cs index 3692550..668e1c7 100644 --- a/IISMainHandler/handlers/BoardHandler.cs +++ b/IISMainHandler/handlers/BoardHandler.cs @@ -19,7 +19,7 @@ namespace FLocal.IISHandler.handlers { } } - override protected XElement[] getSpecificData(WebContext context) { + override protected IEnumerable getSpecificData(WebContext context) { Board board = Board.LoadById(int.Parse(context.requestParts[1])); PageOuter pageOuter = PageOuter.createFromGet(context.requestParts, context.userSettings.threadsPerPage, 2); IEnumerable threads = board.getThreads(pageOuter); diff --git a/IISMainHandler/handlers/BoardsHandler.cs b/IISMainHandler/handlers/BoardsHandler.cs index 5b04cd2..aba4e20 100644 --- a/IISMainHandler/handlers/BoardsHandler.cs +++ b/IISMainHandler/handlers/BoardsHandler.cs @@ -20,7 +20,7 @@ namespace FLocal.IISHandler.handlers { } } - override protected XElement[] getSpecificData(WebContext context) { + override protected IEnumerable getSpecificData(WebContext context) { return new XElement[] { new XElement("categories", from category in Category.allCategories select category.exportToXmlForMainPage(context)), new XElement("totalRegistered", Config.instance.mainConnection.GetCountByConditions(User.TableSpec.instance, new EmptyCondition())), diff --git a/IISMainHandler/handlers/PostHandler.cs b/IISMainHandler/handlers/PostHandler.cs index 510399a..d639576 100644 --- a/IISMainHandler/handlers/PostHandler.cs +++ b/IISMainHandler/handlers/PostHandler.cs @@ -18,7 +18,7 @@ namespace FLocal.IISHandler.handlers { } } - override protected XElement[] getSpecificData(WebContext context) { + override protected IEnumerable getSpecificData(WebContext context) { Post post = Post.LoadById(int.Parse(context.requestParts[1])); int lastReadId = 0; diff --git a/IISMainHandler/handlers/RootHandler.cs b/IISMainHandler/handlers/RootHandler.cs index de18056..8425ea9 100644 --- a/IISMainHandler/handlers/RootHandler.cs +++ b/IISMainHandler/handlers/RootHandler.cs @@ -15,7 +15,7 @@ namespace FLocal.IISHandler.handlers { } } - override protected XElement[] getSpecificData(WebContext context) { + override protected IEnumerable getSpecificData(WebContext context) { return new XElement[0]; } diff --git a/IISMainHandler/handlers/ThreadHandler.cs b/IISMainHandler/handlers/ThreadHandler.cs index 65d57ee..bd624c7 100644 --- a/IISMainHandler/handlers/ThreadHandler.cs +++ b/IISMainHandler/handlers/ThreadHandler.cs @@ -20,7 +20,7 @@ namespace FLocal.IISHandler.handlers { } } - override protected XElement[] getSpecificData(WebContext context) { + override protected IEnumerable getSpecificData(WebContext context) { Thread thread = Thread.LoadById(int.Parse(context.requestParts[1])); PageOuter pageOuter = PageOuter.createFromGet( context.requestParts, diff --git a/IISMainHandler/handlers/WrongUrlHandler.cs b/IISMainHandler/handlers/WrongUrlHandler.cs index b73338a..4336a8e 100644 --- a/IISMainHandler/handlers/WrongUrlHandler.cs +++ b/IISMainHandler/handlers/WrongUrlHandler.cs @@ -14,7 +14,7 @@ namespace FLocal.IISHandler.handlers { } } - protected override XElement[] getSpecificData(WebContext context) { + protected override IEnumerable getSpecificData(WebContext context) { return new XElement[] { new XElement("path", context.httprequest.Path) }; diff --git a/IISMainHandler/handlers/request/AbstractNewMessageHandler.cs b/IISMainHandler/handlers/request/AbstractNewMessageHandler.cs index 35dcc6c..5ecad17 100644 --- a/IISMainHandler/handlers/request/AbstractNewMessageHandler.cs +++ b/IISMainHandler/handlers/request/AbstractNewMessageHandler.cs @@ -25,7 +25,7 @@ namespace FLocal.IISHandler.handlers.request { } protected string getBody(WebContext context) { - string body = context.httprequest.Form["body"].Trim(); + string body = context.httprequest.Form["Body"].Trim(); if(body == "") { throw new FLocalException("Body is empty"); } diff --git a/IISMainHandler/handlers/response/AbstractNewMessageHandler.cs b/IISMainHandler/handlers/response/AbstractNewMessageHandler.cs new file mode 100644 index 0000000..9d11302 --- /dev/null +++ b/IISMainHandler/handlers/response/AbstractNewMessageHandler.cs @@ -0,0 +1,27 @@ +п»їusing System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Xml.Linq; +using FLocal.Core; +using FLocal.Common; + +namespace FLocal.IISHandler.handlers.response { + abstract class AbstractNewMessageHandler : AbstractGetHandler { + + abstract protected IEnumerable getSpecificNewMessageData(WebContext context); + + protected override IEnumerable getSpecificData(WebContext context) { + var result = new List(); + if(context.httprequest.Form.AllKeys.Contains("title")) { + result.Add(new XElement("title", context.httprequest.Form["title"])); + } + if(context.httprequest.Form.AllKeys.Contains("Body")) { + result.Add(new XElement("bodyUBB", context.httprequest.Form["Body"])); + result.Add(new XElement("bodyIntermediate", context.outputParams.preprocessBodyIntermediate(UBBParser.UBBToIntermediate(context.httprequest.Form["Body"])))); + } + return result.Union(this.getSpecificNewMessageData(context)); + } + + } +} diff --git a/IISMainHandler/handlers/response/ActiveAccountListHandler.cs b/IISMainHandler/handlers/response/ActiveAccountListHandler.cs index 8c92f9d..9698de7 100644 --- a/IISMainHandler/handlers/response/ActiveAccountListHandler.cs +++ b/IISMainHandler/handlers/response/ActiveAccountListHandler.cs @@ -19,7 +19,7 @@ namespace FLocal.IISHandler.handlers.response { } } - override protected XElement[] getSpecificData(WebContext context) { + override protected IEnumerable getSpecificData(WebContext context) { //PageOuter pageOuter = PageOuter.createFromGet(context.requestParts, context.userSettings.usersPerPage, 1); PageOuter pageOuter = PageOuter.createUnlimited(context.userSettings.usersPerPage); IEnumerable accounts = Account.LoadByIds( diff --git a/IISMainHandler/handlers/response/AllPostsHandler.cs b/IISMainHandler/handlers/response/AllPostsHandler.cs index 50ffab3..eb1b321 100644 --- a/IISMainHandler/handlers/response/AllPostsHandler.cs +++ b/IISMainHandler/handlers/response/AllPostsHandler.cs @@ -20,7 +20,7 @@ namespace FLocal.IISHandler.handlers.response { } } - override protected XElement[] getSpecificData(WebContext context) { + override protected IEnumerable getSpecificData(WebContext context) { PageOuter pageOuter = PageOuter.createFromGet( context.requestParts, context.userSettings.postsPerPage, diff --git a/IISMainHandler/handlers/response/BoardAsThread.cs b/IISMainHandler/handlers/response/BoardAsThread.cs index 7651fc7..e9e45ff 100644 --- a/IISMainHandler/handlers/response/BoardAsThread.cs +++ b/IISMainHandler/handlers/response/BoardAsThread.cs @@ -18,7 +18,7 @@ namespace FLocal.IISHandler.handlers.response { } } - override protected XElement[] getSpecificData(WebContext context) { + override protected IEnumerable getSpecificData(WebContext context) { Board board = Board.LoadById(int.Parse(context.requestParts[1])); PageOuter pageOuter = PageOuter.createFromGet(context.requestParts, context.userSettings.postsPerPage, 2); IEnumerable threads = board.getThreads( diff --git a/IISMainHandler/handlers/response/ConversationHandler.cs b/IISMainHandler/handlers/response/ConversationHandler.cs index cf7714d..50d8cae 100644 --- a/IISMainHandler/handlers/response/ConversationHandler.cs +++ b/IISMainHandler/handlers/response/ConversationHandler.cs @@ -20,7 +20,7 @@ namespace FLocal.IISHandler.handlers.response { } } - override protected XElement[] getSpecificData(WebContext context) { + override protected IEnumerable getSpecificData(WebContext context) { Account interlocutor = Account.LoadById(int.Parse(context.requestParts[1])); PMConversation conversation = PMConversation.LoadByAccounts(context.session.account, interlocutor); PageOuter pageOuter = PageOuter.createFromGet( diff --git a/IISMainHandler/handlers/response/ConversationsHandler.cs b/IISMainHandler/handlers/response/ConversationsHandler.cs index aa4fef1..980858a 100644 --- a/IISMainHandler/handlers/response/ConversationsHandler.cs +++ b/IISMainHandler/handlers/response/ConversationsHandler.cs @@ -19,7 +19,7 @@ namespace FLocal.IISHandler.handlers.response { } } - override protected XElement[] getSpecificData(WebContext context) { + override protected IEnumerable getSpecificData(WebContext context) { PageOuter pageOuter = PageOuter.createFromGet(context.requestParts, context.userSettings.threadsPerPage, 1); IEnumerable conversations = PMConversation.getConversations(context.session.account, pageOuter); XElement[] result = new XElement[] { diff --git a/IISMainHandler/handlers/response/CreatePollHandler.cs b/IISMainHandler/handlers/response/CreatePollHandler.cs index 192fdb3..dcc1888 100644 --- a/IISMainHandler/handlers/response/CreatePollHandler.cs +++ b/IISMainHandler/handlers/response/CreatePollHandler.cs @@ -18,7 +18,7 @@ namespace FLocal.IISHandler.handlers.response { } } - override protected XElement[] getSpecificData(WebContext context) { + override protected IEnumerable getSpecificData(WebContext context) { return new XElement[] { }; } diff --git a/IISMainHandler/handlers/response/CreateThreadHandler.cs b/IISMainHandler/handlers/response/CreateThreadHandler.cs index 485bc48..ad1ebcb 100644 --- a/IISMainHandler/handlers/response/CreateThreadHandler.cs +++ b/IISMainHandler/handlers/response/CreateThreadHandler.cs @@ -10,7 +10,7 @@ using FLocal.Common.dataobjects; namespace FLocal.IISHandler.handlers.response { - class CreateThreadHandler : AbstractGetHandler { + class CreateThreadHandler : AbstractNewMessageHandler { override protected string templateName { get { @@ -18,7 +18,7 @@ namespace FLocal.IISHandler.handlers.response { } } - override protected XElement[] getSpecificData(WebContext context) { + override protected IEnumerable getSpecificNewMessageData(WebContext context) { Board board = Board.LoadById(int.Parse(context.requestParts[1])); return new XElement[] { diff --git a/IISMainHandler/handlers/response/EditHandler.cs b/IISMainHandler/handlers/response/EditHandler.cs index ee9520f..4ed7b0b 100644 --- a/IISMainHandler/handlers/response/EditHandler.cs +++ b/IISMainHandler/handlers/response/EditHandler.cs @@ -10,7 +10,7 @@ using FLocal.Common.dataobjects; namespace FLocal.IISHandler.handlers.response { - class EditHandler : AbstractGetHandler { + class EditHandler : AbstractNewMessageHandler { override protected string templateName { get { @@ -18,7 +18,7 @@ namespace FLocal.IISHandler.handlers.response { } } - override protected XElement[] getSpecificData(WebContext context) { + override protected IEnumerable getSpecificNewMessageData(WebContext context) { Post post = Post.LoadById(int.Parse(context.requestParts[1])); return new XElement[] { diff --git a/IISMainHandler/handlers/response/LoginHandler.cs b/IISMainHandler/handlers/response/LoginHandler.cs index 277c96f..ea9d6a2 100644 --- a/IISMainHandler/handlers/response/LoginHandler.cs +++ b/IISMainHandler/handlers/response/LoginHandler.cs @@ -16,7 +16,7 @@ namespace FLocal.IISHandler.handlers.response { } } - protected override System.Xml.Linq.XElement[] getSpecificData(WebContext context) { + protected override IEnumerable getSpecificData(WebContext context) { return new XElement[0]; } diff --git a/IISMainHandler/handlers/response/MigrateAccountHandler.cs b/IISMainHandler/handlers/response/MigrateAccountHandler.cs index 36b4971..0b09312 100644 --- a/IISMainHandler/handlers/response/MigrateAccountHandler.cs +++ b/IISMainHandler/handlers/response/MigrateAccountHandler.cs @@ -16,7 +16,7 @@ namespace FLocal.IISHandler.handlers.response { } } - protected override System.Xml.Linq.XElement[] getSpecificData(WebContext context) { + protected override IEnumerable getSpecificData(WebContext context) { string username; if(context.httprequest.Form["username"] != null && context.httprequest.Form["username"] != "") { username = context.httprequest.Form["username"]; diff --git a/IISMainHandler/handlers/response/PMReplyHandler.cs b/IISMainHandler/handlers/response/PMReplyHandler.cs index af8156f..ad85ee1 100644 --- a/IISMainHandler/handlers/response/PMReplyHandler.cs +++ b/IISMainHandler/handlers/response/PMReplyHandler.cs @@ -10,7 +10,7 @@ using FLocal.Common.dataobjects; namespace FLocal.IISHandler.handlers.response { - class PMReplyHandler : AbstractGetHandler { + class PMReplyHandler : AbstractNewMessageHandler { override protected string templateName { get { @@ -18,7 +18,7 @@ namespace FLocal.IISHandler.handlers.response { } } - override protected XElement[] getSpecificData(WebContext context) { + override protected IEnumerable getSpecificNewMessageData(WebContext context) { PMMessage message = PMMessage.LoadById(int.Parse(context.requestParts[1])); return new XElement[] { diff --git a/IISMainHandler/handlers/response/PMReplyToPostHandler.cs b/IISMainHandler/handlers/response/PMReplyToPostHandler.cs index ca8a865..f87d5f3 100644 --- a/IISMainHandler/handlers/response/PMReplyToPostHandler.cs +++ b/IISMainHandler/handlers/response/PMReplyToPostHandler.cs @@ -10,7 +10,7 @@ using FLocal.Common.dataobjects; namespace FLocal.IISHandler.handlers.response { - class PMReplyToPostHandler : AbstractGetHandler { + class PMReplyToPostHandler : AbstractNewMessageHandler { override protected string templateName { get { @@ -18,7 +18,7 @@ namespace FLocal.IISHandler.handlers.response { } } - override protected XElement[] getSpecificData(WebContext context) { + override protected IEnumerable getSpecificNewMessageData(WebContext context) { Post post = Post.LoadById(int.Parse(context.requestParts[1])); diff --git a/IISMainHandler/handlers/response/PMSendHandler.cs b/IISMainHandler/handlers/response/PMSendHandler.cs index 6bca473..a1d2b60 100644 --- a/IISMainHandler/handlers/response/PMSendHandler.cs +++ b/IISMainHandler/handlers/response/PMSendHandler.cs @@ -10,7 +10,7 @@ using FLocal.Common.dataobjects; namespace FLocal.IISHandler.handlers.response { - class PMSendHandler : AbstractGetHandler { + class PMSendHandler : AbstractNewMessageHandler { override protected string templateName { get { @@ -18,7 +18,7 @@ namespace FLocal.IISHandler.handlers.response { } } - override protected XElement[] getSpecificData(WebContext context) { + override protected IEnumerable getSpecificNewMessageData(WebContext context) { if(context.requestParts.Length > 1) { Account account = Account.LoadById(int.Parse(context.requestParts[1])); return new XElement[] { diff --git a/IISMainHandler/handlers/response/PollHandler.cs b/IISMainHandler/handlers/response/PollHandler.cs index c4a15cd..151a564 100644 --- a/IISMainHandler/handlers/response/PollHandler.cs +++ b/IISMainHandler/handlers/response/PollHandler.cs @@ -20,7 +20,7 @@ namespace FLocal.IISHandler.handlers.response { } } - override protected XElement[] getSpecificData(WebContext context) { + override protected IEnumerable getSpecificData(WebContext context) { Poll poll = Poll.LoadById(int.Parse(context.requestParts[1])); return new XElement[] { poll.exportToXmlWithVotes(context) diff --git a/IISMainHandler/handlers/response/RedirectGetHandler.cs b/IISMainHandler/handlers/response/RedirectGetHandler.cs index 1031747..295578d 100644 --- a/IISMainHandler/handlers/response/RedirectGetHandler.cs +++ b/IISMainHandler/handlers/response/RedirectGetHandler.cs @@ -15,7 +15,7 @@ namespace FLocal.IISHandler.handlers.response { abstract protected string getRedirectUrl(WebContext context); - protected override XElement[] getSpecificData(WebContext context) { + protected override IEnumerable getSpecificData(WebContext context) { throw new RedirectException(this.getRedirectUrl(context)); } diff --git a/IISMainHandler/handlers/response/ReplyHandler.cs b/IISMainHandler/handlers/response/ReplyHandler.cs index 61972dc..d004f53 100644 --- a/IISMainHandler/handlers/response/ReplyHandler.cs +++ b/IISMainHandler/handlers/response/ReplyHandler.cs @@ -10,7 +10,7 @@ using FLocal.Common.dataobjects; namespace FLocal.IISHandler.handlers.response { - class ReplyHandler : AbstractGetHandler { + class ReplyHandler : AbstractNewMessageHandler { override protected string templateName { get { @@ -18,7 +18,7 @@ namespace FLocal.IISHandler.handlers.response { } } - override protected XElement[] getSpecificData(WebContext context) { + override protected IEnumerable getSpecificNewMessageData(WebContext context) { Post post = Post.LoadById(int.Parse(context.requestParts[1])); diff --git a/IISMainHandler/handlers/response/SettingsHandler.cs b/IISMainHandler/handlers/response/SettingsHandler.cs index 08b693d..06981a6 100644 --- a/IISMainHandler/handlers/response/SettingsHandler.cs +++ b/IISMainHandler/handlers/response/SettingsHandler.cs @@ -18,7 +18,7 @@ namespace FLocal.IISHandler.handlers.response { } } - override protected XElement[] getSpecificData(WebContext context) { + override protected IEnumerable getSpecificData(WebContext context) { IUserSettings settings = AccountSettings.LoadByAccount(context.session.account); return new XElement[] { diff --git a/IISMainHandler/handlers/response/UploadHandler.cs b/IISMainHandler/handlers/response/UploadHandler.cs index 7edb6c3..1de3cc8 100644 --- a/IISMainHandler/handlers/response/UploadHandler.cs +++ b/IISMainHandler/handlers/response/UploadHandler.cs @@ -18,7 +18,7 @@ namespace FLocal.IISHandler.handlers.response { } } - protected override System.Xml.Linq.XElement[] getSpecificData(WebContext context) { + protected override IEnumerable getSpecificData(WebContext context) { Upload upload = Upload.LoadById(int.Parse(context.requestParts[2])); throw new RedirectException(Config.instance.UploaderUrl + "Data/" + upload.hash + "." + upload.extension); } diff --git a/IISMainHandler/handlers/response/UploadListHandler.cs b/IISMainHandler/handlers/response/UploadListHandler.cs index 7a82a24..1b89821 100644 --- a/IISMainHandler/handlers/response/UploadListHandler.cs +++ b/IISMainHandler/handlers/response/UploadListHandler.cs @@ -18,7 +18,7 @@ namespace FLocal.IISHandler.handlers.response { } } - protected override System.Xml.Linq.XElement[] getSpecificData(WebContext context) { + protected override IEnumerable getSpecificData(WebContext context) { if(context.session == null) throw new AccessViolationException(); PageOuter pageOuter = PageOuter.createFromGet(context.requestParts, context.userSettings.uploadsPerPage, 2); List uploads = Upload.LoadByIds( diff --git a/IISMainHandler/handlers/response/UploadNewHandler.cs b/IISMainHandler/handlers/response/UploadNewHandler.cs index 1b462e0..d4b4a04 100644 --- a/IISMainHandler/handlers/response/UploadNewHandler.cs +++ b/IISMainHandler/handlers/response/UploadNewHandler.cs @@ -18,7 +18,7 @@ namespace FLocal.IISHandler.handlers.response { } } - protected override System.Xml.Linq.XElement[] getSpecificData(WebContext context) { + protected override IEnumerable getSpecificData(WebContext context) { return new XElement[0]; } diff --git a/IISMainHandler/handlers/response/UserInfoHandler.cs b/IISMainHandler/handlers/response/UserInfoHandler.cs index e75ce42..21d0532 100644 --- a/IISMainHandler/handlers/response/UserInfoHandler.cs +++ b/IISMainHandler/handlers/response/UserInfoHandler.cs @@ -20,7 +20,7 @@ namespace FLocal.IISHandler.handlers.response { } } - override protected XElement[] getSpecificData(WebContext context) { + override protected IEnumerable getSpecificData(WebContext context) { User user = User.LoadById(int.Parse(context.requestParts[1])); Account account = null; if(context.session != null) { diff --git a/IISMainHandler/handlers/response/UserListHandler.cs b/IISMainHandler/handlers/response/UserListHandler.cs index d9ac2e1..f857c31 100644 --- a/IISMainHandler/handlers/response/UserListHandler.cs +++ b/IISMainHandler/handlers/response/UserListHandler.cs @@ -18,7 +18,7 @@ namespace FLocal.IISHandler.handlers.response { } } - override protected XElement[] getSpecificData(WebContext context) { + override protected IEnumerable getSpecificData(WebContext context) { PageOuter pageOuter = PageOuter.createFromGet(context.requestParts, context.userSettings.usersPerPage, 1); IEnumerable users = User.getUsers(pageOuter); return new XElement[] { diff --git a/IISMainHandler/handlers/response/UserPollsParticipatedHandler.cs b/IISMainHandler/handlers/response/UserPollsParticipatedHandler.cs index 30da945..a3bd954 100644 --- a/IISMainHandler/handlers/response/UserPollsParticipatedHandler.cs +++ b/IISMainHandler/handlers/response/UserPollsParticipatedHandler.cs @@ -20,7 +20,7 @@ namespace FLocal.IISHandler.handlers.response { } } - override protected XElement[] getSpecificData(WebContext context) { + override protected IEnumerable getSpecificData(WebContext context) { User user = User.LoadById(int.Parse(context.requestParts[1])); PageOuter pageOuter = PageOuter.createFromGet( context.requestParts, diff --git a/IISMainHandler/handlers/response/UserPostsHandler.cs b/IISMainHandler/handlers/response/UserPostsHandler.cs index 7144ec1..be48c42 100644 --- a/IISMainHandler/handlers/response/UserPostsHandler.cs +++ b/IISMainHandler/handlers/response/UserPostsHandler.cs @@ -20,7 +20,7 @@ namespace FLocal.IISHandler.handlers.response { } } - override protected XElement[] getSpecificData(WebContext context) { + override protected IEnumerable getSpecificData(WebContext context) { User user = User.LoadById(int.Parse(context.requestParts[1])); PageOuter pageOuter = PageOuter.createFromGet( context.requestParts, diff --git a/IISMainHandler/handlers/response/UserRepliesHandler.cs b/IISMainHandler/handlers/response/UserRepliesHandler.cs index c6995be..da97acd 100644 --- a/IISMainHandler/handlers/response/UserRepliesHandler.cs +++ b/IISMainHandler/handlers/response/UserRepliesHandler.cs @@ -20,7 +20,7 @@ namespace FLocal.IISHandler.handlers.response { } } - override protected XElement[] getSpecificData(WebContext context) { + override protected IEnumerable getSpecificData(WebContext context) { User user = User.LoadById(int.Parse(context.requestParts[1])); PageOuter pageOuter = PageOuter.createFromGet( context.requestParts, diff --git a/IISMainHandler/handlers/response/WhoIsOnlineHandler.cs b/IISMainHandler/handlers/response/WhoIsOnlineHandler.cs index 5aef4a3..0bd5608 100644 --- a/IISMainHandler/handlers/response/WhoIsOnlineHandler.cs +++ b/IISMainHandler/handlers/response/WhoIsOnlineHandler.cs @@ -20,7 +20,7 @@ namespace FLocal.IISHandler.handlers.response { } } - override protected XElement[] getSpecificData(WebContext context) { + override protected IEnumerable getSpecificData(WebContext context) { PageOuter pageOuter = PageOuter.createUnlimited(context.userSettings.usersPerPage); IEnumerable sessions = from stringId in Config.instance.mainConnection.LoadIdsByConditions( diff --git a/IISMainHandler/handlers/response/maintenance/CleanCacheHandler.cs b/IISMainHandler/handlers/response/maintenance/CleanCacheHandler.cs index 8990626..21837c8 100644 --- a/IISMainHandler/handlers/response/maintenance/CleanCacheHandler.cs +++ b/IISMainHandler/handlers/response/maintenance/CleanCacheHandler.cs @@ -18,7 +18,7 @@ namespace FLocal.IISHandler.handlers.response.maintenance { } } - override protected XElement[] getSpecificData(WebContext context) { + override protected IEnumerable getSpecificData(WebContext context) { return new XElement[] { new XElement( "tables", diff --git a/static/js/common.js b/static/js/common.js index 4ab2e71..aa8e5d4 100644 --- a/static/js/common.js +++ b/static/js/common.js @@ -52,3 +52,12 @@ function submitSelText(url) { document.getElementById("systemForm").action = url; document.getElementById("systemForm").submit(); } + +function changeActionToSelf(elem) { + if(elem.checked) { + elem.form.newAction = elem.form.action; + elem.form.action = ""; + } else { + elem.form.action = elem.form.newAction; + } +} \ No newline at end of file diff --git a/templates/Full/NewPoll.xslt b/templates/Full/NewPoll.xslt index 1b1f698..e343487 100644 --- a/templates/Full/NewPoll.xslt +++ b/templates/Full/NewPoll.xslt @@ -1,7 +1,6 @@ - Новый опорос diff --git a/templates/Full/NewThread.xslt b/templates/Full/NewThread.xslt index a905b09..31b6a77 100644 --- a/templates/Full/NewThread.xslt +++ b/templates/Full/NewThread.xslt @@ -45,15 +45,6 @@

-
- - Я хочу предварительно просмотреть сообщение перед отправкой -
-
- - Проверить правописание -
-
diff --git a/templates/Full/PMReply.xslt b/templates/Full/PMReply.xslt index 5b9f98e..6a0c196 100644 --- a/templates/Full/PMReply.xslt +++ b/templates/Full/PMReply.xslt @@ -58,15 +58,6 @@ -
- - Я хочу предварительно просмотреть сообщение перед отправкой -
-
- - Проверить правописание -
-
diff --git a/templates/Full/PMReplyToPost.xslt b/templates/Full/PMReplyToPost.xslt index 11b5529..5adee64 100644 --- a/templates/Full/PMReplyToPost.xslt +++ b/templates/Full/PMReplyToPost.xslt @@ -63,15 +63,6 @@ -
- - Я хочу предварительно просмотреть сообщение перед отправкой -
-
- - Проверить правописание -
-
diff --git a/templates/Full/PMSend.xslt b/templates/Full/PMSend.xslt index 49860f0..dc1075d 100644 --- a/templates/Full/PMSend.xslt +++ b/templates/Full/PMSend.xslt @@ -44,15 +44,6 @@

-
- - Я хочу предварительно просмотреть сообщение перед отправкой -
-
- - Проверить правописание -
-
diff --git a/templates/Full/PostEdit.xslt b/templates/Full/PostEdit.xslt index 2f4e15c..0d41524 100644 --- a/templates/Full/PostEdit.xslt +++ b/templates/Full/PostEdit.xslt @@ -49,15 +49,6 @@ -
- - Я хочу предварительно просмотреть сообщение перед отправкой -
-
- - Проверить правописание -
-
diff --git a/templates/Full/PostReply.xslt b/templates/Full/PostReply.xslt index d34233e..8119fdc 100644 --- a/templates/Full/PostReply.xslt +++ b/templates/Full/PostReply.xslt @@ -66,15 +66,6 @@ -
- - Я хочу предварительно просмотреть сообщение перед отправкой -
-
- - Проверить правописание -
-
diff --git a/templates/Full/elems/TextEditor.xslt b/templates/Full/elems/TextEditor.xslt index 30c5aee..6b90a96 100644 --- a/templates/Full/elems/TextEditor.xslt +++ b/templates/Full/elems/TextEditor.xslt @@ -1,6 +1,8 @@ + + @@ -10,7 +12,14 @@ storeCaret(this); storeCaret(this); checkKeyPressed(document.replier,event,false); - + + + + + + + +

@@ -244,6 +253,63 @@ function insertInBody(str) { + +
+ + Я хочу предварительно просмотреть сообщение перед отправкой + +
+ + + + + + + + +
+ + + + + + +
+ + + /static/images/message-normal-read.gif + + + +
+ +
+
+ + + + + + + + + +
+
+ + +
+
+ +
+
+
+
+
+
+ +
+