diff --git a/Web/Presenters/CommentPresenter.php b/Web/Presenters/CommentPresenter.php index cb0efd0d..ab070961 100644 --- a/Web/Presenters/CommentPresenter.php +++ b/Web/Presenters/CommentPresenter.php @@ -27,8 +27,13 @@ final class CommentPresenter extends OpenVKPresenter $this->flashFail("err", tr("error"), tr("forbidden")); if(!is_null($this->user)) $comment->toggleLike($this->user->identity); - - $this->redirect($_SERVER["HTTP_REFERER"]); + + $currentUrl = $_SERVER["HTTP_REFERER"] ?? "/"; + $parsedUrl = parse_url($currentUrl); + $queryParams = []; + parse_str($parsedUrl['query'] ?? '', $queryParams); + $queryParams['al'] = '1'; + $this->redirect("{$parsedUrl['scheme']}://{$parsedUrl['host']}{$parsedUrl['path']}?" . http_build_query($queryParams)); } function renderMakeComment(string $repo, int $eId): void diff --git a/Web/Presenters/NotesPresenter.php b/Web/Presenters/NotesPresenter.php index 50437ad7..c684eaf6 100644 --- a/Web/Presenters/NotesPresenter.php +++ b/Web/Presenters/NotesPresenter.php @@ -93,7 +93,7 @@ final class NotesPresenter extends OpenVKPresenter $note->setEdited(time()); $note->save(); - $this->redirect("/note" . $this->user->id . "_" . $note->getVirtualId()); + $this->redirect("/note" . $this->user->id . "_" . $note->getVirtualId() . "?al=1"); } } @@ -120,8 +120,8 @@ final class NotesPresenter extends OpenVKPresenter $note->setCached_Content(NULL); $note->setEdited(time()); $note->save(); - - $this->redirect("/note" . $this->user->id . "_" . $note->getVirtualId()); + + $this->redirect("/note" . $this->user->id . "_" . $note->getVirtualId() . "?al=1"); } } @@ -140,6 +140,6 @@ final class NotesPresenter extends OpenVKPresenter $name = $note->getName(); $note->delete(); $this->flash("succ", "Заметка удалена", "Заметка \"$name\" была успешно удалена."); - $this->redirect("/notes" . $this->user->id); + $this->redirect("/notes" . $this->user->id . "?al=1"); } } diff --git a/Web/Presenters/OpenVKPresenter.php b/Web/Presenters/OpenVKPresenter.php index 710713e5..29440ffa 100755 --- a/Web/Presenters/OpenVKPresenter.php +++ b/Web/Presenters/OpenVKPresenter.php @@ -61,7 +61,6 @@ abstract class OpenVKPresenter extends SimplePresenter } else { $this->flash($type, $title, $message, $code); $referer = $_SERVER["HTTP_REFERER"] ?? "/"; - $this->redirect($referer); } } @@ -277,6 +276,7 @@ abstract class OpenVKPresenter extends SimplePresenter } } + $this->template->__isAjax= $this->requestParam("al"); parent::onStartup(); } diff --git a/Web/Presenters/SearchPresenter.php b/Web/Presenters/SearchPresenter.php index fadf9954..828a1ec5 100644 --- a/Web/Presenters/SearchPresenter.php +++ b/Web/Presenters/SearchPresenter.php @@ -29,11 +29,11 @@ final class SearchPresenter extends OpenVKPresenter function renderIndex(): void { - $query = $this->queryParam("query") ?? ""; - $type = $this->queryParam("type") ?? "users"; - $sorter = $this->queryParam("sort") ?? "id"; - $invert = $this->queryParam("invert") == 1 ? "ASC" : "DESC"; - $page = (int) ($this->queryParam("p") ?? 1); + $query = $this->requestParam("query") ?? ""; + $type = $this->requestParam("type") ?? "users"; + $sorter = $this->requestParam("sort") ?? "id"; + $invert = $this->requestParam("invert") == 1 ? "ASC" : "DESC"; + $page = (int) ($this->requestParam("p") ?? 1); $this->willExecuteWriteAction(); if($query != "") @@ -66,27 +66,27 @@ final class SearchPresenter extends OpenVKPresenter } $parameters = [ - "type" => $this->queryParam("type"), - "city" => $this->queryParam("city") != "" ? $this->queryParam("city") : NULL, - "maritalstatus" => $this->queryParam("maritalstatus") != 0 ? $this->queryParam("maritalstatus") : NULL, - "with_photo" => $this->queryParam("with_photo"), - "status" => $this->queryParam("status") != "" ? $this->queryParam("status") : NULL, - "politViews" => $this->queryParam("politViews") != 0 ? $this->queryParam("politViews") : NULL, - "email" => $this->queryParam("email"), - "telegram" => $this->queryParam("telegram"), - "site" => $this->queryParam("site") != "" ? "https://".$this->queryParam("site") : NULL, - "address" => $this->queryParam("address"), - "is_online" => $this->queryParam("is_online") == 1 ? 1 : NULL, - "interests" => $this->queryParam("interests") != "" ? $this->queryParam("interests") : NULL, - "fav_mus" => $this->queryParam("fav_mus") != "" ? $this->queryParam("fav_mus") : NULL, - "fav_films" => $this->queryParam("fav_films") != "" ? $this->queryParam("fav_films") : NULL, - "fav_shows" => $this->queryParam("fav_shows") != "" ? $this->queryParam("fav_shows") : NULL, - "fav_books" => $this->queryParam("fav_books") != "" ? $this->queryParam("fav_books") : NULL, - "fav_quote" => $this->queryParam("fav_quote") != "" ? $this->queryParam("fav_quote") : NULL, - "hometown" => $this->queryParam("hometown") != "" ? $this->queryParam("hometown") : NULL, - "before" => $this->queryParam("datebefore") != "" ? strtotime($this->queryParam("datebefore")) : NULL, - "after" => $this->queryParam("dateafter") != "" ? strtotime($this->queryParam("dateafter")) : NULL, - "gender" => $this->queryParam("gender") != "" && $this->queryParam("gender") != 2 ? $this->queryParam("gender") : NULL + "type" => $this->requestParam("type"), + "city" => $this->requestParam("city") != "" ? $this->requestParam("city") : NULL, + "maritalstatus" => $this->requestParam("maritalstatus") != 0 ? $this->requestParam("maritalstatus") : NULL, + "with_photo" => $this->requestParam("with_photo"), + "status" => $this->requestParam("status") != "" ? $this->requestParam("status") : NULL, + "politViews" => $this->requestParam("politViews") != 0 ? $this->requestParam("politViews") : NULL, + "email" => $this->requestParam("email"), + "telegram" => $this->requestParam("telegram"), + "site" => $this->requestParam("site") != "" ? "https://".$this->requestParam("site") : NULL, + "address" => $this->requestParam("address"), + "is_online" => $this->requestParam("is_online") == 1 ? 1 : NULL, + "interests" => $this->requestParam("interests") != "" ? $this->requestParam("interests") : NULL, + "fav_mus" => $this->requestParam("fav_mus") != "" ? $this->requestParam("fav_mus") : NULL, + "fav_films" => $this->requestParam("fav_films") != "" ? $this->requestParam("fav_films") : NULL, + "fav_shows" => $this->requestParam("fav_shows") != "" ? $this->requestParam("fav_shows") : NULL, + "fav_books" => $this->requestParam("fav_books") != "" ? $this->requestParam("fav_books") : NULL, + "fav_quote" => $this->requestParam("fav_quote") != "" ? $this->requestParam("fav_quote") : NULL, + "hometown" => $this->requestParam("hometown") != "" ? $this->requestParam("hometown") : NULL, + "before" => $this->requestParam("datebefore") != "" ? strtotime($this->requestParam("datebefore")) : NULL, + "after" => $this->requestParam("dateafter") != "" ? strtotime($this->requestParam("dateafter")) : NULL, + "gender" => $this->requestParam("gender") != "" && $this->requestParam("gender") != 2 ? $this->requestParam("gender") : NULL ]; $repo = $repos[$type] or $this->throwError(400, "Bad Request", "Invalid search entity $type."); diff --git a/Web/Presenters/SupportPresenter.php b/Web/Presenters/SupportPresenter.php index c4d729ea..ae84e09c 100644 --- a/Web/Presenters/SupportPresenter.php +++ b/Web/Presenters/SupportPresenter.php @@ -191,7 +191,7 @@ final class SupportPresenter extends OpenVKPresenter $comment->setCreated(time()); $comment->save(); - $this->redirect("/support/view/" . $id); + $this->redirect("/support/view/" . $id . "?al=1"); } else { $this->flashFail("err", tr("error"), tr("you_have_not_entered_text")); } @@ -282,13 +282,21 @@ final class SupportPresenter extends OpenVKPresenter if($ticket->isDeleted()) $this->notFound(); - if(!($ticket->getUserId() === $this->user->id && $comment->getUType() === 0)) + $mode = "view"; + + if(!($ticket->getUserId() === $this->user->id && $comment->getUType() === 0)) { $this->assertPermission("openvk\Web\Models\Entities\TicketReply", "write", 0); + $mode = "reply"; + } $this->willExecuteWriteAction(); + + // $url = "/support/" . !($ticket->getUserId() === $this->user->id && $comment->getUType() === 0) ? "reply" : "view" . "/" . $comment->getTicket()->getId() . "?al=1"; + $url = "/support/$mode/" . $comment->getTicket()->getId() . "?al=1"; $comment->delete(); - $this->flashFail("succ", tr("ticket_changed"), tr("ticket_changed_comment")); + $this->flash("succ", tr("ticket_changed"), tr("ticket_changed_comment")); + $this->redirect($url); } function renderRateAnswer(int $id, int $mark): void diff --git a/Web/Presenters/WallPresenter.php b/Web/Presenters/WallPresenter.php index 3e115ec7..03f0362a 100644 --- a/Web/Presenters/WallPresenter.php +++ b/Web/Presenters/WallPresenter.php @@ -381,8 +381,13 @@ final class WallPresenter extends OpenVKPresenter if(!is_null($this->user)) { $post->toggleLike($this->user->identity); } - - $this->redirect("$_SERVER[HTTP_REFERER]#postGarter=" . $post->getId()); + + $currentUrl = $_SERVER["HTTP_REFERER"] ?? "/"; + $queryParams = []; + parse_str(parse_url($currentUrl, PHP_URL_QUERY) ?? "", $queryParams); + $queryParams['al'] = '1'; + $updatedUrl = strtok($currentUrl, '?') . '?' . http_build_query($queryParams); + $this->redirect($updatedUrl); } function renderShare(int $wall, int $post_id): void diff --git a/Web/Presenters/templates/@ajax.xml b/Web/Presenters/templates/@ajax.xml new file mode 100644 index 00000000..06211aff --- /dev/null +++ b/Web/Presenters/templates/@ajax.xml @@ -0,0 +1,387 @@ +{var $instance_name = OPENVK_ROOT_CONF['openvk']['appearance']['name']} + {if !isset($parentModule) || substr($parentModule, 0, 21) === 'libchandler:absolute.'} + + + + + {include title} + + {if $isTimezoned == NULL} + {script "js/timezone.js"} + {/if} + + {ifset headIncludes} + {include headIncludes} + {/ifset} + + +
+ +
+ + +
+

