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

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "Web/static/img/oxygen-icons"]
-	path = Web/static/img/oxygen-icons
-	url = https://github.com/KDE/oxygen-icons5.git

Web/Models/Entities/Comment.php

@@ -34,11 +34,16 @@ class Comment extends Post
      */
     function getOwner(bool $honourFlags = true, bool $real = false): RowModel
     {
-        if($honourFlags && $this->isPostedOnBehalfOfGroup()) {
+        if($honourFlags && $this->isPostedOnBehalfOfGroup() && $this->getTarget() instanceof Post)
-            if($this->getTarget() instanceof Post)
             return (new Clubs)->get(abs($this->getTarget()->getTargetWall()));
-        }
 
         return parent::getOwner($honourFlags, $real);
     }
+
+    function canBeDeletedBy(User $user): bool
+    {
+        return $this->getOwner()->getId() == $user->getId() ||
+               $this->getTarget()->getOwner()->getId() == $user->getId() ||
+               $this->getTarget() instanceof Post && $this->getTarget()->getTargetWall() < 0 && (new Clubs)->get(abs($this->getTarget()->getTargetWall()))->canBeModifiedBy($user);
+    }
 }

Web/Models/Entities/Traits/TRichText.php

@@ -1,5 +1,6 @@
 <?php declare(strict_types=1);
 namespace openvk\Web\Models\Entities\Traits;
+use Wkhooy\ObsceneCensorRus;
 
 trait TRichText
 {
@@ -69,6 +70,9 @@ trait TRichText
             $text = nl2br($text);
         }
         
+        if(OPENVK_ROOT_CONF["openvk"]["preferences"]["wall"]["christian"])
+            ObsceneCensorRus::filterText($text);
+        
         return $text;
     }
 }

Web/Presenters/CommentPresenter.php

@@ -106,8 +106,7 @@ final class CommentPresenter extends OpenVKPresenter
         
         $comment = (new Comments)->get($id);
         if(!$comment) $this->notFound();
-        if($comment->getOwner()->getId() !== $this->user->id)
+        if(!$comment->canBeDeletedBy($this->user->identity))
-            if($comment->getTarget()->getOwner()->getId() !== $this->user->id)
             $this->throwError(403, "Forbidden", "У вас недостаточно прав чтобы редактировать этот ресурс.");
         
         $comment->delete();

Web/Presenters/OpenVKPresenter.php

@@ -198,6 +198,7 @@ abstract class OpenVKPresenter extends SimplePresenter
                 header("HTTP/1.1 403 Forbidden");
                 $this->getTemplatingEngine()->render(__DIR__ . "/templates/@banned.xml", [
                     "thisUser" => $this->user->identity,
+                    "csrfToken" => $GLOBALS["csrfToken"],
                 ]);
                 exit;
             }
@@ -221,25 +222,23 @@ abstract class OpenVKPresenter extends SimplePresenter
     {
         parent::onBeforeRender();
         
-        if(!is_null($this->user)) {                                                                                                                                            
+        $theme = NULL;
+        if(Session::i()->get("_tempTheme")) {
+            $theme = Themepacks::i()[Session::i()->get("_tempTheme", "ovk")];
+            Session::i()->set("_tempTheme", NULL);
+        } else if($this->requestParam("themePreview")) {
+            $theme = Themepacks::i()[$this->requestParam("themePreview")];
+        } else if($this->user->identity !== null && $this->user->identity->getTheme()) {
             $theme = $this->user->identity->getTheme();
-            if(!is_null($theme) && $theme->overridesTemplates()) {                                                                                                             
+        }
+        
+        $this->template->theme = $theme;
+        if(!is_null($theme) && $theme->overridesTemplates())                                                                                                   
             $this->template->_templatePath = $theme->getBaseDir() . "/tpl";
-            }                                                                                                                 
-        }
         
         if(!is_null(Session::i()->get("_error"))) {
             $this->template->flashMessage = json_decode(Session::i()->get("_error"));
             Session::i()->set("_error", NULL);
         }
-
-		if(Session::i()->get("_tempTheme"))
-           	$this->template->theme = Themepacks::i()[Session::i()->get("_tempTheme", "ovk")];
-		else if($this->requestParam("themePreview"))
-			$this->template->theme = Themepacks::i()[$this->requestParam("themePreview")];
-        else if($this->user->identity !== null && $this->user->identity->getTheme())
-			$this->template->theme = $this->user->identity->getTheme();
-
-		// Знаю, каша ебаная, целестора рефактор всё равно сделает :)))
     }
 } 

Web/Presenters/templates/@banned.xml

