diff --git a/Web/Models/Repositories/Clubs.php b/Web/Models/Repositories/Clubs.php index 17ae58f2..bea73cef 100644 --- a/Web/Models/Repositories/Clubs.php +++ b/Web/Models/Repositories/Clubs.php @@ -37,6 +37,24 @@ class Clubs return new Util\EntityStream("Club", $result); } + + function getCount(): int + { + return sizeof(clone $this->clubs); + } + + function getPopularClubs(): \Traversable + { + $query = "SELECT ROW_NUMBER() OVER (ORDER BY `subscriptions` DESC) as `place`, `target` as `id`, COUNT(`follower`) as `subscriptions` FROM `subscriptions` WHERE `model` = \"openvk\\\Web\\\Models\\\Entities\\\Club\" GROUP BY `target` ORDER BY `subscriptions` DESC, `id` LIMIT 10;"; + $entries = DatabaseConnection::i()->getConnection()->query($query); + + foreach($entries as $entry) + yield (object) [ + "place" => $entry["place"], + "club" => $this->get($entry["id"]), + "subscriptions" => $entry["subscriptions"], + ]; + } use \Nette\SmartObject; } diff --git a/Web/Models/Repositories/Posts.php b/Web/Models/Repositories/Posts.php index 0e7aed80..ba590baf 100644 --- a/Web/Models/Repositories/Posts.php +++ b/Web/Models/Repositories/Posts.php @@ -105,4 +105,9 @@ class Posts { return sizeof($this->posts->where(["wall" => $user, "deleted" => 0])); } + + function getCount(): int + { + return sizeof(clone $this->posts); + } } diff --git a/Web/Models/Repositories/Users.php b/Web/Models/Repositories/Users.php index 9342b647..e99611b2 100644 --- a/Web/Models/Repositories/Users.php +++ b/Web/Models/Repositories/Users.php @@ -69,6 +69,24 @@ class Users return $this->getByShortUrl($address); } + + /** + * If you need to check if the user is an instance administrator, use `$user->getChandlerUser()->can("access")->model("admin")->whichBelongsTo(NULL)`. + * This method is more suitable for instance administrators lists + */ + function getInstanceAdmins(bool $excludeHidden = true): \Traversable + { + $query = "SELECT DISTINCT(`profiles`.`id`) FROM `ChandlerACLRelations` JOIN `profiles` ON `ChandlerACLRelations`.`user` = `profiles`.`user` COLLATE utf8mb4_unicode_520_ci WHERE `ChandlerACLRelations`.`group` IN (SELECT `group` FROM `ChandlerACLGroupsPermissions` WHERE `model` = \"admin\" AND `permission` = \"access\")"; + + if($excludeHidden) + $query .= " AND `ChandlerACLRelations`.`user` NOT IN (SELECT `user` FROM `ChandlerACLRelations` WHERE `group` IN (SELECT `group` FROM `ChandlerACLGroupsPermissions` WHERE `model` = \"hidden_admin\" AND `permission` = \"be\"))"; + + $query .= " ORDER BY `profiles`.`id`;"; + + $result = DatabaseConnection::i()->getConnection()->query($query); + foreach($result as $entry) + yield $this->get($entry->id); + } use \Nette\SmartObject; } diff --git a/Web/Presenters/AboutPresenter.php b/Web/Presenters/AboutPresenter.php index 550fc8f0..f7131772 100644 --- a/Web/Presenters/AboutPresenter.php +++ b/Web/Presenters/AboutPresenter.php @@ -1,7 +1,7 @@ template->themes = Themepacks::i()->getAllThemes(); $this->template->languages = getLanguages(); } + + function renderAboutInstance(): void + { + $this->template->usersStats = (new Users)->getStatistics(); + $this->template->clubsCount = (new Clubs)->getCount(); + $this->template->postsCount = (new Posts)->getCount(); + $this->template->popularClubs = (new Clubs)->getPopularClubs(); + $this->template->admins = iterator_to_array((new Users)->getInstanceAdmins()); + } function renderLanguage(): void { diff --git a/Web/Presenters/templates/@layout.xml b/Web/Presenters/templates/@layout.xml index ffd9b6a0..5eeff060 100644 --- a/Web/Presenters/templates/@layout.xml +++ b/Web/Presenters/templates/@layout.xml @@ -267,6 +267,7 @@ {var dbVersion = \Chandler\Database\DatabaseConnection::i()->getConnection()->getPdo()->getAttribute(\PDO::ATTR_SERVER_VERSION)}
+ {_footer_about_instance} {_footer_blog} {_footer_help} {_footer_developers} diff --git a/Web/Presenters/templates/About/AboutInstance.xml b/Web/Presenters/templates/About/AboutInstance.xml new file mode 100644 index 00000000..61bd9d2f --- /dev/null +++ b/Web/Presenters/templates/About/AboutInstance.xml @@ -0,0 +1,59 @@ +{extends "../@layout.xml"} +{block title}{_about_this_instance}{/block} + +{block header} + {_about_this_instance} +{/block} + +{block content} + + + + + + + +
0}style="padding-right: 10px;"{/if}> +