+ Вы вошли как {$thisUser->getCanonicalName()}. Пожалуйста, уважайте + право на тайну переписки других людей и не злоупотребляйте подменой пользователя. + Нажмите здесь, чтобы выйти. +

+
+ +
FOR TESTING PURPOSES ONLY
+ +
+
+ +
+ {_close} +
+
+
+ +
+ + +
+
+ +
+ {_aw_legacy_ui} +
+
+ +
+
+
+
+ + {if isset($backdrops) && !is_null($backdrops)} +
+
+
+ {/if} + +
+ ⬆ {_to_top} +
+ +
+
+
+ {if $instance_name != OPENVK_DEFAULT_INSTANCE_NAME}{$instance_name}{/if} +
+ {ifset $thisUser} + {if $thisUser->isDeactivated()} +
+ {_header_log_out} +
+ {else} +
+ {_header_home} +
+
+ {_header_groups} +
+
+ {_header_search} +
+
+ {_header_invite} +
+
+ {_header_help} ({$ticketAnsweredCount}) +
+
+ {_header_log_out} +
+ {var $atSearch = str_contains($_SERVER['REQUEST_URI'], "/search")} +
+ + {if !$atSearch} +
+ + +
+ + {else} +
+ + + +
+ + {/if} +
+ {/if} + {else} +
+ {_header_login} +
+
+ {_header_registration} +
+
+ {_header_help} +
+ {/ifset} +
+
+ +
+
+ {ifset $thisUser} + {if !$thisUser->isBanned() XOR !$thisUser->isActivated() XOR $thisUser->isDeactivated()} + {_edit_button} + {_my_page} + {_my_friends} + + + ({$thisUser->getFollowersCount()}) + + + + {_my_photos} + {_my_videos} + {_my_messages} + + ({$thisUser->getUnreadMessagesCount()}) + + + {_my_notes} + {_my_groups} + {_my_feed} + {_my_feedback} + {if $thisUser->getNotificationsCount() > 0} + ({$thisUser->getNotificationsCount()}) + {/if} + + {_my_apps} + {_my_settings} + + {var $canAccessAdminPanel = $thisUser->getChandlerUser()->can("access")->model("admin")->whichBelongsTo(NULL)} + {var $canAccessHelpdesk = $thisUser->getChandlerUser()->can("write")->model('openvk\Web\Models\Entities\TicketReply')->whichBelongsTo(0)} + {var $menuLinksAvaiable = sizeof(OPENVK_ROOT_CONF['openvk']['preferences']['menu']['links']) > 0 && $thisUser->getLeftMenuItemStatus('links')} +
+ {_admin} + {_helpdesk} + {if $helpdeskTicketNotAnsweredCount > 0} + ({$helpdeskTicketNotAnsweredCount}) + {/if} + + + {strpos($menuItem["name"], "@") === 0 ? tr(substr($menuItem["name"], 1)) : $menuItem["name"]} + +
+
+ {$club->getName()} +
+ +
+ {tr("you_still_have_x_points", $thisUser->getCoins())|noescape} +

