Skip to content

Commit

Permalink
Fix #9382 - Outbound Emails editview Unsupported operand types fatal …
Browse files Browse the repository at this point in the history
…in php8
  • Loading branch information
mattlorimer committed Dec 13, 2021
1 parent 89ddff5 commit 3b3cee8
Show file tree
Hide file tree
Showing 2 changed files with 113 additions and 122 deletions.
8 changes: 1 addition & 7 deletions modules/OutboundEmailAccounts/metadata/detailviewdefs.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?php
$module_name = 'OutboundEmailAccounts';
$viewdefs [$module_name] =
$viewdefs ['OutboundEmailAccounts'] =
array(
'DetailView' =>
array(
Expand Down Expand Up @@ -53,12 +52,7 @@
0 =>
array(
0 => 'name',
//1 => 'assigned_user_name',
),
// 1 =>
// array (
// 0 => 'description',
// ),
),
'lbl_editview_panel1' =>
array(
Expand Down
227 changes: 112 additions & 115 deletions modules/OutboundEmailAccounts/metadata/editviewdefs.php
Original file line number Diff line number Diff line change
@@ -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',
),
),
),
),
),
);

0 comments on commit 3b3cee8

Please sign in to comment.