Web/Presenters/UserPresenter.php

@@ -34,7 +34,7 @@ final class UserPresenter extends OpenVKPresenter
                 $this->template->_template = "User/deactivated.xml";
                 
                 $this->template->user = $user;
-            } else if(!is_null($user) && !$user->canBeViewedBy($this->user->identity)) {
+            } else if(!$user->canBeViewedBy($this->user->identity)) {
                 $this->template->_template = "User/private.xml";
                 
                 $this->template->user = $user;

Web/static/js/al_wall.js

@@ -1290,6 +1290,25 @@ u(document).on("drop", '#write', function(e) {
     }
 })
 
+u(document).on('submit', '#write > form', (e) => {
+    const target = u(e.target)
+    const horizontal_array = []
+    const horizontal_input = target.find(`input[name='horizontal_attachments']`)
+    const horizontal_attachments = target.find(`.post-horizontal > a`)
+    horizontal_attachments.nodes.forEach(_node => {
+        horizontal_array.push(`${_node.dataset.type}${_node.dataset.id}`)
+    })
+    horizontal_input.nodes[0].value = horizontal_array.join(',')
+
+    const vertical_array = []
+    const vertical_input = target.find(`input[name='vertical_attachments']`)
+    const vertical_attachments = target.find(`.post-vertical > .vertical-attachment`)
+    vertical_attachments.nodes.forEach(_node => {
+        vertical_array.push(`${_node.dataset.type}${_node.dataset.id}`)
+    })
+    vertical_input.nodes[0].value = vertical_array.join(',')
+})
+
 // !!! PHOTO PICKER !!!
 u(document).on("click", "#__photoAttachment", async (e) => {
     const photos_per_page = 23

Web/static/js/router.js

@@ -297,11 +297,6 @@ u(document).on('submit', 'form', async (e) => {
         return false
     }
 
-    if(e.target.closest('#write')) {
-        const target = u(e.target)
-        collect_attachments_node(target)
-    }
-
     u('#ajloader').addClass('shown')
 
     const form = e.target

Web/static/js/utils.js

@@ -260,22 +260,3 @@ function sleep(time)
 {
     return new Promise((resolve) => setTimeout(resolve, time));
 }
-
-function collect_attachments_node(target) 
-{
-    const horizontal_array = []
-    const horizontal_input = target.find(`input[name='horizontal_attachments']`)
-    const horizontal_attachments = target.find(`.post-horizontal > a`)
-    horizontal_attachments.nodes.forEach(_node => {
-        horizontal_array.push(`${_node.dataset.type}${_node.dataset.id}`)
-    })
-    horizontal_input.nodes[0].value = horizontal_array.join(',')
-
-    const vertical_array = []
-    const vertical_input = target.find(`input[name='vertical_attachments']`)
-    const vertical_attachments = target.find(`.post-vertical > .vertical-attachment`)
-    vertical_attachments.nodes.forEach(_node => {
-        vertical_array.push(`${_node.dataset.type}${_node.dataset.id}`)
-    })
-    vertical_input.nodes[0].value = vertical_array.join(',')
-}