+ + {_top_up_your_account} » +
+ + + {php echo OPENVK_ROOT_CONF['openvk']['preferences']['adPoster']['caption']} + + +
+ + +
+ +{$thisUser->getFollowersCount()} +
+ + + + + + + + +
+ +{$thisUser->getUnreadMessagesCount()} +
+ + + + + + + + +
+ +{$thisUser->getNotificationsCount()} +
+ + + +
+ {elseif !$thisUser->isActivated()} + {_menu_logout} + {else} + {_menu_support} + {if $ticketAnsweredCount > 0} + ({$ticketAnsweredCount}) + {/if} + + {_menu_logout} + {/if} + {else} +
+ + + + + + + +

+ {if !OPENVK_ROOT_CONF['openvk']['preferences']['security']['disablePasswordRestoring']}{_forgot_password}{/if} +
+ {/ifset} +
+
+ +
+
+
+
+ {include header} +
+
+
+ + {ifset wrap} +
+ {$flashMessage->title}
+ {$flashMessage->msg|noescape} +
+ + {include wrap} + {else} +
+
+
+
+
+ {$flashMessage->title}
+ {$flashMessage->msg|noescape} +
+ + {include content} +
+
+
+
+ {/ifset} +
+
+ +
+ {var $dbVersion = \Chandler\Database\DatabaseConnection::i()->getConnection()->getPdo()->getAttribute(\PDO::ATTR_SERVER_VERSION)} + +
+ {_footer_about_instance} + {_footer_rules} + {_footer_blog} + {_footer_help} + {_footer_developers} + {_footer_privacy} +
+

