Skip to content

Commit 3dd41a0

Browse files
thisismeonmounteverestthisismeonmounteverest
committed
Remove adding and editing of relations from the profile menu.
1 parent 6dfa9ad commit 3dd41a0

8 files changed

+76
-41
lines changed

‎build/members/pages/member.page.php

+6-5
Original file line numberDiff line numberDiff line change
@@ -147,16 +147,17 @@ protected function getSubmenuItems()
147147
}
148148
if (isset($TCom[0])) {
149149
if ($TCom[0]->AllowEdit) {
150-
$tt = array_merge($tt, array('commmentsadd', "members/$username/comment/edit", '<i class="fa fa-fw fa-comment"></i> ' . $ww->EditComments, 'commentsadd'));
150+
$tt = array_merge($tt, [
151+
[ 'commmentsadd', "members/$username/comment/edit", '<i class="fa fa-fw fa-comment"></i> ' . $ww->EditComments, 'commentsadd']
152+
]);
151153
}
152154
} else {
153-
$tt = array_merge($tt, array('commmentsadd', "members/$username/comment/add", '<i class="fa fa-fw fa-comment"></i> ' . $ww->AddComments, 'commentsadd'));
155+
$tt = array_merge($tt, [['commmentsadd', "members/$username/comment/add", '<i class="fa fa-fw fa-comment"></i> ' . $ww->AddComments, 'commentsadd']]);
154156
}
155157
$tt = array_merge($tt, [
156-
(null === $relation)
158+
/* (null === $relation)
157159
? array('relationsadd', "members/$username/relation/add", '<i class="fa fa-fw fa-handshake"></i> ' . $words->get('profile.relation.add'), 'relationsadd')
158-
: array('relationsadd', "members/$username/relation/edit", '<i class="fa fa-fw fa-handshake"></i> ' . $words->get('profile.relation.edit'), 'relationsadd'),
159-
array('notes', $mynotelinkname, '<i class="fa fa-fw fa-pencil-alt"></i> ' . $mynotewordsname, 'mynotes'),
160+
: array('relationsadd', "members/$username/relation/edit", '<i class="fa fa-fw fa-handshake"></i> ' . $words->get('profile.relation.edit'), 'relationsadd'), array('notes', $mynotelinkname, '<i class="fa fa-fw fa-pencil-alt"></i> ' . $mynotewordsname, 'mynotes'),
160161
array('report', $feedbackUrl, '<i class="fas fa-fw fa-flag"></i> ' . $words->getSilent('profile.report')),
161162
array('separator-1', '', '', 'space'),
162163
array('profile', "members/$username", '<i class="fa fa-fw fa-user"></i> ' . $ww->MemberPage),

‎src/Controller/ConversationController.php

+9
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace App\Controller;
44

5+
use App\Doctrine\MemberStatusType;
56
use App\Doctrine\SpamInfoType;
67
use App\Entity\HostingRequest;
78
use App\Entity\Member;
@@ -88,6 +89,14 @@ public function reply(Message $message): Response
8889
if ($member !== $message->getSender() && $member !== $message->getReceiver()) {
8990
return $this->redirectToRoute('conversations', ['conversationsType' => 'conversations']);
9091
}
92+
93+
if (MemberStatusType::ACCOUNT_ACTIVATED === $member->getStatus()) {
94+
$receiver = ($message->getReceiver() === $member) ? $message->getSender() : $message->getReceiver();
95+
$this->addTranslatedFlash('notice', 'flash.conversation.not.active');
96+
97+
return $this->redirectToRoute('members_profile', ['username' => $receiver->getUsername()]);
98+
}
99+
91100
$controllerAndMethod = $this->getControllerAndMethod($message, 'reply');
92101

93102
return $this->forward($controllerAndMethod, [

‎src/Controller/FeedbackController.php

+7-9
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44

55
use App\Form\FeedbackFormType;
66
use App\Model\AboutModel;
7+
use App\Utilities\TranslatedFlashTrait;
8+
use App\Utilities\TranslatorTrait;
79
use Carbon\Carbon;
810
use Symfony\Component\Form\FormError;
911
use Symfony\Component\HttpFoundation\RedirectResponse;
@@ -14,20 +16,14 @@
1416

1517
class FeedbackController extends AboutBaseController
1618
{
19+
use TranslatorTrait;
20+
use TranslatedFlashTrait;
21+
1722
/**
1823
* @Route("/about/feedback", name="contactus")
1924
* @Route("/contact")
2025
* @Route("/contactus")
2126
* @Route("/support")
22-
*
23-
* @return RedirectResponse
24-
*/
25-
public function showAboutFeedback()
26-
{
27-
return $this->redirectToRoute('feedback');
28-
}
29-
30-
/**
3127
* @Route("/feedback", name="feedback")
3228
*
3329
* @return Response|RedirectResponse
@@ -97,6 +93,8 @@ public function feedback(Request $request, AboutModel $aboutModel, TranslatorInt
9793
$aboutModel->sendFeedbackEmail($data);
9894
$aboutModel->addFeedback($data);
9995

96+
$this->addTranslatedFlash('notice', 'feedback.thank.you');
97+
10098
return $this->redirectToRoute('feedback_received');
10199
}
102100
}

‎src/Controller/GalleryController.php

+7-7
Original file line numberDiff line numberDiff line change
@@ -341,16 +341,16 @@ public function showUploadedImage(UploadedImage $image, string $fileInfo): Binar
341341
$uploadDirectory = $this->getParameter('upload_directory') . '/';
342342
if (!$this->isGranted('IS_AUTHENTICATED_REMEMBERED') || $image->getFileInfo() !== $fileInfo) {
343343
$filepath = sprintf($uploadDirectory . 'placeholder_%d_%d.png', $image->getWidth(), $image->getHeight());
344-
if (!file_exists($filepath)) {
345-
// create image!
346-
$imageManager = new ImageManager();
347-
$imageManager
348-
->canvas($image->getWidth(), $image->getHeight(), '#ccc')
349-
->save($filepath);
350-
}
351344
} else {
352345
$filepath = $this->getParameter('upload_directory') . '/' . $image->getFilename();
353346
}
347+
if (!file_exists($filepath)) {
348+
// create image!
349+
$imageManager = new ImageManager();
350+
$imageManager
351+
->canvas($image->getWidth(), $image->getHeight(), '#ccc')
352+
->save($filepath);
353+
}
354354

355355
// Uploaded images aren't updated; set expiry to 1 year
356356
$response = new BinaryFileResponse($filepath);

‎src/Controller/HomeController.php

+4-3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
use RoxPostHandler;
99
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
1010
use Symfony\Component\Form\Extension\Core\Type\TextType;
11+
use Symfony\Component\HttpFoundation\Request;
1112
use Symfony\Component\HttpFoundation\Response;
1213
use Symfony\Component\Routing\Annotation\Route;
1314
use Symfony\Component\Validator\Constraints\NotBlank;
@@ -19,7 +20,7 @@ class HomeController extends AbstractController
1920
*
2021
* @return Response
2122
*/
22-
public function show(StatisticsModel $statisticsModel)
23+
public function show(Request $request, StatisticsModel $statisticsModel, array $locales)
2324
{
2425
$member = $this->getUser();
2526
if ($member) {
@@ -42,7 +43,7 @@ public function show(StatisticsModel $statisticsModel)
4243
new NotBlank(),
4344
],
4445
])
45-
->setAction('/signup/1')
46+
->setAction('/signup')
4647
->setMethod('POST')
4748
->getForm();
4849

@@ -60,7 +61,7 @@ public function show(StatisticsModel $statisticsModel)
6061
'search' => $searchForm->createView(),
6162
'images' => $images,
6263
'username' => $usernameForm->createView(),
63-
'locale' => $this->getParameter('locale'),
64+
'locale' => $request->getPreferredLanguage($locales),
6465
'title' => 'BeWelcome',
6566
'stats' => $statistics,
6667
]);