@@ -1,22 +1,20 @@
 {extends "@layout.xml"}
-{block title}Вам бан{/block}
+{block title}{_"banned_title"}{/block}
 
 {block header}
-    Вы были верискокнуты
+    {_"banned_header"}
 {/block}
 
 {block content}
     <center>
-        <img src="/assets/packages/static/openvk/img/oof.apng" alt="Пользователь заблокирован." style="width: 20%;" />
+        <img src="/assets/packages/static/openvk/img/oof.apng" alt="{_'banned_alt'}" style="width: 20%;" />
     </center>
     <p>
-        Извините, <b>{$thisUser->getCanonicalName()}</b>, но вы были верискокнуты.<br/>
+        {tr("banned_1", htmlentities($thisUser->getCanonicalName()))|noescape}<br/>
-        А причина этому проста: <b>{$thisUser->getBanReason()}</b>. К сожалению, на этот раз
+        {tr("banned_2", htmlentities($thisUser->getBanReason()))|noescape}
-        нам пришлось заблокировать вас навсегда.
     </p>
     <hr/>
     <p>
-        Вы всё ещё можете <a href="/support?act=new">написать в службу поддержки</a>, если считаете что произошла ошибка
+        {tr("banned_3", urlencode($csrfToken))|noescape}
-        или <a href="/logout">выйти</a>.
     </p>
 {/block}

Web/Presenters/templates/@layout.xml

@@ -201,8 +201,8 @@
                                 style="max-width: 100%; margin-top: 50px;" />
                         </a>
                     {else}
-                        <a href="/support" class="link">Поддержка</a>
+                        <a href="/support" class="link">{_"menu_support"}</a>
-                        <a href="/logout" class="link">Выйти</a>
+                        <a href="/logout?hash={urlencode($csrfToken)}" class="link">{_"menu_logout"}</a>
                     {/if}
                 {else}
                     <form id="fastLogin" action="/login" method="POST" enctype="multipart/form-data">

Web/Presenters/templates/Search/Index.xml

@@ -9,7 +9,7 @@
 {/block}
 
 {block header}
-    OpenVK »
+    {=OPENVK_ROOT_CONF["openvk"]["appearance"]["name"]} »
     {if $type === "users"}
         {tr("search_for_people")}
     {else}
@@ -21,7 +21,7 @@
     <form style="margin-left: 12px;">
         <input name="type" type="hidden" value="{$_GET['type'] ?? 'users'}" />
         <input name="query" type="text" placeholder="{_"header_search"}" value="{$_GET['query'] ?? ''}" style="width: 90%" />
-        <input type="submit" class="button" value="{_"search_button"}" style="width: 9%" />
+        <input type="submit" class="button" value="{_"search_button"}" style="width: 7%" />
     </form>
     
     <p style="margin-left: 15px;">

Web/Presenters/templates/User/banned.xml

@@ -1,7 +1,7 @@
 <center>
     <img src="/assets/packages/static/openvk/img/oof.apng" alt="Пользователь заблокирован." style="width: 20%;" />
     <p>
-        К сожалению, нам пришлось заблокировать страницу пользователя <b>{$user->getFirstName()}</b>.<br/>
+        {tr("user_banned", htmlentities($user->getFirstName()))|noescape}<br/>
-        Комментарий модератора: <b>{$user->getBanReason()}</b>.
+        {_"user_banned_comment"} <b>{$user->getBanReason()}</b>.
     </p>
 </center>

Web/Presenters/templates/components/comment.xml

@@ -29,9 +29,7 @@
                     </div>
                     <div n:if="isset($thisUser) &&! ($compact ?? false)" class="post-menu">
                         <a href="#_comment{$comment->getId()}" class="date">{$comment->getPublicationTime()}</a>&nbsp;|
-                        {var canDelete = $comment->getOwner()->getId() == $thisUser->getId()}
+                        {if $comment->canBeDeletedBy($thisUser)}
-                        {var canDelete = $canDelete || $comment->getTarget()->getOwner()->getId() == $thisUser->getId()}
-                        {if $canDelete}
                             <a href="/comment{$comment->getId()}/delete">{_"delete"}</a>&nbsp;|
                         {/if}
                         <a class="comment-reply">Ответить</a>

Web/Presenters/templates/components/comments.xml

@@ -10,7 +10,9 @@
     {foreach $comments as $comment}
         {include "comment.xml", comment => $comment}
     {/foreach}
+    <div style="margin-top: 11px;">
         {include "paginator.xml", conf => (object) ["page" => $page, "count" => $count, "amount" => sizeof($comments), "perPage" => 10]}
