diff --git a/Builder/IISMainHandler/build.txt b/Builder/IISMainHandler/build.txt index 9ce16c5..f0acb59 100644 --- a/Builder/IISMainHandler/build.txt +++ b/Builder/IISMainHandler/build.txt @@ -1 +1 @@ -1058 \ No newline at end of file +1071 \ No newline at end of file diff --git a/Common/BBCodes/User.cs b/Common/BBCodes/User.cs index 239dde4..d1b3cdf 100644 --- a/Common/BBCodes/User.cs +++ b/Common/BBCodes/User.cs @@ -13,7 +13,7 @@ namespace FLocal.Common.BBCodes { public override string Format(ITextFormatter formatter) { var user = dataobjects.User.LoadByName(this.Default); - return String.Format("{2}", this.Safe(user.userGroup.name), user.id, this.Safe(user.name)); + return String.Format("{2}", this.Safe(user.userGroup.name), user.id, this.Safe(user.name)); } } diff --git a/IISMainHandler/HandlersFactory.cs b/IISMainHandler/HandlersFactory.cs index 4f1fda3..e8a8bdd 100644 --- a/IISMainHandler/HandlersFactory.cs +++ b/IISMainHandler/HandlersFactory.cs @@ -76,12 +76,48 @@ namespace FLocal.IISHandler { default: return new handlers.WrongUrlHandler(); } - case "login": - return new handlers.response.LoginHandler(); - case "migrateaccount": - return new handlers.response.MigrateAccountHandler(); - case "registerbyinvite": - return new handlers.response.RegisterByInviteHandler(); + case "my": + if(context.requestParts.Length == 1) { + if(context.account != null) { + throw new RedirectException("/My/Conversations/"); + } else { + throw new RedirectException("/My/Login/"); + } + } + switch(context.requestParts[1].ToLower()) { + case "login": + if(context.requestParts.Length == 2) { + return new handlers.response.LoginHandler(); + } else { + switch(context.requestParts[2].ToLower()) { + case "migrateaccount": + return new handlers.response.MigrateAccountHandler(); + case "registerbyinvite": + return new handlers.response.RegisterByInviteHandler(); + default: + return new handlers.WrongUrlHandler(); + } + } + case "settings": + return new handlers.response.SettingsHandler(); + case "conversations": + if(context.requestParts.Length == 2) { + return new handlers.response.ConversationsHandler(); + } else { + switch(context.requestParts[2].ToLower()) { + case "conversation": + return new handlers.response.ConversationHandler(); + case "pmsend": + return new handlers.response.PMSendHandler(); + case "pmreply": + return new handlers.response.PMReplyHandler(); + default: + return new handlers.response.ConversationsHandler(); + } + } + default: + return new handlers.WrongUrlHandler(); + } case "users": if(context.requestParts.Length == 1) { throw new RedirectException("/Users/All/"); @@ -93,39 +129,29 @@ namespace FLocal.IISHandler { return new handlers.response.ActiveAccountListHandler(); case "online": return new handlers.response.WhoIsOnlineHandler(); + case "user": + if(context.requestParts.Length < 3) { + return new handlers.WrongUrlHandler(); + } + if(context.requestParts.Length == 3) { + return new handlers.response.UserInfoHandler(); + } + switch(context.requestParts[3].ToLower()) { + case "posts": + return new handlers.response.UserPostsHandler(); + case "replies": + return new handlers.response.UserRepliesHandler(); + case "pollsparticipated": + return new handlers.response.UserPollsParticipatedHandler(); + default: + return new handlers.WrongUrlHandler(); + } default: return new handlers.WrongUrlHandler(); } - case "user": - if(context.requestParts.Length < 2) { - return new handlers.WrongUrlHandler(); - } - if(context.requestParts.Length == 2) { - return new handlers.response.UserInfoHandler(); - } - switch(context.requestParts[2].ToLower()) { - case "posts": - return new handlers.response.UserPostsHandler(); - case "replies": - return new handlers.response.UserRepliesHandler(); - case "pollsparticipated": - return new handlers.response.UserPollsParticipatedHandler(); - default: - return new handlers.WrongUrlHandler(); - } - case "settings": - return new handlers.response.SettingsHandler(); - case "conversations": - return new handlers.response.ConversationsHandler(); - case "conversation": - return new handlers.response.ConversationHandler(); - case "pmsend": - return new handlers.response.PMSendHandler(); - case "pmreply": - return new handlers.response.PMReplyHandler(); case "upload": if(context.requestParts.Length < 2) { - return new handlers.WrongUrlHandler(); + throw new RedirectException("/Upload/List/"); } switch(context.requestParts[1].ToLower()) { case "item": @@ -161,6 +187,14 @@ namespace FLocal.IISHandler { return new handlers.response.LocalNetworksListHandler(); case "static": return new handlers.StaticHandler(context.requestParts); + case "registerbyinvite": + string[] rbi_parts = context.requestParts; + rbi_parts[0] = "My/Login/RegisterByInvite"; + throw new RedirectException("/" + string.Join("/", rbi_parts)); + case "user": + string[] u_parts = context.requestParts; + u_parts[0] = "Users/User"; + throw new RedirectException("/" + string.Join("/", u_parts)); case "do": if(context.requestParts.Length < 2) { return new handlers.WrongUrlHandler(); diff --git a/IISMainHandler/handlers/request/LoginHandler.cs b/IISMainHandler/handlers/request/LoginHandler.cs index 688135b..4f10c49 100644 --- a/IISMainHandler/handlers/request/LoginHandler.cs +++ b/IISMainHandler/handlers/request/LoginHandler.cs @@ -33,7 +33,7 @@ namespace FLocal.IISHandler.handlers.request { try { Account tmpAccount = Account.LoadByName(context.httprequest.Form["name"]); if(tmpAccount.needsMigration) { - throw new RedirectException("/MigrateAccount/" + context.httprequest.Form["name"]); + throw new RedirectException("/My/Login/MigrateAccount/" + context.httprequest.Form["name"]); } } catch(NotFoundInDBException) { } diff --git a/IISMainHandler/handlers/request/RegisterByInviteHandler.cs b/IISMainHandler/handlers/request/RegisterByInviteHandler.cs index 993f794..9ea29b8 100644 --- a/IISMainHandler/handlers/request/RegisterByInviteHandler.cs +++ b/IISMainHandler/handlers/request/RegisterByInviteHandler.cs @@ -17,7 +17,7 @@ namespace FLocal.IISHandler.handlers.request { try { Account tmpAccount = Account.LoadByName(context.httprequest.Form["login"]); if(tmpAccount.needsMigration) { - throw new RedirectException("/MigrateAccount/" + context.httprequest.Form["login"]); + throw new RedirectException("/My/Login/MigrateAccount/" + context.httprequest.Form["login"]); } } catch(NotFoundInDBException) { } diff --git a/IISMainHandler/handlers/request/RegisterHandler.cs b/IISMainHandler/handlers/request/RegisterHandler.cs index 696c824..7385072 100644 --- a/IISMainHandler/handlers/request/RegisterHandler.cs +++ b/IISMainHandler/handlers/request/RegisterHandler.cs @@ -17,7 +17,7 @@ namespace FLocal.IISHandler.handlers.request { try { Account tmpAccount = Account.LoadByName(context.httprequest.Form["login"]); if(tmpAccount.needsMigration) { - throw new RedirectException("/MigrateAccount/" + context.httprequest.Form["login"]); + throw new RedirectException("/My/Login/MigrateAccount/" + context.httprequest.Form["login"]); } } catch(NotFoundInDBException) { } diff --git a/IISMainHandler/handlers/response/ConversationHandler.cs b/IISMainHandler/handlers/response/ConversationHandler.cs index 50d8cae..f4c0fe1 100644 --- a/IISMainHandler/handlers/response/ConversationHandler.cs +++ b/IISMainHandler/handlers/response/ConversationHandler.cs @@ -21,7 +21,7 @@ namespace FLocal.IISHandler.handlers.response { } override protected IEnumerable getSpecificData(WebContext context) { - Account interlocutor = Account.LoadById(int.Parse(context.requestParts[1])); + Account interlocutor = Account.LoadById(int.Parse(context.requestParts[3])); PMConversation conversation = PMConversation.LoadByAccounts(context.session.account, interlocutor); PageOuter pageOuter = PageOuter.createFromGet( context.requestParts, @@ -52,7 +52,7 @@ namespace FLocal.IISHandler.handlers.response { ) } }, - 2 + 4 ); IEnumerable messages = conversation.getMessages(pageOuter, context); diff --git a/IISMainHandler/handlers/response/ConversationsHandler.cs b/IISMainHandler/handlers/response/ConversationsHandler.cs index 980858a..6744c68 100644 --- a/IISMainHandler/handlers/response/ConversationsHandler.cs +++ b/IISMainHandler/handlers/response/ConversationsHandler.cs @@ -20,7 +20,7 @@ namespace FLocal.IISHandler.handlers.response { } override protected IEnumerable getSpecificData(WebContext context) { - PageOuter pageOuter = PageOuter.createFromGet(context.requestParts, context.userSettings.threadsPerPage, 1); + PageOuter pageOuter = PageOuter.createFromGet(context.requestParts, context.userSettings.threadsPerPage, 2); IEnumerable conversations = PMConversation.getConversations(context.session.account, pageOuter); XElement[] result = new XElement[] { new XElement("conversations", diff --git a/IISMainHandler/handlers/response/MigrateAccountHandler.cs b/IISMainHandler/handlers/response/MigrateAccountHandler.cs index 8f7da38..c8eabea 100644 --- a/IISMainHandler/handlers/response/MigrateAccountHandler.cs +++ b/IISMainHandler/handlers/response/MigrateAccountHandler.cs @@ -21,10 +21,10 @@ namespace FLocal.IISHandler.handlers.response { if(context.httprequest.Form["username"] != null && context.httprequest.Form["username"] != "") { username = context.httprequest.Form["username"]; } else { - if(context.requestParts.Length != 2) { + if(context.requestParts.Length != 4) { throw new CriticalException("Username is not specified"); } - username = context.requestParts[1]; + username = context.requestParts[3]; } Account account = Account.LoadByName(username); if(!account.needsMigration) throw new FLocalException("Already migrated"); diff --git a/IISMainHandler/handlers/response/PMReplyHandler.cs b/IISMainHandler/handlers/response/PMReplyHandler.cs index 9e7922a..e905706 100644 --- a/IISMainHandler/handlers/response/PMReplyHandler.cs +++ b/IISMainHandler/handlers/response/PMReplyHandler.cs @@ -19,7 +19,7 @@ namespace FLocal.IISHandler.handlers.response { } override protected IEnumerable getSpecificNewMessageData(WebContext context) { - PMMessage message = PMMessage.LoadById(int.Parse(context.requestParts[1])); + PMMessage message = PMMessage.LoadById(int.Parse(context.requestParts[3])); string quoted = UBBParser.StripQuotes(message.bodyUBB).Trim(); return new XElement[] { message.exportToXml(context), diff --git a/IISMainHandler/handlers/response/PMSendHandler.cs b/IISMainHandler/handlers/response/PMSendHandler.cs index 5ceb8e1..48a70ea 100644 --- a/IISMainHandler/handlers/response/PMSendHandler.cs +++ b/IISMainHandler/handlers/response/PMSendHandler.cs @@ -19,8 +19,8 @@ namespace FLocal.IISHandler.handlers.response { } override protected IEnumerable getSpecificNewMessageData(WebContext context) { - if(context.requestParts.Length > 1) { - Account receiver = Account.LoadById(int.Parse(context.requestParts[1])); + if(context.requestParts.Length > 3) { + Account receiver = Account.LoadById(int.Parse(context.requestParts[3])); if(receiver.needsMigration) throw new ApplicationException("User is not migrated"); return new XElement[] { new XElement("receiver", receiver.exportToXml(context)), diff --git a/IISMainHandler/handlers/response/RegisterByInviteHandler.cs b/IISMainHandler/handlers/response/RegisterByInviteHandler.cs index cde3527..74d0471 100644 --- a/IISMainHandler/handlers/response/RegisterByInviteHandler.cs +++ b/IISMainHandler/handlers/response/RegisterByInviteHandler.cs @@ -16,8 +16,8 @@ namespace FLocal.IISHandler.handlers.response { } protected override IEnumerable getSpecificData(WebContext context) { - int inviteId = int.Parse(context.requestParts[1]); - string code = context.requestParts[2]; + int inviteId = int.Parse(context.requestParts[3]); + string code = context.requestParts[4]; Invite invite = Invite.LoadById(inviteId); if(invite.isUsed) throw new FLocalException("Invite is already used"); if(invite.code != code) throw new FLocalException("Code mismatch"); diff --git a/IISMainHandler/handlers/response/UserInfoHandler.cs b/IISMainHandler/handlers/response/UserInfoHandler.cs index cbed467..a2bbbea 100644 --- a/IISMainHandler/handlers/response/UserInfoHandler.cs +++ b/IISMainHandler/handlers/response/UserInfoHandler.cs @@ -24,10 +24,10 @@ namespace FLocal.IISHandler.handlers.response { User user; { int userId; - if(int.TryParse(context.requestParts[1], out userId)) { + if(int.TryParse(context.requestParts[2], out userId)) { user = User.LoadById(userId); } else { - user = User.LoadByName(context.requestParts[1]); + user = User.LoadByName(context.requestParts[2]); } } Account account = null; diff --git a/IISMainHandler/handlers/response/UserPollsParticipatedHandler.cs b/IISMainHandler/handlers/response/UserPollsParticipatedHandler.cs index a3bd954..5c436bb 100644 --- a/IISMainHandler/handlers/response/UserPollsParticipatedHandler.cs +++ b/IISMainHandler/handlers/response/UserPollsParticipatedHandler.cs @@ -21,11 +21,11 @@ namespace FLocal.IISHandler.handlers.response { } override protected IEnumerable getSpecificData(WebContext context) { - User user = User.LoadById(int.Parse(context.requestParts[1])); + User user = User.LoadById(int.Parse(context.requestParts[2])); PageOuter pageOuter = PageOuter.createFromGet( context.requestParts, context.userSettings.postsPerPage, - 3 + 4 ); IEnumerable votes = Poll.Vote.LoadByIds( from stringId in Config.instance.mainConnection.LoadIdsByConditions( diff --git a/IISMainHandler/handlers/response/UserPostsHandler.cs b/IISMainHandler/handlers/response/UserPostsHandler.cs index 55e48d5..4e8566d 100644 --- a/IISMainHandler/handlers/response/UserPostsHandler.cs +++ b/IISMainHandler/handlers/response/UserPostsHandler.cs @@ -21,11 +21,11 @@ namespace FLocal.IISHandler.handlers.response { } override protected IEnumerable getSpecificData(WebContext context) { - User user = User.LoadById(int.Parse(context.requestParts[1])); + User user = User.LoadById(int.Parse(context.requestParts[2])); PageOuter pageOuter = PageOuter.createFromGet( context.requestParts, context.userSettings.postsPerPage, - 3 + 4 ); IEnumerable posts = user.getPosts(pageOuter); diff --git a/IISMainHandler/handlers/response/UserRepliesHandler.cs b/IISMainHandler/handlers/response/UserRepliesHandler.cs index fda8cd9..94a9daf 100644 --- a/IISMainHandler/handlers/response/UserRepliesHandler.cs +++ b/IISMainHandler/handlers/response/UserRepliesHandler.cs @@ -21,11 +21,11 @@ namespace FLocal.IISHandler.handlers.response { } override protected IEnumerable getSpecificData(WebContext context) { - User user = User.LoadById(int.Parse(context.requestParts[1])); + User user = User.LoadById(int.Parse(context.requestParts[2])); PageOuter pageOuter = PageOuter.createFromGet( context.requestParts, context.userSettings.postsPerPage, - 3 + 4 ); IEnumerable posts = user.getReplies(pageOuter); diff --git a/templates/Full/Boards.xslt b/templates/Full/Boards.xslt index a3024da..0e64b09 100644 --- a/templates/Full/Boards.xslt +++ b/templates/Full/Boards.xslt @@ -58,14 +58,14 @@
- /User//Replies/ + /Users/User//Replies/ Последние ответы на мои сообщения
- /User//PollsParticipated/ + /Users/User//PollsParticipated/ Последние опросы с моим участием diff --git a/templates/Full/Conversation.xslt b/templates/Full/Conversation.xslt index 0b23885..52aa870 100644 --- a/templates/Full/Conversation.xslt +++ b/templates/Full/Conversation.xslt @@ -1,11 +1,13 @@ + +
@@ -19,7 +21,7 @@ @@ -34,7 +36,7 @@ @@ -60,7 +62,7 @@
страницы: - /Conversation// + /My/Conversations/Conversation//
страницы: - /Conversation// + /My/Conversations/Conversation//
- Приватные сообщения + Приватные сообщения >> diff --git a/templates/Full/Conversations.xslt b/templates/Full/Conversations.xslt index a90ebb2..f2e5b37 100644 --- a/templates/Full/Conversations.xslt +++ b/templates/Full/Conversations.xslt @@ -1,9 +1,11 @@ + Личные сообщения + diff --git a/templates/Full/Login.xslt b/templates/Full/Login.xslt index 9cbbcc5..77b1f1d 100644 --- a/templates/Full/Login.xslt +++ b/templates/Full/Login.xslt @@ -1,8 +1,10 @@ + Вход +
@@ -21,7 +23,7 @@ - /PMSend/ + /My/Conversations/PMSend/ Новое сообщение Сообщение @@ -79,7 +81,7 @@ страницы: - /Conversations/ + /My/Conversations/
@@ -51,7 +53,7 @@
-
+ Логин

diff --git a/templates/Full/MigrateAccount.xslt b/templates/Full/MigrateAccount.xslt index 6fab565..24aa539 100644 --- a/templates/Full/MigrateAccount.xslt +++ b/templates/Full/MigrateAccount.xslt @@ -1,8 +1,10 @@ + Миграция +
diff --git a/templates/Full/PMReply.xslt b/templates/Full/PMReply.xslt index 27f7446..9fe842f 100644 --- a/templates/Full/PMReply.xslt +++ b/templates/Full/PMReply.xslt @@ -1,12 +1,14 @@ + Ответ на личное сообщение - +
diff --git a/templates/Full/PMSend.xslt b/templates/Full/PMSend.xslt index dc1075d..a33f5f1 100644 --- a/templates/Full/PMSend.xslt +++ b/templates/Full/PMSend.xslt @@ -1,9 +1,11 @@ + Новое личное сообщение +
diff --git a/templates/Full/RegisterByInvite.xslt b/templates/Full/RegisterByInvite.xslt index 70db86b..2815b75 100644 --- a/templates/Full/RegisterByInvite.xslt +++ b/templates/Full/RegisterByInvite.xslt @@ -1,8 +1,10 @@ + Регистрация +
diff --git a/templates/Full/Settings.xslt b/templates/Full/Settings.xslt index 71fdb85..fa7ea6e 100644 --- a/templates/Full/Settings.xslt +++ b/templates/Full/Settings.xslt @@ -1,8 +1,10 @@ + Настройки +
diff --git a/templates/Full/UserInfo.xslt b/templates/Full/UserInfo.xslt index eb2def2..3131d33 100644 --- a/templates/Full/UserInfo.xslt +++ b/templates/Full/UserInfo.xslt @@ -1,8 +1,10 @@ + +
@@ -183,7 +185,7 @@ - /PMSend// + /My/Conversations/PMSend// Послать личное сообщение @@ -191,7 +193,7 @@ | - /Conversation// + /My/Conversations/Conversation// История @@ -203,13 +205,13 @@ | - /User//Posts/ + /Users/User//Posts/ Сообщения | - /User//Replies/ + /Users/User//Replies/ Ответы | diff --git a/templates/Full/UserList.xslt b/templates/Full/UserList.xslt index 86e42e0..88af2e2 100644 --- a/templates/Full/UserList.xslt +++ b/templates/Full/UserList.xslt @@ -1,9 +1,10 @@ + Пользователи - + - -
@@ -89,7 +90,7 @@ - /User//Posts/ + /Users/User//Posts/ ( @@ -110,34 +111,4 @@
- - - -
- - - - -
- - /Users/All/ - Все - - | - - /Users/Active/ - Активные (смигрированные) - - | - - /Users/Online/ - В онлайне - -
-
-
  
- - \ No newline at end of file diff --git a/templates/Full/UserPollsParticipated.xslt b/templates/Full/UserPollsParticipated.xslt index 4687e3a..48fcb9a 100644 --- a/templates/Full/UserPollsParticipated.xslt +++ b/templates/Full/UserPollsParticipated.xslt @@ -1,9 +1,11 @@ + Опросы + diff --git a/templates/Full/UserPosts.xslt b/templates/Full/UserPosts.xslt index e8dfdf7..4b85b7d 100644 --- a/templates/Full/UserPosts.xslt +++ b/templates/Full/UserPosts.xslt @@ -1,12 +1,14 @@ + Сообщения - +
@@ -48,7 +50,7 @@ страницы: - /User//PollsParticipated/ + /Users/User//PollsParticipated/
@@ -62,7 +64,7 @@ diff --git a/templates/Full/UserReplies.xslt b/templates/Full/UserReplies.xslt index 64eb97b..e8865ce 100644 --- a/templates/Full/UserReplies.xslt +++ b/templates/Full/UserReplies.xslt @@ -1,12 +1,14 @@ + Ответы - +
@@ -47,7 +49,7 @@ страницы: - /User//Posts/ + /Users/User//Posts/
страницы: - /User//Posts/ + /Users/User//Posts/
@@ -62,7 +64,7 @@ diff --git a/templates/Full/elems/ConversationInfo.xslt b/templates/Full/elems/ConversationInfo.xslt index 2c04fb0..d30cc92 100644 --- a/templates/Full/elems/ConversationInfo.xslt +++ b/templates/Full/elems/ConversationInfo.xslt @@ -24,7 +24,7 @@ - /Conversation/ + /My/Conversations/Conversation/ / @@ -36,7 +36,7 @@ - /Conversation// + /My/Conversations/Conversation// diff --git a/templates/Full/elems/Header.xslt b/templates/Full/elems/Header.xslt index 7fdaf75..4216b0f 100644 --- a/templates/Full/elems/Header.xslt +++ b/templates/Full/elems/Header.xslt @@ -23,30 +23,23 @@
@@ -47,7 +49,7 @@ страницы: - /User//Replies/ + /Users/User//Replies/
страницы: - /User//Replies/ + /Users/User//Replies/
diff --git a/templates/Full/elems/Main.xslt b/templates/Full/elems/Main.xslt index 4c0c542..c0d7a5f 100644 --- a/templates/Full/elems/Main.xslt +++ b/templates/Full/elems/Main.xslt @@ -198,7 +198,7 @@ separate UG_ - /User// + /Users/User// diff --git a/templates/Full/elems/PMInfo.xslt b/templates/Full/elems/PMInfo.xslt index 98c72e3..29448dd 100644 --- a/templates/Full/elems/PMInfo.xslt +++ b/templates/Full/elems/PMInfo.xslt @@ -45,7 +45,7 @@ diff --git a/templates/Full/result/NewAccount.xslt b/templates/Full/result/NewAccount.xslt index 38be2ad..680fed4 100644 --- a/templates/Full/result/NewAccount.xslt +++ b/templates/Full/result/NewAccount.xslt @@ -29,7 +29,7 @@ | - /Login/ + /My/Login/ Войти [→] diff --git a/templates/Full/result/PMSent.xslt b/templates/Full/result/PMSent.xslt index 6665ac8..092c4ed 100644 --- a/templates/Full/result/PMSent.xslt +++ b/templates/Full/result/PMSent.xslt @@ -24,12 +24,12 @@

[←] - /Conversations/ + /My/Conversations/ Вернуться к личным сообщениям | - /Conversation//p + /My/Conversations/Conversation//p Просмотреть сообщение [→] diff --git a/templates/Lite/Conversation.xslt b/templates/Lite/Conversation.xslt index 243c954..216a535 100644 --- a/templates/Lite/Conversation.xslt +++ b/templates/Lite/Conversation.xslt @@ -19,7 +19,7 @@

@@ -34,7 +34,7 @@ @@ -52,7 +52,7 @@

- Приватные сообщения + Приватные сообщения >> diff --git a/templates/Lite/Conversations.xslt b/templates/Lite/Conversations.xslt index e3ad889..9dcddd7 100644 --- a/templates/Lite/Conversations.xslt +++ b/templates/Lite/Conversations.xslt @@ -9,7 +9,7 @@ [ - /PMSend/ + /My/Conversations/PMSend/ New Message @@ -27,7 +27,7 @@ страницы: - /Conversations/ + /My/Conversations/ diff --git a/templates/Lite/Login.xslt b/templates/Lite/Login.xslt index 5e4858c..1c5fbff 100644 --- a/templates/Lite/Login.xslt +++ b/templates/Lite/Login.xslt @@ -51,7 +51,7 @@

+ + + + + У вас + + непрочитанных личных сообщений + + + + | + /Boards/ Список форумов | - - /Conversations/ - - - - - У вас - - непрочитанных личных сообщений - - - - Личные сообщения - - - true - - - | /Upload/List/ Аплоад @@ -56,19 +49,8 @@ | - /Settings/ - Настройки - - true - - - | - - /Login/ - Вход - - true - + /My/ + My Home | @@ -76,15 +58,8 @@ FAQ | - - - /do/Logout/?sessionKey= - - Выход - - | - /Users/All/ + /Users/ Пользователи
- /PMReply// + /My/Conversations/PMReply// Ответ на сообщение страницы: - /Conversation// + /My/Conversations/Conversation//
страницы: - /Conversation// + /My/Conversations/Conversation//
- + Логин

diff --git a/templates/Lite/UserInfo.xslt b/templates/Lite/UserInfo.xslt index eb2def2..5a3311e 100644 --- a/templates/Lite/UserInfo.xslt +++ b/templates/Lite/UserInfo.xslt @@ -183,7 +183,7 @@ 		- /PMSend// + /My/Conversations/PMSend// Послать личное сообщение @@ -191,7 +191,7 @@ | - /Conversation// + /My/Conversations/Conversation// История @@ -203,13 +203,13 @@ | - /User//Posts/ + /Users/User//Posts/ Сообщения | - /User//Replies/ + /Users/User//Replies/ Ответы | diff --git a/templates/Lite/elems/ConversationInfo.xslt b/templates/Lite/elems/ConversationInfo.xslt index 7f9c98e..b9073a7 100644 --- a/templates/Lite/elems/ConversationInfo.xslt +++ b/templates/Lite/elems/ConversationInfo.xslt @@ -23,7 +23,7 @@ - /Conversation/ + /My/Conversations/Conversation/ / diff --git a/templates/Lite/elems/Header.xslt b/templates/Lite/elems/Header.xslt index 1b25ed6..8c804f3 100644 --- a/templates/Lite/elems/Header.xslt +++ b/templates/Lite/elems/Header.xslt @@ -4,7 +4,7 @@

- /Conversations/? + /My/Conversations/? @@ -25,7 +25,7 @@ - /Login/ + /My/Login/ Вход diff --git a/templates/Lite/elems/Main.xslt b/templates/Lite/elems/Main.xslt index 7cdecfb..27f03cb 100644 --- a/templates/Lite/elems/Main.xslt +++ b/templates/Lite/elems/Main.xslt @@ -204,7 +204,7 @@ separate UG_ - /User// + /Users/User// ^M diff --git a/templates/Lite/elems/PMInfo.xslt b/templates/Lite/elems/PMInfo.xslt index 363a45a..efa1a4f 100644 --- a/templates/Lite/elems/PMInfo.xslt +++ b/templates/Lite/elems/PMInfo.xslt @@ -27,7 +27,7 @@ | - /PMReply// + /My/Conversations/PMReply// Reply | diff --git a/templates/Lite/result/NewAccount.xslt b/templates/Lite/result/NewAccount.xslt index 38be2ad..680fed4 100644 --- a/templates/Lite/result/NewAccount.xslt +++ b/templates/Lite/result/NewAccount.xslt @@ -29,7 +29,7 @@ | - /Login/ + /My/Login/ Войти [→] diff --git a/templates/Lite/result/PMSent.xslt b/templates/Lite/result/PMSent.xslt index 6665ac8..092c4ed 100644 --- a/templates/Lite/result/PMSent.xslt +++ b/templates/Lite/result/PMSent.xslt @@ -24,12 +24,12 @@

[←] - /Conversations/ + /My/Conversations/ Вернуться к личным сообщениям | - /Conversation//p + /My/Conversations/Conversation//p Просмотреть сообщение [→]