‎src/Controller/LandingController.php

+8-6
Original file line numberDiff line numberDiff line change
@@ -307,12 +307,14 @@ private function getSearchHomeLocationRequest(Member $member): SearchFormRequest
307307
{
308308
$searchHomeRequest = new SearchFormRequest($this->getDoctrine()->getManager());
309309
$geo = $member->getCity();
310-
$searchHomeRequest->location = $geo->getName();
311-
$searchHomeRequest->location_geoname_id = $geo->getGeonameId();
312-
$searchHomeRequest->location_latitude = $member->getLatitude();
313-
$searchHomeRequest->location_longitude = $member->getLongitude();
314-
$searchHomeRequest->accommodation_anytime = true;
315-
$searchHomeRequest->accommodation_neverask = true;
310+
if (null !== $geo) {
311+
$searchHomeRequest->location = $geo->getName();
312+
$searchHomeRequest->location_geoname_id = $geo->getGeonameId();
313+
$searchHomeRequest->location_latitude = $member->getLatitude();
314+
$searchHomeRequest->location_longitude = $member->getLongitude();
315+
$searchHomeRequest->accommodation_anytime = true;
316+
$searchHomeRequest->accommodation_neverask = true;
317+
}
316318

317319
return $searchHomeRequest;
318320
}

