diff --git a/Web/Models/Entities/User.php b/Web/Models/Entities/User.php index f669b08f..9152e64e 100644 --- a/Web/Models/Entities/User.php +++ b/Web/Models/Entities/User.php @@ -190,7 +190,7 @@ class User extends RowModel function getMorphedName(string $case = "genitive", bool $fullName = true): string { $name = $fullName ? ($this->getLastName() . " " . $this->getFirstName()) : $this->getFirstName(); - if(!preg_match("%^[А-яё\-]+$%", $name)) + if(!preg_match("%[А-яё\-]+$%", $name)) return $name; # name is probably not russian $inflected = inflectName($name, $case, $this->isFemale() ? Gender::FEMALE : Gender::MALE); diff --git a/Web/Presenters/AudioPresenter.php b/Web/Presenters/AudioPresenter.php index 76a56eeb..9b9b20c8 100644 --- a/Web/Presenters/AudioPresenter.php +++ b/Web/Presenters/AudioPresenter.php @@ -311,8 +311,8 @@ final class AudioPresenter extends OpenVKPresenter $playlist = new Playlist; $playlist->setOwner($owner); - $playlist->setName(substr($title, 0, 128)); - $playlist->setDescription(substr($description, 0, 2048)); + $playlist->setName(substr($title, 0, 125)); + $playlist->setDescription(substr($description, 0, 2045)); if($_FILES["cover"]["error"] === UPLOAD_ERR_OK) { if(!str_starts_with($_FILES["cover"]["type"], "image")) @@ -432,8 +432,8 @@ final class AudioPresenter extends OpenVKPresenter if(empty($title) || iconv_strlen($title) < 1) $this->flashFail("err", tr("error"), tr("set_playlist_name")); - $playlist->setName(ovk_proc_strtr($title, 128)); - $playlist->setDescription(ovk_proc_strtr($description, 2048)); + $playlist->setName(ovk_proc_strtr($title, 125)); + $playlist->setDescription(ovk_proc_strtr($description, 2045)); $playlist->setEdited(time()); $playlist->resetLength(); diff --git a/Web/Presenters/templates/@layout.xml b/Web/Presenters/templates/@layout.xml index d8a415de..31e0bc5c 100644 --- a/Web/Presenters/templates/@layout.xml +++ b/Web/Presenters/templates/@layout.xml @@ -184,8 +184,8 @@ {_my_photos} - {_my_audios} {_my_videos} + {_my_audios} {_my_messages} ({$thisUser->getUnreadMessagesCount()}) diff --git a/Web/Presenters/templates/About/Tour.xml b/Web/Presenters/templates/About/Tour.xml index cc484c66..0c02b1ca 100755 --- a/Web/Presenters/templates/About/Tour.xml +++ b/Web/Presenters/templates/About/Tour.xml @@ -178,11 +178,29 @@

{_tour_section_6_title_1|noescape}

+ + - - +

{_tour_section_6_bottom_text_1|noescape}

+ +

{_tour_section_6_title_2|noescape}

+ + +
diff --git a/Web/Presenters/templates/Audio/EditPlaylist.xml b/Web/Presenters/templates/Audio/EditPlaylist.xml index a7f1c751..32690d50 100644 --- a/Web/Presenters/templates/Audio/EditPlaylist.xml +++ b/Web/Presenters/templates/Audio/EditPlaylist.xml @@ -26,11 +26,11 @@
- +
- +
diff --git a/Web/Presenters/templates/Audio/List.xml b/Web/Presenters/templates/Audio/List.xml index 27822908..7ab978b3 100644 --- a/Web/Presenters/templates/Audio/List.xml +++ b/Web/Presenters/templates/Audio/List.xml @@ -2,13 +2,21 @@ {block title} {if $mode == 'list'} - {_audios} + {if $ownerId > 0} + {_audios} {$owner->getMorphedName("genitive", false)} + {else} + {_audios_group} + {/if} {elseif $mode == 'new'} {_audio_new} {elseif $mode == 'popular'} {_audio_popular} {else} - {_playlists} + {if $ownerId > 0} + {_playlists} {$owner->getMorphedName("genitive", false)} + {else} + {_playlists_group} + {/if} {/if} {/block} @@ -87,17 +95,18 @@
- -
- - {ovk_proc_strtr($playlist->getName(), 12)} - - - - {ovk_proc_strtr($playlist->getOwner()->getCanonicalName(), 20)} - -
+ + + diff --git a/Web/Presenters/templates/Audio/NewPlaylist.xml b/Web/Presenters/templates/Audio/NewPlaylist.xml index 7ca345c0..a55267c7 100644 --- a/Web/Presenters/templates/Audio/NewPlaylist.xml +++ b/Web/Presenters/templates/Audio/NewPlaylist.xml @@ -39,10 +39,10 @@
- +
-