From 5b5f64997b8f9160a7cfbd99543b11bd56a6e9cc Mon Sep 17 00:00:00 2001 From: celestora Date: Tue, 11 Oct 2022 21:08:21 +0300 Subject: [PATCH] Fix wall bugs spawned after recent change in chandler --- Web/Presenters/WallPresenter.php | 11 ++++------- Web/Presenters/templates/Wall/Feed.xml | 2 +- Web/Presenters/templates/components/textArea.xml | 2 +- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/Web/Presenters/WallPresenter.php b/Web/Presenters/WallPresenter.php index ef62d0ea..cade97ca 100644 --- a/Web/Presenters/WallPresenter.php +++ b/Web/Presenters/WallPresenter.php @@ -45,9 +45,6 @@ final class WallPresenter extends OpenVKPresenter function renderWall(int $user, bool $embedded = false): void { - if(false) - exit(tr("forbidden") . ": " . (string) random_int(0, 255)); - $owner = ($user < 0 ? (new Clubs) : (new Users))->get(abs($user)); if(is_null($this->user)) { $canPost = false; @@ -66,7 +63,10 @@ final class WallPresenter extends OpenVKPresenter } if ($embedded == true) $this->template->_template = "components/wall.xml"; - $this->template->oObj = $owner; + $this->template->oObj = $owner; + if($user < 0) + $this->template->club = $owner; + $this->template->owner = $user; $this->template->canPost = $canPost; $this->template->count = $this->posts->getPostCountOnUserWall($user); @@ -89,9 +89,6 @@ final class WallPresenter extends OpenVKPresenter function renderRSS(int $user): void { - if(false) - exit(tr("forbidden") . ": " . (string) random_int(0, 255)); - $owner = ($user < 0 ? (new Clubs) : (new Users))->get(abs($user)); if(is_null($this->user)) { $canPost = false; diff --git a/Web/Presenters/templates/Wall/Feed.xml b/Web/Presenters/templates/Wall/Feed.xml index f5c6ae50..b7f405a4 100644 --- a/Web/Presenters/templates/Wall/Feed.xml +++ b/Web/Presenters/templates/Wall/Feed.xml @@ -16,7 +16,7 @@
- {include "../components/textArea.xml", route => "/wall" . $thisUser->getId() . "/makePost"} + {include "../components/textArea.xml", route => "/wall" . $thisUser->getId() . "/makePost", graffiti => true, polls => true}
{foreach $posts as $post} diff --git a/Web/Presenters/templates/components/textArea.xml b/Web/Presenters/templates/components/textArea.xml index 0d28e06e..daa25f4c 100644 --- a/Web/Presenters/templates/components/textArea.xml +++ b/Web/Presenters/templates/components/textArea.xml @@ -16,7 +16,6 @@
{var $anonEnabled = OPENVK_ROOT_CONF['openvk']['preferences']['wall']['anonymousPosting']['enable']} - {if !is_null($thisUser) && !is_null($club ?? NULL) && $owner < 0} {if $club->canBeModifiedBy($thisUser)}