+ {var $currentUrl = $_SERVER["REQUEST_URI"]} + {foreach array_slice(getLanguages(), 0, 3) as $language} + + {$language['native_name']} + + {/foreach} + all languages » +

+

OpenVK {php echo OPENVK_VERSION} | PHP: {phpversion()} | DB: {$dbVersion}

+

+ {php echo OPENVK_ROOT_CONF["openvk"]["appearance"]["motd"]} +

+
+ + {if OPENVK_ROOT_CONF['openvk']['preferences']['bellsAndWhistles']['fartscroll']} + + + {/if} + + + + + + + + + + + + + {/if} + + {if isset($parentModule) && substr($parentModule, 0, 21) !== 'libchandler:absolute.'} + + + {include content} + {/if} diff --git a/Web/Presenters/templates/@layout.xml b/Web/Presenters/templates/@layout.xml index 1718c499..946b269c 100644 --- a/Web/Presenters/templates/@layout.xml +++ b/Web/Presenters/templates/@layout.xml @@ -1,421 +1,436 @@ -{var $instance_name = OPENVK_ROOT_CONF['openvk']['appearance']['name']} -{if !isset($parentModule) || substr($parentModule, 0, 21) === 'libchandler:absolute.'} - - - - - {ifset title}{include title} - {/ifset}{$instance_name} - - - - - +{if $__isAjax} + {include "@ajax.xml" with blocks} +{else} + {var $instance_name = OPENVK_ROOT_CONF['openvk']['appearance']['name']} + {if !isset($parentModule) || substr($parentModule, 0, 21) === 'libchandler:absolute.'} + + + + + {ifset title}{include title} - {/ifset}{$instance_name} + + + + + - - {script "js/node_modules/jquery/dist/jquery.min.js"} - {script "js/node_modules/umbrellajs/umbrella.min.js"} - {script "js/l10n.js"} - {script "js/openvk.cls.js"} + + {script "js/node_modules/jquery/dist/jquery.min.js"} + {script "js/node_modules/umbrellajs/umbrella.min.js"} + {script "js/l10n.js"} + {script "js/openvk.cls.js"} + {script "js/st_manager.js"} - {css "js/node_modules/tippy.js/dist/backdrop.css"} - {css "js/node_modules/tippy.js/dist/border.css"} - {css "js/node_modules/tippy.js/dist/svg-arrow.css"} - {css "js/node_modules/tippy.js/themes/light.css"} - {script "js/node_modules/@popperjs/core/dist/umd/popper.min.js"} - {script "js/node_modules/tippy.js/dist/tippy-bundle.umd.min.js"} - {script "js/node_modules/handlebars/dist/handlebars.min.js"} + {css "js/node_modules/tippy.js/dist/backdrop.css"} + {css "js/node_modules/tippy.js/dist/border.css"} + {css "js/node_modules/tippy.js/dist/svg-arrow.css"} + {css "js/node_modules/tippy.js/themes/light.css"} + {script "js/node_modules/@popperjs/core/dist/umd/popper.min.js"} + {script "js/node_modules/tippy.js/dist/tippy-bundle.umd.min.js"} + {script "js/node_modules/handlebars/dist/handlebars.min.js"} - {if $isTimezoned == NULL} - {script "js/timezone.js"} - {/if} + {if $isTimezoned == NULL} + {script "js/timezone.js"} + {/if} - {include "_includeCSS.xml"} + {include "_includeCSS.xml"} - {ifset headIncludes} - {include headIncludes} - {/ifset} - - -
-