+    </div>
 {else}
     <!-- {if $model === "photos"}
         <p>Будьте первым, кто оставит комментарий к этой фотографии</p>

Web/Presenters/templates/components/textArea.xml

@@ -8,7 +8,7 @@
         </div>
         <div id="post-buttons{$textAreaId}" style="display: none;">
             <div class="post-upload">
-                Вложение: <span>(unknown)</span>
+                {_attachment}: <span>(unknown)</span>
             </div>
             <div n:if="$postOpts ?? true" class="post-opts">
                 {var anonEnabled = OPENVK_ROOT_CONF['openvk']['preferences']['wall']['anonymousPosting']['enable']}
@@ -35,7 +35,7 @@
                 {/if}
                 
                 <label n:if="$anonEnabled" id="octoberAnonOpt">
-                    <input type="checkbox" name="anon" /> Анонимно
+                    <input type="checkbox" name="anon" /> {_"as_anonymous"}
                 </label>
                 
                 <label>
@@ -55,7 +55,7 @@
             <input type="submit" value="{_'write'}" class="button" />
             <div style="float: right; display: flex; flex-direction: column;">
                 <a href="javascript:void(u('#post-buttons{$textAreaId} #wallAttachmentMenu').toggleClass('hidden'));">
-                    Прикрепить
+                    {_attach}
                 </a>
                 
                 <div id="wallAttachmentMenu" class="hidden">
@@ -65,11 +65,11 @@
                     </a>
                     <a href="javascript:void(document.querySelector('#post-buttons{$textAreaId} input[name=_vid_attachment]').click());">
                         <img src="/assets/packages/static/openvk/img/oxygen-icons/16x16/mimetypes/application-vnd.rn-realmedia.png" />
-                        Прикрепить видео
+                        {_attach_video}
                     </a>
                     <a n:if="$graffiti ?? false" href="javascript:initGraffiti({$textAreaId});">
                         <img src="/assets/packages/static/openvk/img/oxygen-icons/16x16/actions/draw-brush.png" />
-                        Нарисовать граффити
+                        {_draw_graffiti}
                     </a>
                 </div>
             </div>

Web/Util/Localizator.php

@@ -57,7 +57,7 @@ class Localizator
         $lang  = is_null($lang) ? static::DEFAULT_LANG : $lang;
         $array = @self::parse(dirname(__FILE__) . "/../../locales/$lang.strings");
         
-        return $array[$id] ?? "@$id";
+        return $array[$id] ?? (!empty($array["__fallback"]) ? $this->_($id, $array["__fallback"]) : "@$id");
     }
     
     function export($lang = NULL): ?array

Web/static/img/oxygen-icons

@@ -1 +0,0 @@
-Subproject commit 9d4eb793307e7af10c39c9da3b46646d97ad9dc2

Web/static/img/oxygen-icons/16x16/actions/CVnamespace.png

@@ -0,0 +1 @@
+system-run.png

Web/static/img/oxygen-icons/16x16/actions/Info-amarok.png

@@ -0,0 +1 @@
+run-build.png

Web/static/img/oxygen-icons/16x16/actions/accept_time_event.png

@@ -0,0 +1 @@
+appointment-new.png

Web/static/img/oxygen-icons/16x16/actions/action-albumfolder-importdir2.png

@@ -0,0 +1 @@
+folder-new.png

Web/static/img/oxygen-icons/16x16/actions/activity-fork.png

@@ -0,0 +1 @@
+fork.png

Web/static/img/oxygen-icons/16x16/actions/actor.png

@@ -0,0 +1 @@
+im-user.png

Web/static/img/oxygen-icons/16x16/actions/add-placemark.png

@@ -0,0 +1 @@
+flag-red.png

Web/static/img/oxygen-icons/16x16/actions/addressbook-details.png

@@ -0,0 +1 @@
+address-book-new.png

Web/static/img/oxygen-icons/16x16/actions/adress-book-new.png

@@ -0,0 +1 @@
+address-book-new.png

Web/static/img/oxygen-icons/16x16/actions/akonadi-phone-home.png

@@ -0,0 +1 @@
+go-home.png

Web/static/img/oxygen-icons/16x16/actions/albumfolder-importdir.png

@@ -0,0 +1 @@
+folder-new.png

Web/static/img/oxygen-icons/16x16/actions/albumfolder-importimages.png

@@ -0,0 +1 @@
+document-import.png

Web/static/img/oxygen-icons/16x16/actions/albumfolder-new.png

@@ -0,0 +1 @@
+folder-new.png

Web/static/img/oxygen-icons/16x16/actions/albumfolder-properties.png

@@ -0,0 +1 @@
+configure.png