{_statistics}

+
+ {_on_this_instance_are} +
    +
  • {tr("about_users", $usersStats->all)|noescape}
    • +
  • {tr("about_online_users", $usersStats->online)|noescape}
    • +
  • {tr("about_active_users", $usersStats->active)|noescape}
    • +
  • {tr("about_groups", $clubsCount)|noescape}
    • +
  • {tr("about_wall_posts", $postsCount)|noescape}
    • +
+
+ 		+

{_administrators}

+
+
+
+ + + +
+ {* Это наверное костыль, ну да ладно *} + +
+
+
+ +

{_most_popular_groups}

+
    +
  1. + {$entry->club->getName()} +
    + {tr("participants", $entry->subscriptions)} +
    +
    2. +
+ +

{_rules}

+
+ {presenter "openvk!Support->knowledgeBaseArticle", "rules"} +
+{/block} diff --git a/Web/routes.yml b/Web/routes.yml index b55ba62a..16068f37 100644 --- a/Web/routes.yml +++ b/Web/routes.yml @@ -39,6 +39,8 @@ routes: handler: "About->version" placeholders: productName: "openvk[2]?|libresoc" + - url: "/about" + handler: "About->aboutInstance" - url: "/privacy" handler: "About->Privacy" - url: "/badbrowser.php" diff --git a/locales/en.strings b/locales/en.strings index d6def6e6..c143ce82 100644 --- a/locales/en.strings +++ b/locales/en.strings @@ -338,6 +338,7 @@ "left_menu_donate" = "Donate"; +"footer_about_instance" = "about instance"; "footer_blog" = "blog"; "footer_help" = "help"; "footer_developers" = "developers"; @@ -761,6 +762,26 @@ "about_openvk" = "About OpenVK"; +"about_this_instance" = "About this instance"; +"rules" = "Rules"; +"most_popular_groups" = "Most popular groups"; +"on_this_instance_are" = "On this instance are:"; + +"about_users_one" = "1 user"; +"about_users_other" = "$1 users"; + +"about_online_users_one" = "1 online user"; +"about_online_users_other" = "$1 online users"; + +"about_active_users_one" = "1 active user"; +"about_active_users_other" = "$1 active users"; + +"about_groups_one" = "1 group"; +"about_groups_other" = "$1 groups"; + +"about_wall_posts_one" = "1 wall post"; +"about_wall_posts_other" = "$1 wall posts"; + /* Dialogs */ "ok" = "OK"; diff --git a/locales/ru.strings b/locales/ru.strings index ead87297..3c39b572 100644 --- a/locales/ru.strings +++ b/locales/ru.strings @@ -356,6 +356,7 @@ "left_menu_donate" = "Поддержать"; +"footer_about_instance" = "об инстанции"; "footer_blog" = "блог"; "footer_help" = "помощь"; "footer_developers" = "разработчикам"; @@ -796,6 +797,36 @@ "about_openvk" = "Об OpenVK"; +"about_this_instance" = "Об этой инстанции"; +"rules" = "Правила"; +"most_popular_groups" = "Самые популярные группы"; +"on_this_instance_are" = "На этой инстанции:"; + +"about_users_one" = "1 пользователь"; +"about_users_few" = "$1 пользователя"; +"about_users_many" = "$1 пользователей"; +"about_users_other" = "$1 пользователей"; + +"about_online_users_one" = "1 пользователь в сети"; +"about_online_users_few" = "$1 пользователя в сети"; +"about_online_users_many" = "$1 пользователей в сети"; +"about_online_users_other" = "$1 пользователей в сети"; + +"about_active_users_one" = "1 активный пользователь"; +"about_active_users_few" = "$1 активных пользователя"; +"about_active_users_many" = "$1 активных пользователей"; +"about_active_users_other" = "$1 активных пользователей"; + +"about_groups_one" = "1 группа"; +"about_groups_few" = "$1 группы"; +"about_groups_many" = "$1 групп"; +"about_groups_other" = "$1 групп"; + +"about_wall_posts_one" = "1 запись на стенах"; +"about_wall_posts_few" = "$1 записи на стенах"; +"about_wall_posts_many" = "$1 записей на стенах"; +"about_wall_posts_other" = "$1 записей на стенах"; + /* Dialogs */ "ok" = "ОК";