- Вы вошли как {$thisUser->getCanonicalName()}. Пожалуйста, уважайте - право на тайну переписки других людей и не злоупотребляйте подменой пользователя. - Нажмите здесь, чтобы выйти. -

-
+ {ifset headIncludes} + {include headIncludes} + {/ifset} + + +
+ +
+

+ Вы вошли как {$thisUser->getCanonicalName()}. Пожалуйста, уважайте + право на тайну переписки других людей и не злоупотребляйте подменой пользователя. + Нажмите здесь, чтобы выйти. +

+
-
FOR TESTING PURPOSES ONLY
+
FOR TESTING PURPOSES ONLY
-
-
+
+
-
- {_close} -
-
-
- -
- - +
+ {_close} +
+
+
+ +
+ + +
+
+ +
+ {_aw_legacy_ui}
-
- {_aw_legacy_ui} +
+
-
+ {if isset($backdrops) && !is_null($backdrops)} +
+
+ {/if} + +
+ ⬆ {_to_top}
-
- {if isset($backdrops) && !is_null($backdrops)} -
-
-
- {/if} +
+
+
+ {if $instance_name != OPENVK_DEFAULT_INSTANCE_NAME}{$instance_name}{/if} +
+ {ifset $thisUser} + {if $thisUser->isDeactivated()} +
+ {_header_log_out} +
+ {else} +
+ {_header_home} +
+
+ {_header_groups} +
+
+ {_header_search} +
+
+ {_header_invite} +
+
+ {_header_help} ({$ticketAnsweredCount}) +
+
+ {_header_log_out} +
+ {var $atSearch = str_contains($_SERVER['REQUEST_URI'], "/search")} +
-
- ⬆ {_to_top} -
- -
-
-
- {if $instance_name != OPENVK_DEFAULT_INSTANCE_NAME}{$instance_name}{/if} -
- {ifset $thisUser} - {if $thisUser->isDeactivated()} + {if !$atSearch} +
+ + +
+ + {else} +
+ + + +
+ + {/if} +
+ {/if} + {else}
- {_header_log_out} + {_header_login}
- {else} -
- {_header_home} +
+ {_header_registration}
-
- {_header_groups} +
+ {_header_help}
-
- {_header_search} -
-
- {_header_invite} -
-
- {_header_help} ({$ticketAnsweredCount}) -
-
- {_header_log_out} -
- {var $atSearch = str_contains($_SERVER['REQUEST_URI'], "/search")} -
- - {if !$atSearch} -
- - -
- - {else} -
- - - -
- - {/if} -
- {/if} - {else} -
- {_header_login} -
-
- {_header_registration} -
-
- {_header_help} -
- {/ifset} + {/ifset} +
-
-
-
- {ifset $thisUser} - {if !$thisUser->isBanned() XOR !$thisUser->isActivated() XOR $thisUser->isDeactivated()} - {_edit_button} - {_my_page} - {_my_friends} - - - ({$thisUser->getFollowersCount()}) - - - - {_my_photos} - {_my_videos} - {_my_messages} - - ({$thisUser->getUnreadMessagesCount()}) - - - {_my_notes} - {_my_groups} - {_my_feed} - {_my_feedback} - {if $thisUser->getNotificationsCount() > 0} - ({$thisUser->getNotificationsCount()}) - {/if} - - {_my_apps} - {_my_settings} - - {var $canAccessAdminPanel = $thisUser->getChandlerUser()->can("access")->model("admin")->whichBelongsTo(NULL)} - {var $canAccessHelpdesk = $thisUser->getChandlerUser()->can("write")->model('openvk\Web\Models\Entities\TicketReply')->whichBelongsTo(0)} - {var $menuLinksAvaiable = sizeof(OPENVK_ROOT_CONF['openvk']['preferences']['menu']['links']) > 0 && $thisUser->getLeftMenuItemStatus('links')} -
- {_admin} - {_helpdesk} - {if $helpdeskTicketNotAnsweredCount > 0} - ({$helpdeskTicketNotAnsweredCount}) - {/if} - - - {strpos($menuItem["name"], "@") === 0 ? tr(substr($menuItem["name"], 1)) : $menuItem["name"]} - -
-
- {$club->getName()} -
- -
- {tr("you_still_have_x_points", $thisUser->getCoins())|noescape} -

