From 19bae0054a2308ccc9aed94872166e1ee716931e Mon Sep 17 00:00:00 2001 From: nathan Date: Tue, 18 Oct 2022 13:30:22 -0600 Subject: [PATCH] Calendar: Fix notification messages were no longer multi-line textboxes --- calendar/inc/class.calendar_hooks.inc.php | 6 ------ preferences/inc/class.preferences_settings.inc.php | 9 +++------ 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/calendar/inc/class.calendar_hooks.inc.php b/calendar/inc/class.calendar_hooks.inc.php index b782779ee0..c67d895c60 100644 --- a/calendar/inc/class.calendar_hooks.inc.php +++ b/calendar/inc/class.calendar_hooks.inc.php @@ -596,7 +596,6 @@ class calendar_hooks 'label' => 'Notification messages for added events', 'name' => 'notifyAdded', 'rows' => 5, - 'cols' => 50, 'help' => 'This message is sent to every participant of events you own, who has requested notifcations about new events.
You can use certain variables which get substituted with the data of the event. The first line is the subject of the email.', 'default' => '', 'values' => $event_details, @@ -608,7 +607,6 @@ class calendar_hooks 'label' => 'Notification messages for canceled events', 'name' => 'notifyCanceled', 'rows' => 5, - 'cols' => 50, 'help' => 'This message is sent for canceled or deleted events.', 'default' => '', 'values' => $event_details, @@ -621,7 +619,6 @@ class calendar_hooks 'label' => 'Notification messages for modified events', 'name' => 'notifyModified', 'rows' => 5, - 'cols' => 50, 'help' => 'This message is sent for modified or moved events.', 'default' => '', 'values' => $event_details, @@ -634,7 +631,6 @@ class calendar_hooks 'label' => 'Notification messages for uninvited participants', 'name' => 'notifyDisinvited', 'rows' => 5, - 'cols' => 50, 'help' => 'This message is sent to uninvited participants.', 'values' => $event_details, 'subst_help' => False, @@ -646,7 +642,6 @@ class calendar_hooks 'label' => 'Notification messages for your responses', 'name' => 'notifyResponse', 'rows' => 5, - 'cols' => 50, 'help' => 'This message is sent when you accept, tentative accept or reject an event.', 'values' => $event_details, 'subst_help' => False, @@ -658,7 +653,6 @@ class calendar_hooks 'label' => 'Notification messages for your alarms', 'name' => 'notifyAlarm', 'rows' => 5, - 'cols' => 50, 'help' => 'This message is sent when you set an Alarm for a certain event. Include all information you might need.', 'values' => $event_details, 'subst_help' => False, diff --git a/preferences/inc/class.preferences_settings.inc.php b/preferences/inc/class.preferences_settings.inc.php index 1e5dba82a3..326f713344 100644 --- a/preferences/inc/class.preferences_settings.inc.php +++ b/preferences/inc/class.preferences_settings.inc.php @@ -437,13 +437,10 @@ class preferences_settings $setting['run_lang'] = false; // already done now // handle as textarea case 'textarea': - $setting['type'] = is_a($tpl, 'etemplate') ? 'textarea' : 'et2-textbox'; - $tpl->setElementAttribute($tab . '[' . $setting['name'] . ']', 'multiline', 'true'); - // anyway setting via css: width: 99%, height: 5em - // for old eT use size attribute - if(is_a($tpl, 'etemplate') && (!empty($setting['cols']) || !empty($setting['rows']))) + $setting['type'] = 'et2-textarea'; + if(!empty($setting['rows'])) { - $setting['size'] = $setting['rows'] . ',' . $setting['cols']; + $tpl->setElementAttribute($tab . '[' . $setting['name'] . ']', 'rows', $setting['rows']); } break; case 'password':