From 2fd5d8172a38337464ca071871569521da569906 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sun, 12 May 2024 00:06:28 +0000 Subject: [PATCH] bug fixes --- .github/workflows/greetings.yml | 2 +- Admin/Install/SearchCommands.php | 1 + Controller/ApiController.php | 2 +- Theme/Backend/Lang/ar.lang.php | 2 +- Theme/Backend/Lang/cs.lang.php | 2 +- Theme/Backend/Lang/da.lang.php | 2 +- Theme/Backend/Lang/de.lang.php | 2 +- Theme/Backend/Lang/el.lang.php | 2 +- Theme/Backend/Lang/en.lang.php | 2 +- Theme/Backend/Lang/es.lang.php | 2 +- Theme/Backend/Lang/fi.lang.php | 2 +- Theme/Backend/Lang/fr.lang.php | 2 +- Theme/Backend/Lang/hu.lang.php | 2 +- Theme/Backend/Lang/it.lang.php | 2 +- Theme/Backend/Lang/ja.lang.php | 2 +- Theme/Backend/Lang/ko.lang.php | 2 +- Theme/Backend/Lang/no.lang.php | 2 +- Theme/Backend/Lang/pl.lang.php | 2 +- Theme/Backend/Lang/pt.lang.php | 2 +- Theme/Backend/Lang/ru.lang.php | 2 +- Theme/Backend/Lang/sv.lang.php | 2 +- Theme/Backend/Lang/th.lang.php | 2 +- Theme/Backend/Lang/tr.lang.php | 2 +- Theme/Backend/Lang/uk.lang.php | 2 +- Theme/Backend/Lang/zh.lang.php | 2 +- Theme/Backend/profile-list.tpl.php | 4 ++-- Theme/Backend/profile-view.tpl.php | 8 ++++---- 27 files changed, 31 insertions(+), 30 deletions(-) diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml index adb8716..75cb759 100755 --- a/.github/workflows/greetings.yml +++ b/.github/workflows/greetings.yml @@ -9,5 +9,5 @@ jobs: - uses: actions/first-interaction@v1 with: repo-token: ${{ secrets.GITHUB_TOKEN }} - issue-message: 'Thank you for createing this issue. We will check it as soon as possible.' + issue-message: 'Thank you for creating this issue. We will check it as soon as possible.' pr-message: 'Thank you for your pull request. We will check it as soon as possible.' diff --git a/Admin/Install/SearchCommands.php b/Admin/Install/SearchCommands.php index f4400c2..362c18f 100644 --- a/Admin/Install/SearchCommands.php +++ b/Admin/Install/SearchCommands.php @@ -23,6 +23,7 @@ return [ 'dest' => '\Modules\Profile\Controller\SearchController:searchGeneral', 'verb' => RouteVerb::ANY, 'active' => true, + 'order' => 1, 'permission' => [ 'module' => SearchController::NAME, 'type' => PermissionType::READ, diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 9e34475..4246ae1 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -167,7 +167,7 @@ final class ApiController extends Controller basePath: __DIR__ . '/../../../Modules/Media/Files/Accounts/' . $profile->account->id, virtualPath: '/Accounts/' . $profile->account->id . ' ' . $profile->account->login, pathSettings: PathSettings::FILE_PATH, - type: $request->getDataInt('type') + tag: $request->getDataInt('tag') ); $profile->image = empty($uploaded->sources) ? new NullMedia() : \reset($uploaded->sources); diff --git a/Theme/Backend/Lang/ar.lang.php b/Theme/Backend/Lang/ar.lang.php index 6cc6a1d..880c363 100755 --- a/Theme/Backend/Lang/ar.lang.php +++ b/Theme/Backend/Lang/ar.lang.php @@ -94,7 +94,7 @@ return ['Profile' => [ 'Visibility' => 'الرؤية', 'Volume' => 'الصوت', 'Weight' => 'وزن', - 'Zip' => 'أزيز', + 'Postal' => 'أزيز', 'aType1' => 'مسكن', 'aType2' => 'اعمال', 'aType3' => 'شحن', diff --git a/Theme/Backend/Lang/cs.lang.php b/Theme/Backend/Lang/cs.lang.php index 861c55d..e483cab 100755 --- a/Theme/Backend/Lang/cs.lang.php +++ b/Theme/Backend/Lang/cs.lang.php @@ -94,7 +94,7 @@ return ['Profile' => [ 'Visibility' => 'Viditelnost', 'Volume' => 'Objem', 'Weight' => 'Hmotnost', - 'Zip' => 'Zip', + 'Postal' => 'Postal', 'aType1' => 'Domov', 'aType2' => 'Business.', 'aType3' => 'Lodní doprava', diff --git a/Theme/Backend/Lang/da.lang.php b/Theme/Backend/Lang/da.lang.php index c7c9d71..077ed05 100755 --- a/Theme/Backend/Lang/da.lang.php +++ b/Theme/Backend/Lang/da.lang.php @@ -94,7 +94,7 @@ return ['Profile' => [ 'Visibility' => 'Sigtbarhed', 'Volume' => 'Bind', 'Weight' => 'Vægt', - 'Zip' => 'Zip.', + 'Postal' => 'Zip.', 'aType1' => 'Hjem', 'aType2' => 'Forretning', 'aType3' => 'Forsendelse', diff --git a/Theme/Backend/Lang/de.lang.php b/Theme/Backend/Lang/de.lang.php index 7c328df..3da0ad2 100755 --- a/Theme/Backend/Lang/de.lang.php +++ b/Theme/Backend/Lang/de.lang.php @@ -94,7 +94,7 @@ return ['Profile' => [ 'Visibility' => 'Sichtweite', 'Volume' => 'Volumen', 'Weight' => 'Gewicht', - 'Zip' => 'Reißverschluss', + 'Postal' => 'Reißverschluss', 'aType1' => 'Heim', 'aType2' => 'Geschäft', 'aType3' => 'Versand', diff --git a/Theme/Backend/Lang/el.lang.php b/Theme/Backend/Lang/el.lang.php index 97b6ce2..598f35f 100755 --- a/Theme/Backend/Lang/el.lang.php +++ b/Theme/Backend/Lang/el.lang.php @@ -94,7 +94,7 @@ return ['Profile' => [ 'Visibility' => 'Ορατότητα', 'Volume' => 'Ενταση ΗΧΟΥ', 'Weight' => 'Βάρος', - 'Zip' => 'Φερμουάρ', + 'Postal' => 'Φερμουάρ', 'aType1' => 'Σπίτι', 'aType2' => 'Επιχείρηση', 'aType3' => 'Αποστολή', diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php index e136f05..1be4764 100755 --- a/Theme/Backend/Lang/en.lang.php +++ b/Theme/Backend/Lang/en.lang.php @@ -94,7 +94,7 @@ return ['Profile' => [ 'Visibility' => 'Visibility', 'Volume' => 'Volume', 'Weight' => 'Weight', - 'Zip' => 'Zip', + 'Postal' => 'Postal', 'aType1' => 'Home', 'aType2' => 'Business', 'aType3' => 'Shipping', diff --git a/Theme/Backend/Lang/es.lang.php b/Theme/Backend/Lang/es.lang.php index c96fcdb..1d1f213 100755 --- a/Theme/Backend/Lang/es.lang.php +++ b/Theme/Backend/Lang/es.lang.php @@ -94,7 +94,7 @@ return ['Profile' => [ 'Visibility' => 'Visibilidad', 'Volume' => 'Volumen', 'Weight' => 'Peso', - 'Zip' => 'Cremallera', + 'Postal' => 'Cremallera', 'aType1' => 'Casa', 'aType2' => 'Negocio', 'aType3' => 'Transporte', diff --git a/Theme/Backend/Lang/fi.lang.php b/Theme/Backend/Lang/fi.lang.php index 089715a..f7dd5ae 100755 --- a/Theme/Backend/Lang/fi.lang.php +++ b/Theme/Backend/Lang/fi.lang.php @@ -94,7 +94,7 @@ return ['Profile' => [ 'Visibility' => 'Näkyvyys', 'Volume' => 'Määrä', 'Weight' => 'Paino', - 'Zip' => 'Postinumero', + 'Postal' => 'Postinumero', 'aType1' => 'Koti', 'aType2' => 'Liiketoiminta', 'aType3' => 'laivaus', diff --git a/Theme/Backend/Lang/fr.lang.php b/Theme/Backend/Lang/fr.lang.php index 1612064..8c2da36 100755 --- a/Theme/Backend/Lang/fr.lang.php +++ b/Theme/Backend/Lang/fr.lang.php @@ -94,7 +94,7 @@ return ['Profile' => [ 'Visibility' => 'Visibilité', 'Volume' => 'Le volume', 'Weight' => 'Poids', - 'Zip' => 'Zipper', + 'Postal' => 'Zipper', 'aType1' => 'Accueil', 'aType2' => 'Entreprise', 'aType3' => 'Expédition', diff --git a/Theme/Backend/Lang/hu.lang.php b/Theme/Backend/Lang/hu.lang.php index a8de667..7122440 100755 --- a/Theme/Backend/Lang/hu.lang.php +++ b/Theme/Backend/Lang/hu.lang.php @@ -94,7 +94,7 @@ return ['Profile' => [ 'Visibility' => 'Láthatóság', 'Volume' => 'Hangerő', 'Weight' => 'Súly', - 'Zip' => 'Postai irányítószám', + 'Postal' => 'Postai irányítószám', 'aType1' => 'itthon', 'aType2' => 'Üzleti', 'aType3' => 'Szállítás', diff --git a/Theme/Backend/Lang/it.lang.php b/Theme/Backend/Lang/it.lang.php index 51426b3..9865590 100755 --- a/Theme/Backend/Lang/it.lang.php +++ b/Theme/Backend/Lang/it.lang.php @@ -94,7 +94,7 @@ return ['Profile' => [ 'Visibility' => 'Visibilità', 'Volume' => 'Volume', 'Weight' => 'Peso', - 'Zip' => 'Cerniera lampo', + 'Postal' => 'Cerniera lampo', 'aType1' => 'Casa', 'aType2' => 'Affare', 'aType3' => 'Spedizione', diff --git a/Theme/Backend/Lang/ja.lang.php b/Theme/Backend/Lang/ja.lang.php index acbc7c1..c6203d9 100755 --- a/Theme/Backend/Lang/ja.lang.php +++ b/Theme/Backend/Lang/ja.lang.php @@ -94,7 +94,7 @@ return ['Profile' => [ 'Visibility' => '視認性', 'Volume' => '音量', 'Weight' => '重さ', - 'Zip' => 'ジップ', + 'Postal' => 'ジップ', 'aType1' => '家', 'aType2' => '仕事', 'aType3' => '運送', diff --git a/Theme/Backend/Lang/ko.lang.php b/Theme/Backend/Lang/ko.lang.php index 8d8f6d9..d5886a6 100755 --- a/Theme/Backend/Lang/ko.lang.php +++ b/Theme/Backend/Lang/ko.lang.php @@ -94,7 +94,7 @@ return ['Profile' => [ 'Visibility' => '시계', 'Volume' => '용량', 'Weight' => '무게', - 'Zip' => '지퍼', + 'Postal' => '지퍼', 'aType1' => '집', 'aType2' => '사업', 'aType3' => '배송', diff --git a/Theme/Backend/Lang/no.lang.php b/Theme/Backend/Lang/no.lang.php index 618285f..a9bad53 100755 --- a/Theme/Backend/Lang/no.lang.php +++ b/Theme/Backend/Lang/no.lang.php @@ -94,7 +94,7 @@ return ['Profile' => [ 'Visibility' => 'Synlighet', 'Volume' => 'Volum', 'Weight' => 'Vekt', - 'Zip' => 'Glidelås', + 'Postal' => 'Glidelås', 'aType1' => 'Hjem', 'aType2' => 'Virksomhet', 'aType3' => 'Shipping', diff --git a/Theme/Backend/Lang/pl.lang.php b/Theme/Backend/Lang/pl.lang.php index 4699436..0a1c17a 100755 --- a/Theme/Backend/Lang/pl.lang.php +++ b/Theme/Backend/Lang/pl.lang.php @@ -94,7 +94,7 @@ return ['Profile' => [ 'Visibility' => 'Widoczność', 'Volume' => 'Tom', 'Weight' => 'Waga', - 'Zip' => 'Zamek błyskawiczny', + 'Postal' => 'Zamek błyskawiczny', 'aType1' => 'Dom', 'aType2' => 'Biznes', 'aType3' => 'Wysyłka', diff --git a/Theme/Backend/Lang/pt.lang.php b/Theme/Backend/Lang/pt.lang.php index 3ccd384..c275919 100755 --- a/Theme/Backend/Lang/pt.lang.php +++ b/Theme/Backend/Lang/pt.lang.php @@ -94,7 +94,7 @@ return ['Profile' => [ 'Visibility' => 'Visibilidade', 'Volume' => 'Volume', 'Weight' => 'Peso', - 'Zip' => 'Fecho eclair', + 'Postal' => 'Fecho eclair', 'aType1' => 'Casa', 'aType2' => 'O negócio', 'aType3' => 'Envio', diff --git a/Theme/Backend/Lang/ru.lang.php b/Theme/Backend/Lang/ru.lang.php index 5c57919..5566ec6 100755 --- a/Theme/Backend/Lang/ru.lang.php +++ b/Theme/Backend/Lang/ru.lang.php @@ -94,7 +94,7 @@ return ['Profile' => [ 'Visibility' => 'Видимость', 'Volume' => 'Объем', 'Weight' => 'Масса', - 'Zip' => 'Zip.', + 'Postal' => 'Zip.', 'aType1' => 'Домой', 'aType2' => 'Бизнес', 'aType3' => 'Перевозки', diff --git a/Theme/Backend/Lang/sv.lang.php b/Theme/Backend/Lang/sv.lang.php index 9f84529..8974f61 100755 --- a/Theme/Backend/Lang/sv.lang.php +++ b/Theme/Backend/Lang/sv.lang.php @@ -94,7 +94,7 @@ return ['Profile' => [ 'Visibility' => 'Synlighet', 'Volume' => 'Volym', 'Weight' => 'Vikt', - 'Zip' => 'Blixtlås', + 'Postal' => 'Blixtlås', 'aType1' => 'Hem', 'aType2' => 'Företag', 'aType3' => 'Frakt', diff --git a/Theme/Backend/Lang/th.lang.php b/Theme/Backend/Lang/th.lang.php index 12aff55..c8f7035 100755 --- a/Theme/Backend/Lang/th.lang.php +++ b/Theme/Backend/Lang/th.lang.php @@ -94,7 +94,7 @@ return ['Profile' => [ 'Visibility' => 'ทัศนวิสัย', 'Volume' => 'ปริมาณ', 'Weight' => 'น้ำหนัก', - 'Zip' => 'ซิป', + 'Postal' => 'ซิป', 'aType1' => 'บ้าน', 'aType2' => 'ธุรกิจ', 'aType3' => 'การส่งสินค้า', diff --git a/Theme/Backend/Lang/tr.lang.php b/Theme/Backend/Lang/tr.lang.php index 6d4c641..d3938a3 100755 --- a/Theme/Backend/Lang/tr.lang.php +++ b/Theme/Backend/Lang/tr.lang.php @@ -94,7 +94,7 @@ return ['Profile' => [ 'Visibility' => 'Görünürlük', 'Volume' => 'Ses', 'Weight' => 'Ağırlık', - 'Zip' => 'Zip', + 'Postal' => 'Postal', 'aType1' => 'Ev', 'aType2' => 'İşletme', 'aType3' => 'Nakliye', diff --git a/Theme/Backend/Lang/uk.lang.php b/Theme/Backend/Lang/uk.lang.php index 12fc92f..c5dd031 100755 --- a/Theme/Backend/Lang/uk.lang.php +++ b/Theme/Backend/Lang/uk.lang.php @@ -94,7 +94,7 @@ return ['Profile' => [ 'Visibility' => 'Видимість', 'Volume' => 'Обсяг', 'Weight' => 'Вага', - 'Zip' => 'Блиск', + 'Postal' => 'Блиск', 'aType1' => 'Додому', 'aType2' => 'Бізнес', 'aType3' => 'Доставка', diff --git a/Theme/Backend/Lang/zh.lang.php b/Theme/Backend/Lang/zh.lang.php index e35bf33..0add892 100755 --- a/Theme/Backend/Lang/zh.lang.php +++ b/Theme/Backend/Lang/zh.lang.php @@ -94,7 +94,7 @@ return ['Profile' => [ 'Visibility' => '能见度', 'Volume' => '体积', 'Weight' => '重量', - 'Zip' => '压缩', + 'Postal' => '压缩', 'aType1' => '家', 'aType2' => '商业', 'aType3' => '船运', diff --git a/Theme/Backend/profile-list.tpl.php b/Theme/Backend/profile-list.tpl.php index ad32a72..ee56339 100755 --- a/Theme/Backend/profile-list.tpl.php +++ b/Theme/Backend/profile-list.tpl.php @@ -25,7 +25,7 @@ $next = empty($accounts) ? '{/base}/profile/list' : '{/base}/profile/list?{? ?>
-
+
getHtml('Profiles'); ?>download
@@ -80,6 +80,6 @@ $next = empty($accounts) ? '{/base}/profile/list' : '{/base}/profile/list?{? getHtml('Next', '0', '0'); ?> --> - + diff --git a/Theme/Backend/profile-view.tpl.php b/Theme/Backend/profile-view.tpl.php index 03d46dc..cf79803 100644 --- a/Theme/Backend/profile-view.tpl.php +++ b/Theme/Backend/profile-view.tpl.php @@ -45,7 +45,7 @@ echo $this->data['nav']->render();
-
+
account->name3) || !empty($profile->account->name2)) : ?> @@ -140,7 +140,7 @@ echo $this->data['nav']->render(); request->header->account === $profile->account->id) : ?>
-
+
@@ -166,7 +166,7 @@ echo $this->data['nav']->render();
-
+
getHtml('Password'); ?>
@@ -189,7 +189,7 @@ echo $this->data['nav']->render();
-
+