- - {_top_up_your_account} » -
- - - {php echo OPENVK_ROOT_CONF['openvk']['preferences']['adPoster']['caption']} - - -
- +
+
+ {ifset $thisUser} + {if !$thisUser->isBanned() XOR !$thisUser->isActivated() XOR $thisUser->isDeactivated()} + {_edit_button} + {_my_page} + {_my_friends} -
- +{$thisUser->getFollowersCount()} -
+ + ({$thisUser->getFollowersCount()}) + - - - - - + {_my_photos} + {_my_videos} + {_my_messages} -
- +{$thisUser->getUnreadMessagesCount()} -
+ ({$thisUser->getUnreadMessagesCount()}) - - - + {_my_notes} + {_my_groups} + {_my_feed} + {_my_feedback} + {if $thisUser->getNotificationsCount() > 0} + ({$thisUser->getNotificationsCount()}) + {/if} - - -
- +{$thisUser->getNotificationsCount()} -
- - - -
- {elseif !$thisUser->isActivated()} - {_menu_logout} - {else} - {_menu_support} - {if $ticketAnsweredCount > 0} - ({$ticketAnsweredCount}) - {/if} - - {_menu_logout} - {/if} - {else} -
- - - - - - - -

- {if !OPENVK_ROOT_CONF['openvk']['preferences']['security']['disablePasswordRestoring']}{_forgot_password}{/if} -
- {/ifset} -
-
+ {_my_apps} + {_my_settings} -
-
-
-
- {include header} + {var $canAccessAdminPanel = $thisUser->getChandlerUser()->can("access")->model("admin")->whichBelongsTo(NULL)} + {var $canAccessHelpdesk = $thisUser->getChandlerUser()->can("write")->model('openvk\Web\Models\Entities\TicketReply')->whichBelongsTo(0)} + {var $menuLinksAvaiable = sizeof(OPENVK_ROOT_CONF['openvk']['preferences']['menu']['links']) > 0 && $thisUser->getLeftMenuItemStatus('links')} +
+ {_admin} + {_helpdesk} + {if $helpdeskTicketNotAnsweredCount > 0} + ({$helpdeskTicketNotAnsweredCount}) + {/if} + + + {strpos($menuItem["name"], "@") === 0 ? tr(substr($menuItem["name"], 1)) : $menuItem["name"]} + +
+
+ {$club->getName()} +
+ +
+ {tr("you_still_have_x_points", $thisUser->getCoins())|noescape} +