‎src/Controller/LocaleController.php

+32-9
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44

55
use App\Entity\Language;
66
use App\Entity\Member;
7+
use App\Entity\MemberPreference;
8+
use App\Entity\Preference;
9+
use Doctrine\ORM\EntityManagerInterface;
710
use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
811
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
912
use Symfony\Component\HttpFoundation\RedirectResponse;
@@ -15,15 +18,32 @@ class LocaleController extends AbstractController
1518
/**
1619
* @Route("/rox/in/{locale}", name="language", requirements={"locale" = "[a-z]{2}(-[A-Za-z]{2,})?"})
1720
* @ParamConverter("language", class="App\Entity\Language", options={"mapping": {"locale": "shortCode"}})
18-
*
19-
* @return RedirectResponse
2021
*/
21-
public function selectLocaleAction(Request $request, Language $language)
22-
{
22+
public function selectLocaleAction(
23+
Request $request,
24+
Language $language,
25+
EntityManagerInterface $entityManager
26+
): RedirectResponse {
2327
/** @var Member $member */
2428
$member = $this->getUser();
2529
if ($member) {
26-
$member->setPreferredLanguage($language);
30+
$preference = $entityManager->getRepository(Preference::class)->findOneBy([
31+
'codename' => Preference::LOCALE
32+
]);
33+
$memberPreference = $entityManager->getRepository(MemberPreference::class)->findOneBy([
34+
'preference' => $preference,
35+
'member' => $member
36+
]);
37+
if (null === $memberPreference) {
38+
$memberPreference = new MemberPreference();
39+
$memberPreference
40+
->setMember($member)
41+
->setPreference($preference)
42+
;
43+
}
44+
$memberPreference->setValue($language->getShortCode());
45+
$entityManager->persist($memberPreference);
46+
$entityManager->flush();
2747
}
2848

2949
$redirect = $request->headers->get('referer');
@@ -32,11 +52,14 @@ public function selectLocaleAction(Request $request, Language $language)
3252
$redirect = $this->redirectToRoute('homepage');
3353
}
3454

35-
$locale = $request->attributes->get('locale');
55+
$locale = $language->getShortCode();
3656

37-
$this->get('session')->set('lang', $locale);
38-
$this->get('session')->set('locale', $locale);
39-
$this->get('session')->set('_locale', $locale);
57+
$request->setLocale($locale);
58+
59+
$session = $request->getSession();
60+
$session->set('lang', $locale);
61+
$session->set('locale', $locale);
62+
$session->set('_locale', $locale);
4063

4164
return new RedirectResponse($redirect);
4265
}

‎src/Utilities/ProfileSubmenu.php

+3-2
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,8 @@ private function addSubmenuItemsProfile(Member $member, array $parameters)
219219
]);
220220
}
221221

222-
if ($parameters['family_or_friend']) {
222+
/* if ($parameters['family_or_friend']) {
223+
223224
$this->addSubmenuItem('family_or_friend', [
224225
'key' => 'profile.relation.edit',
225226
'icon' => 'handshake',
@@ -232,7 +233,7 @@ private function addSubmenuItemsProfile(Member $member, array $parameters)
232233
'url' => $this->routing->generate('add_relation', ['username' => $username]),
233234
]);
234235
}
235-
236+
*/
236237
if ($parameters['note']) {
237238
$this->addSubmenuItem('edit_note', [
238239
'key' => 'NoteEditMyNotesOfMember',

0 commit comments

Comments
 (0)