From 3b3cee8d04889bf55d44be2a59de71836c7bc9f3 Mon Sep 17 00:00:00 2001
From: Matt Lorimer <matthew.lorimer@salesagility.com>
Date: Tue, 30 Nov 2021 14:05:14 +0000
Subject: [PATCH] Fix #9382 - Outbound Emails editview Unsupported operand
 types fatal in php8

---
 .../metadata/detailviewdefs.php               |   8 +-
 .../metadata/editviewdefs.php                 | 227 +++++++++---------
 2 files changed, 113 insertions(+), 122 deletions(-)

diff --git a/modules/OutboundEmailAccounts/metadata/detailviewdefs.php b/modules/OutboundEmailAccounts/metadata/detailviewdefs.php
index 3bcbe77ed2c..0f7a469c107 100644
--- a/modules/OutboundEmailAccounts/metadata/detailviewdefs.php
+++ b/modules/OutboundEmailAccounts/metadata/detailviewdefs.php
@@ -1,6 +1,5 @@
 <?php
-$module_name = 'OutboundEmailAccounts';
-$viewdefs [$module_name] =
+$viewdefs ['OutboundEmailAccounts'] =
 array(
   'DetailView' =>
   array(
@@ -53,12 +52,7 @@
         0 =>
         array(
           0 => 'name',
-          //1 => 'assigned_user_name',
         ),
-//        1 =>
-//        array (
-//          0 => 'description',
-//        ),
       ),
       'lbl_editview_panel1' =>
       array(
diff --git a/modules/OutboundEmailAccounts/metadata/editviewdefs.php b/modules/OutboundEmailAccounts/metadata/editviewdefs.php
index d83acd542e9..98496797fb0 100644
--- a/modules/OutboundEmailAccounts/metadata/editviewdefs.php
+++ b/modules/OutboundEmailAccounts/metadata/editviewdefs.php
@@ -1,119 +1,116 @@
 <?php
-$module_name = 'OutboundEmailAccounts';
-$viewdefs [$module_name] =
+$viewdefs ['OutboundEmailAccounts'] =
+array(
+  'EditView' =>
     array(
-        'EditView' =>
+      'templateMeta' =>
+        array(
+          'maxColumns' => '2',
+          'widths' =>
             array(
-                'templateMeta' =>
-                    array(
-                        'maxColumns' => '2',
-                        'widths' =>
-                            array(
-                                0 =>
-                                    array(
-                                        'label' => '10',
-                                        'field' => '30',
-                                    ),
-                                1 =>
-                                    array(
-                                        'label' => '10',
-                                        'field' => '30',
-                                    ),
-                            ),
-                        'useTabs' => false,
-                        'tabDefs' =>
-                            array(
-                                'DEFAULT' =>
-                                    array(
-                                        'newTab' => false,
-                                        'panelDefault' => 'expanded',
-                                    ),
-                                'LBL_EDITVIEW_PANEL1' =>
-                                    array(
-                                        'newTab' => false,
-                                        'panelDefault' => 'expanded',
-                                    ),
-                            ),
-                        'syncDetailEditViews' => true,
-                    ),
-                'panels' =>
-                    array(
-                        'default' =>
-                            array(
-                                0 =>
-                                    array(
-                                        0 => 'name',
-                                        //1 => 'assigned_user_name',
-                                    ),
-//        1 =>
-//        array (
-//          0 => 'description',
-//        ),
-                            ),
-                        'lbl_editview_panel1' =>
-                            array(
-                                
-                                array(
-                                        'name' => 'smtp_from_name',
-                                        'label' => 'LBL_SMTP_FROM_NAME',
-                                    ),
-                                
-                                array(
-                                        'name' => 'smtp_from_addr',
-                                        'label' => 'LBL_SMTP_FROM_ADDR',
-                                    ),
-                                
-                                array(
-                                    'name' => 'email_provider_chooser',
-                                    'label' => 'LBL_CHOOSE_EMAIL_PROVIDER',
-                                ),
-
-                                array(
-                                    0 =>
-                                        array(
-                                            'name' => 'mail_smtpserver',
-                                            'label' => 'LBL_SMTP_SERVERNAME',
-                                        ),
-                                    1 =>
-                                        array(
-                                            'name' => 'mail_smtpport',
-                                            'label' => 'LBL_SMTP_PORT',
-                                        ),
-                                ),
-
-                                array(
-                                    0 =>
-                                        array(
-                                            'name' => 'mail_smtpauth_req',
-                                            'label' => 'LBL_SMTP_AUTH',
-                                        ),
-                                    1 =>
-                                        array(
-                                            'name' => 'mail_smtpssl',
-                                            'studio' => 'visible',
-                                            'label' => 'LBL_SMTP_PROTOCOL',
-                                        ),
-                                ),
-
-                                array(
-                                    array(
-                                        'name' => 'mail_smtpuser',
-                                        'label' => 'LBL_USERNAME',
-                                    ),
-                                ),
-                                array(
-                                    array(
-                                        'name' => 'password_change',
-                                        'label' => 'LBL_PASSWORD',
-                                    ),
-                                ),
-                                array(
-                                    array(
-                                        'name' => 'sent_test_email_btn',
-                                        'label' => 'LBL_SEND_TEST_EMAIL',
-                                    ),
-                                ),
-                            ),
-                    ),
+              0 =>
+                array(
+                  'label' => '10',
+                  'field' => '30',
+                ),
+              1 =>
+                array(
+                  'label' => '10',
+                  'field' => '30',
+                ),
             ),
-    );
+          'useTabs' => false,
+          'tabDefs' =>
+            array(
+              'DEFAULT' =>
+                array(
+                  'newTab' => false,
+                  'panelDefault' => 'expanded',
+                ),
+              'LBL_EDITVIEW_PANEL1' =>
+                array(
+                  'newTab' => false,
+                  'panelDefault' => 'expanded',
+                ),
+            ),
+          'syncDetailEditViews' => true,
+        ),
+      'panels' =>
+        array(
+          'default' =>
+            array(
+              0 =>
+                array(
+                  0 => 'name',
+                ),
+            ),
+          'lbl_editview_panel1' =>
+            array(
+              array(
+                0 =>
+                  array(
+                    'name' => 'smtp_from_name',
+                    'label' => 'LBL_SMTP_FROM_NAME',
+                  ),
+              ),
+              array(
+                0 =>
+                  array(
+                    'name' => 'smtp_from_addr',
+                    'label' => 'LBL_SMTP_FROM_ADDR',
+                  ),
+              ),
+              array(
+                0 =>
+                  array(
+                    'name' => 'email_provider_chooser',
+                    'label' => 'LBL_CHOOSE_EMAIL_PROVIDER',
+                  ),
+              ),
+              array(
+                0 =>
+                  array(
+                    'name' => 'mail_smtpserver',
+                    'label' => 'LBL_SMTP_SERVERNAME',
+                  ),
+                1 =>
+                  array(
+                    'name' => 'mail_smtpport',
+                    'label' => 'LBL_SMTP_PORT',
+                  ),
+              ),
+              array(
+                0 =>
+                  array(
+                    'name' => 'mail_smtpauth_req',
+                    'label' => 'LBL_SMTP_AUTH',
+                  ),
+                1 =>
+                  array(
+                    'name' => 'mail_smtpssl',
+                    'studio' => 'visible',
+                    'label' => 'LBL_SMTP_PROTOCOL',
+                  ),
+              ),
+              array(
+                array(
+                  'name' => 'mail_smtpuser',
+                  'label' => 'LBL_USERNAME',
+                ),
+              ),
+              array(
+                array(
+                  'name' => 'password_change',
+                  'label' => 'LBL_PASSWORD',
+                ),
+              ),
+              array(
+                array(
+                  'name' => 'sent_test_email_btn',
+                  'label' => 'LBL_SEND_TEST_EMAIL',
+                ),
+              ),
+            ),
+        ),
+    ),
+);