+ + {_top_up_your_account} » +
+ + + {php echo OPENVK_ROOT_CONF['openvk']['preferences']['adPoster']['caption']} + + +
+ + +
+ +{$thisUser->getFollowersCount()} +
+ + + + + + + + +
+ +{$thisUser->getUnreadMessagesCount()} +
+ + + + + + + + +
+ +{$thisUser->getNotificationsCount()} +
+ + + +
+ {elseif !$thisUser->isActivated()} + {_menu_logout} + {else} + {_menu_support} + {if $ticketAnsweredCount > 0} + ({$ticketAnsweredCount}) + {/if} + + {_menu_logout} + {/if} + {else} +
+ + + + + + + +

+ {if !OPENVK_ROOT_CONF['openvk']['preferences']['security']['disablePasswordRestoring']}{_forgot_password}{/if} +
+ {/ifset} +
+
+ +
+
+
+
+ {include header} +
-
- {ifset wrap} -
- {$flashMessage->title}
- {$flashMessage->msg|noescape} -
+ {ifset wrap} +
+ {$flashMessage->title}
+ {$flashMessage->msg|noescape} +
- {include wrap} - {else} -
-
-
-
-
- {$flashMessage->title}
- {$flashMessage->msg|noescape} + {include wrap} + {else} +
+
+
+
+
+ {$flashMessage->title}
+ {$flashMessage->msg|noescape} +
+ + {include content}
- - {include content}
-
- {/ifset} + {/ifset} +
-
-
- {var $dbVersion = \Chandler\Database\DatabaseConnection::i()->getConnection()->getPdo()->getAttribute(\PDO::ATTR_SERVER_VERSION)} +
+ {var $dbVersion = \Chandler\Database\DatabaseConnection::i()->getConnection()->getPdo()->getAttribute(\PDO::ATTR_SERVER_VERSION)} -
- {_footer_about_instance} - {_footer_rules} - {_footer_blog} - {_footer_help} - {_footer_developers} - {_footer_privacy} +
+ {_footer_about_instance} + {_footer_rules} + {_footer_blog} + {_footer_help} + {_footer_developers} + {_footer_privacy} +
+

