Lanmikeman/openvk
Lanmikeman/openvk
1
1
Fork 0
mirror of https://github.com/openvk/openvk synced 2024-09-21 16:38:26 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:openvk/openvk

Browse source
This commit is contained in:
veselcraft 2022-05-26 15:25:28 +03:00
commit b3e597959c
No known key found for this signature in database
GPG key ID: AED66BC1AC628A4E
8 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
CODE-OF-CONFLICT.md → CODE_OF_CONFLICT.md
View file

0
CODE-STYLE.md → CODE_STYLE.md
View file

3
Web/Presenters/UserPresenter.php
View file

@ -90,6 +90,9 @@ final class UserPresenter extends OpenVKPresenter
elseif (!$user->getPrivacyPermission('groups.read', $this->user->identity ?? NULL)) elseif (!$user->getPrivacyPermission('groups.read', $this->user->identity ?? NULL))
$this->flashFail("err", tr("forbidden"), tr("forbidden_comment")); $this->flashFail("err", tr("forbidden"), tr("forbidden_comment"));
else { else {
if($this->queryParam("act") === "managed" && $this->user->id !== $user->getId())
$this->flashFail("err", tr("forbidden"), tr("forbidden_comment"));
$this->template->user = $user; $this->template->user = $user;
$this->template->page = (int) ($this->queryParam("p") ?? 1); $this->template->page = (int) ($this->queryParam("p") ?? 1);
$this->template->admin = $this->queryParam("act") == "managed"; $this->template->admin = $this->queryParam("act") == "managed";

2
Web/Presenters/templates/@listView.xml
View file

@ -4,7 +4,7 @@
<div class="wrap2"> <div class="wrap2">
<div class="wrap1"> <div class="wrap1">
<div class="page_wrap padding_top"> <div class="page_wrap padding_top">
<div n:ifset="tabs" class="tabs"> <div n:ifset="tabs" n:ifcontent class="tabs">
{include tabs} {include tabs}
</div> </div>

6
Web/Presenters/templates/User/Groups.xml
View file

@ -32,7 +32,7 @@
{/block} {/block}
{block size} {block size}
<div style="padding-bottom: 0px;" class="summaryBar"> <div style="padding-bottom: 0px; {if is_null($thisUser) || $user->getId() !== $thisUser->getId()}padding-top: 0px;{/if}" class="summaryBar">
<div class="summary"> <div class="summary">
{if !is_null($thisUser) && $user->getId() === $thisUser->getId()} {if !is_null($thisUser) && $user->getId() === $thisUser->getId()}
{tr("groups_list", $thisUser->getClubCount())} {tr("groups_list", $thisUser->getClubCount())}
@ -90,7 +90,7 @@
{/if} {/if}
<form action="/setSub/club" method="post"> <form action="/setSub/club" method="post">
<input type="hidden" name="act" value="rem" /> <input type="hidden" name="act" value="rem" />
<input type="hidden" name="id" value="{$x->getId()}" /> <input type="hidden" name="id" value="{$x->getId()}" />
<input type="hidden" name="hash" value="{$csrfToken}" /> <input type="hidden" name="hash" value="{$csrfToken}" />
<input style="text-transform: lowercase; width: 100%;" class="link" type="submit" value="{_"leave_community"}" /> <input style="text-transform: lowercase; width: 100%;" class="link" type="submit" value="{_"leave_community"}" />
</form> </form>
@ -101,7 +101,7 @@
{block bottom} {block bottom}
{if !is_null($thisUser) && $user->getId() === $thisUser->getId()} {if !is_null($thisUser) && $user->getId() === $thisUser->getId()}
<div class="groups_options"> <div class="groups_options">
<div id="gp_container" style="width: 200px; margin-right: 40px;"> <div id="gp_container" style="width: 200px; margin-right: 39px;">
<h4>{_open_new_group}</h4> <h4>{_open_new_group}</h4>
<span>{_open_group_desc}</span> <span>{_open_group_desc}</span>
<form action="/groups_create"> <form action="/groups_create">

2
Web/static/css/avatar.1.css
View file

@ -6,7 +6,7 @@ table.User > tbody:nth-child(1) > tr:nth-child(1) > td:nth-child(1) > a:nth-chil
object-fit: cover; object-fit: cover;
} }
.post > tbody:nth-child(1) > tr:nth-child(1) > td:nth-child(1) > img:nth-child(1) .post > tbody:nth-child(1) > tr:nth-child(1) > td:nth-child(1) > a:nth-child(1) > img:nth-child(1)
{ {
width: 50px; width: 50px;
height: 50px; height: 50px;

2
Web/static/css/avatar.2.css
View file

@ -11,7 +11,7 @@ table.User > tbody:nth-child(1) > tr:nth-child(1) > td:nth-child(1) > a:nth-chil
border-radius: 100px; border-radius: 100px;
} }
.post > tbody:nth-child(1) > tr:nth-child(1) > td:nth-child(1) > img:nth-child(1) .post > tbody:nth-child(1) > tr:nth-child(1) > td:nth-child(1) > a:nth-child(1) > img:nth-child(1)
{ {
width: 50px; width: 50px;
height: 50px; height: 50px;

2
Web/static/js/openvk.cls.js
View file

@ -171,7 +171,7 @@ function repostPost(id, hash) {
xhr.setRequestHeader('Content-type', 'application/x-www-form-urlencoded'); xhr.setRequestHeader('Content-type', 'application/x-www-form-urlencoded');
xhr.onload = (function() { xhr.onload = (function() {
if(xhr.responseText.indexOf("wall_owner") === -1) if(xhr.responseText.indexOf("wall_owner") === -1)
MessageBox(tr('error'), tr('error_repost_fail'), tr('ok'), [Function.noop]); MessageBox(tr('error'), tr('error_repost_fail'), [tr('ok')], [Function.noop]);
else { else {
let jsonR = JSON.parse(xhr.responseText); let jsonR = JSON.parse(xhr.responseText);
NewNotification(tr('information_-1'), tr('shared_succ'), null, () => {window.location.href = "/wall" + jsonR.wall_owner}); NewNotification(tr('information_-1'), tr('shared_succ'), null, () => {window.location.href = "/wall" + jsonR.wall_owner});