Refactor code

uvdesk · Dec 10, 2024 · efede9c · efede9c
1 parent 02728bc
commit efede9c
Show file tree

Hide file tree

Showing 11 changed files with 104 additions and 97 deletions.
diff --git a/Controller/MailboxChannel.php b/Controller/MailboxChannel.php
@@ -54,7 +54,7 @@ public function createMailboxConfiguration(Request $request, EntityManagerInterf
         }, $microsoftAccountCollection);
 
         # load swift mailer configuration
-        $swiftmailerConfigurationCollection = $swiftMailer->parseSwiftMailerConfigurations();
+        $swiftMailerConfigurationCollection = $swiftMailer->parseSwiftMailerConfigurations();
 
         if ($request->getMethod() == 'POST') {
             $params = $request->request->all();
@@ -120,7 +120,7 @@ public function createMailboxConfiguration(Request $request, EntityManagerInterf
                             return $this->render('@UVDeskMailbox//manageConfigurations.html.twig', [
                                 'microsoftAppCollection'     => $microsoftAppCollection,
                                 'microsoftAccountCollection' => $microsoftAccountCollection,
-                                'swiftmailerConfigurations'  => $swiftmailerConfigurationCollection,
+                                'swiftmailerConfigurations'  => $swiftMailerConfigurationCollection,
                             ]);
                         }
 
@@ -137,7 +137,7 @@ public function createMailboxConfiguration(Request $request, EntityManagerInterf
                         return $this->render('@UVDeskMailbox//manageConfigurations.html.twig', [
                             'microsoftAppCollection'     => $microsoftAppCollection,
                             'microsoftAccountCollection' => $microsoftAccountCollection,
-                            'swiftmailerConfigurations'  => $swiftmailerConfigurationCollection,
+                            'swiftmailerConfigurations'  => $swiftMailerConfigurationCollection,
                         ]);
                     }
                 } else if ($smtpConfiguration instanceof SMTP\Transport\ResolvedTransportConfigurationInterface) {
@@ -166,7 +166,7 @@ public function createMailboxConfiguration(Request $request, EntityManagerInterf
 
                 // Swiftmailer Configuration
                 if (!empty($params['swiftmailer_id'])) {
-                    foreach ($swiftmailerConfigurationCollection as $configuration) {
+                    foreach ($swiftMailerConfigurationCollection as $configuration) {
                         if ($configuration->getId() == $params['swiftmailer_id']) {
                             $swiftmailerConfiguration = $configuration;
                             break;
@@ -218,7 +218,7 @@ public function createMailboxConfiguration(Request $request, EntityManagerInterf
         return $this->render('@UVDeskMailbox//manageConfigurations.html.twig', [
             'microsoftAppCollection'     => $microsoftAppCollection,
             'microsoftAccountCollection' => $microsoftAccountCollection,
-            'swiftmailerConfigurations'  => $swiftmailerConfigurationCollection,
+            'swiftmailerConfigurations'  => $swiftMailerConfigurationCollection,
         ]);
     }
 
@@ -255,7 +255,7 @@ public function updateMailboxConfiguration($id, Request $request, EntityManagerI
         }, $microsoftAccountCollection);
 
         # load swift mailer configuration
-        $swiftmailerConfigurationCollection = $swiftMailer->parseSwiftMailerConfigurations();
+        $swiftMailerConfigurationCollection = $swiftMailer->parseSwiftMailerConfigurations();
 
         if ($request->getMethod() == 'POST') {
             $params = $request->request->all();
@@ -277,7 +277,7 @@ public function updateMailboxConfiguration($id, Request $request, EntityManagerI
                             return $this->render('@UVDeskMailbox//manageConfigurations.html.twig', [
                                 'microsoftAppCollection'     => $microsoftAppCollection,
                                 'microsoftAccountCollection' => $microsoftAccountCollection,
-                                'swiftmailerConfigurations'  => $swiftmailerConfigurationCollection,
+                                'swiftmailerConfigurations'  => $swiftMailerConfigurationCollection,
                             ]);
                         }
 
@@ -294,7 +294,7 @@ public function updateMailboxConfiguration($id, Request $request, EntityManagerI
                         return $this->render('@UVDeskMailbox//manageConfigurations.html.twig', [
                             'microsoftAppCollection'     => $microsoftAppCollection,
                             'microsoftAccountCollection' => $microsoftAccountCollection,
-                            'swiftmailerConfigurations'  => $swiftmailerConfigurationCollection,
+                            'swiftmailerConfigurations'  => $swiftMailerConfigurationCollection,
                         ]);
                     }
                 } else if ($imapConfiguration instanceof IMAP\Transport\SimpleTransportConfigurationInterface) {
@@ -323,7 +323,7 @@ public function updateMailboxConfiguration($id, Request $request, EntityManagerI
                             return $this->render('@UVDeskMailbox//manageConfigurations.html.twig', [
                                 'microsoftAppCollection'     => $microsoftAppCollection,
                                 'microsoftAccountCollection' => $microsoftAccountCollection,
-                                'swiftmailerConfigurations'  => $swiftmailerConfigurationCollection,
+                                'swiftmailerConfigurations'  => $swiftMailerConfigurationCollection,
                             ]);
                         }
 
@@ -340,7 +340,7 @@ public function updateMailboxConfiguration($id, Request $request, EntityManagerI
                         return $this->render('@UVDeskMailbox//manageConfigurations.html.twig', [
                             'microsoftAppCollection'     => $microsoftAppCollection,
                             'microsoftAccountCollection' => $microsoftAccountCollection,
-                            'swiftmailerConfigurations'  => $swiftmailerConfigurationCollection,
+                            'swiftmailerConfigurations'  => $swiftMailerConfigurationCollection,
                         ]);
                     }
                 } else if ($smtpConfiguration instanceof SMTP\Transport\ResolvedTransportConfigurationInterface) {
@@ -367,8 +367,8 @@ public function updateMailboxConfiguration($id, Request $request, EntityManagerI
                 $mailbox = new Mailbox($params['id']);
 
                 // Swiftmailer Configuration
-                if (!empty($params['swiftmailer_id'])) {
-                    foreach ($swiftmailerConfigurationCollection as $configuration) {
+                if (! empty($params['swiftmailer_id'])) {
+                    foreach ($swiftMailerConfigurationCollection as $configuration) {
                         if ($configuration->getId() == $params['swiftmailer_id']) {
                             $swiftmailerConfiguration = $configuration;
                             break;
@@ -418,7 +418,7 @@ public function updateMailboxConfiguration($id, Request $request, EntityManagerI
             'mailbox'                    => $mailbox,
             'microsoftAppCollection'     => $microsoftAppCollection,
             'microsoftAccountCollection' => $microsoftAccountCollection,
-            'swiftmailerConfigurations'  => $swiftmailerConfigurationCollection,
+            'swiftmailerConfigurations'  => $swiftMailerConfigurationCollection,
         ]);
     }
 }
diff --git a/Controller/MailboxChannelXHR.php b/Controller/MailboxChannelXHR.php
@@ -30,9 +30,10 @@ public function processRawContentMail(Request $request)
 
         if ($rawEmail != false &&  !empty($rawEmail)) {
            $this->mailboxService->processMail($rawEmail);
-        }else{
+        } else {
             dump("Empty Text file not allow");
-        } 
+        }
+
         exit(0);
     }
 
@@ -44,8 +45,8 @@ public function loadMailboxesXHR(Request $request)
 
         $collection = array_map(function ($mailbox) use ($defaultMailbox) {
             return [
-                'id' => $mailbox->getId(),
-                'name' => $mailbox->getName(),
+                'id'        => $mailbox->getId(),
+                'name'      => $mailbox->getName(),
                 'isEnabled' => $mailbox->getIsEnabled(),
             ];
         }, array_values($mailboxConfiguration->getMailboxes()));
@@ -68,7 +69,7 @@ public function removeMailboxConfiguration($id, Request $request)
 
         if (empty($mailbox)) {
             return new JsonResponse([
-                'alertClass' => 'danger',
+                'alertClass'   => 'danger',
                 'alertMessage' => "No mailbox found with id '$id'.",
             ], 404);
         }
@@ -86,7 +87,7 @@ public function removeMailboxConfiguration($id, Request $request)
         file_put_contents($mailboxService->getPathToConfigurationFile(), (string) $mailboxConfiguration);
 
         return new JsonResponse([
-            'alertClass' => 'success',
+            'alertClass'   => 'success',
             'alertMessage' => $this->translator->trans('Mailbox configuration removed successfully.'),
         ]);
     }
@@ -158,13 +159,16 @@ public function processOutlookMailXHR(Request $request, MailboxService $mailboxS
 
         $responseMessage = $processedThread['message'];
 
-        if (!empty($processedThread['content']['from'])) {
+        if (! empty($processedThread['content']['from'])) {
             $responseMessage = "Received email from <info>" . $processedThread['content']['from']. "</info>. " . $responseMessage;
         }
 
-        if (!empty($processedThread['content']['ticket']) && !empty($processedThread['content']['thread'])) {
+        if (
+            ! empty($processedThread['content']['ticket']) 
+            && !empty($processedThread['content']['thread'])
+        ) {
             $responseMessage .= " <comment>[tickets/" . $processedThread['content']['ticket'] . "/#" . $processedThread['content']['ticket'] . "]</comment>";
-        } else if (!empty($processedThread['content']['ticket'])) {
+        } else if (! empty($processedThread['content']['ticket'])) {
             $responseMessage .= " <comment>[tickets/" . $processedThread['content']['ticket'] . "]</comment>";
         }
 

diff --git a/Resources/views/listConfigurations.html.twig b/Resources/views/listConfigurations.html.twig
@@ -221,7 +221,7 @@
 							globalMessageResponse = null;
 						},
 						error: function (model, xhr, options) {
-							if(url = xhr.getResponseHeader('Location'))
+							if (url = xhr.getResponseHeader('Location'))
 								window.location = url;
 						}
 					});
@@ -237,6 +237,7 @@
 				},
 				render: function() {
 					this.$el.html(this.template(this.model));
+					
 					return this;
 				},
 				confirmRemove: function(e) {