Web/static/img/oxygen-icons/16x16/actions/albumfolder-user-trash.png

@@ -0,0 +1 @@
+edit-delete.png

Web/static/img/oxygen-icons/16x16/actions/align-vertical-bottom-to-anchor.png

@@ -0,0 +1 @@
+align-vertical-bottom-out.png

Web/static/img/oxygen-icons/16x16/actions/align-vertical-top-to-anchor.png

@@ -0,0 +1 @@
+align-horizontal-top-out.png

Web/static/img/oxygen-icons/16x16/actions/amarok_artist.png

@@ -0,0 +1 @@
+im-invisible-user.png

Web/static/img/oxygen-icons/16x16/actions/amarok_clock.png

@@ -0,0 +1 @@
+appointment-new.png

Web/static/img/oxygen-icons/16x16/actions/amarok_lyrics.png

@@ -0,0 +1 @@
+view-media-lyrics.png

Web/static/img/oxygen-icons/16x16/actions/amarok_playcount.png

@@ -0,0 +1 @@
+view-statistics.png

Web/static/img/oxygen-icons/16x16/actions/amarok_playlist.png

@@ -0,0 +1 @@
+view-media-playlist.png

Web/static/img/oxygen-icons/16x16/actions/amarok_playlist_refresh.png

@@ -0,0 +1 @@
+view-refresh.png

Web/static/img/oxygen-icons/16x16/actions/answer-correct.png

@@ -0,0 +1 @@
+dialog-ok-apply.png

Web/static/img/oxygen-icons/16x16/actions/answer.png

@@ -0,0 +1 @@
+dialog-ok-apply.png

Web/static/img/oxygen-icons/16x16/actions/application-menu.png

@@ -0,0 +1 @@
+configure.png

Web/static/img/oxygen-icons/16x16/actions/applications-internet.png

@@ -0,0 +1 @@
+../places/folder-html.png

Web/static/img/oxygen-icons/16x16/actions/atmosphere.png

@@ -0,0 +1 @@
+../categories/applications-internet.png

Web/static/img/oxygen-icons/16x16/actions/audio-on.png

@@ -0,0 +1 @@
+player-volume.png

Web/static/img/oxygen-icons/16x16/actions/bookmark-add-folder.png

@@ -0,0 +1 @@
+bookmark-new.png

Web/static/img/oxygen-icons/16x16/actions/bookmark-edit.png

@@ -0,0 +1 @@
+bookmark-new.png

Web/static/img/oxygen-icons/16x16/actions/bookmark-remove.png

@@ -0,0 +1 @@
+list-remove.png

Web/static/img/oxygen-icons/16x16/actions/bookmarks.png

@@ -0,0 +1 @@
+bookmark-new.png

Web/static/img/oxygen-icons/16x16/actions/box.png

@@ -0,0 +1 @@
+draw-rectangle.png

Web/static/img/oxygen-icons/16x16/actions/bqm-add.png

@@ -0,0 +1 @@
+list-add.png

Web/static/img/oxygen-icons/16x16/actions/bqm-addqueue.png

@@ -0,0 +1 @@
+list-add.png

Web/static/img/oxygen-icons/16x16/actions/bqm-commit.png

@@ -0,0 +1 @@
+go-up.png

Web/static/img/oxygen-icons/16x16/actions/bqm-diff.png

@@ -0,0 +1 @@
+run-build.png

Web/static/img/oxygen-icons/16x16/actions/bqm-remove.png

@@ -0,0 +1 @@
+edit-delete.png

Web/static/img/oxygen-icons/16x16/actions/bqm-rmqueue.png

@@ -0,0 +1 @@
+edit-delete.png

Web/static/img/oxygen-icons/16x16/actions/bqm-update.png

@@ -0,0 +1 @@
+go-down.png

Web/static/img/oxygen-icons/16x16/actions/cards-block.png

@@ -0,0 +1 @@
+dialog-cancel.png

Web/static/img/oxygen-icons/16x16/actions/checkmark.png

@@ -0,0 +1 @@
+dialog-ok-apply.png

Web/static/img/oxygen-icons/16x16/actions/choice-round.png

@@ -0,0 +1 @@
+draw-circle.png

Web/static/img/oxygen-icons/16x16/actions/chronometer-lap.png

@@ -0,0 +1 @@
+chronometer.png

Web/static/img/oxygen-icons/16x16/actions/chronometer-reset.png

@@ -0,0 +1 @@
+view-refresh.png

Web/static/img/oxygen-icons/16x16/actions/chronometer-start.png

@@ -0,0 +1 @@
+player-time.png