+ {var $currentUrl = $_SERVER["REQUEST_URI"]} + {foreach array_slice(getLanguages(), 0, 3) as $language} + + {$language['native_name']} + + {/foreach} + all languages » +

+

OpenVK {php echo OPENVK_VERSION} | PHP: {phpversion()} | DB: {$dbVersion}

+

+ {php echo OPENVK_ROOT_CONF["openvk"]["appearance"]["motd"]} +

-

- {var $currentUrl = $_SERVER["REQUEST_URI"]} - {foreach array_slice(getLanguages(), 0, 3) as $language} - - {$language['native_name']} - - {/foreach} - all languages » -

-

OpenVK {php echo OPENVK_VERSION} | PHP: {phpversion()} | DB: {$dbVersion}

-

- {php echo OPENVK_ROOT_CONF["openvk"]["appearance"]["motd"]} -

-
- {include "components/cookies.xml"} + {include "components/cookies.xml"} - {script "js/node_modules/msgpack-lite/dist/msgpack.min.js"} - {script "js/node_modules/soundjs/lib/soundjs.min.js"} - {script "js/node_modules/ky/umd.js"} - {script "js/messagebox.js"} - {script "js/notifications.js"} - {script "js/scroll.js"} - {script "js/player.js"} - {script "js/al_wall.js"} - {script "js/al_api.js"} - {script "js/al_mentions.js"} - {script "js/al_polls.js"} + {script "js/node_modules/msgpack-lite/dist/msgpack.min.js"} + {script "js/node_modules/soundjs/lib/soundjs.min.js"} + {script "js/node_modules/ky/umd.js"} + {script "js/messagebox.js"} + {script "js/notifications.js"} + {script "js/scroll.js"} + {script "js/player.js"} + {script "js/al_wall.js"} + {script "js/al_api.js"} + {script "js/al_mentions.js"} + {script "js/al_polls.js"} - {ifset $thisUser} - {script "js/al_notifs.js"} - {/ifset} + {ifset $thisUser} + {script "js/al_notifs.js"} + {/ifset} - {if OPENVK_ROOT_CONF['openvk']['preferences']['bellsAndWhistles']['fartscroll']} - - + + {/if} + + + + + + - {/if} - + - - - - - + {ifset bodyScripts} + {include bodyScripts} + {/ifset} - {ifset bodyScripts} - {include bodyScripts} - {/ifset} - - -{/if} + {script "js/node_modules/requirejs/bin/r.js"} + +
+ + + {/if} -{if isset($parentModule) && substr($parentModule, 0, 21) !== 'libchandler:absolute.'} - + {if isset($parentModule) && substr($parentModule, 0, 21) !== 'libchandler:absolute.'} + - {include content} -{/if} + {include content} + {/if} +{/if} \ No newline at end of file diff --git a/Web/Presenters/templates/Group/View.xml b/Web/Presenters/templates/Group/View.xml index bf392a9f..17e5e1fc 100644 --- a/Web/Presenters/templates/Group/View.xml +++ b/Web/Presenters/templates/Group/View.xml @@ -120,7 +120,7 @@