Skip to content

Commit 8d4df91

Browse files
authored
Merge pull request #4100 from christianbeeznest/ofaj-19397
Messages - Add validation of users field before sending message - refs BT#19397
2 parents 7f8a5b3 + 9e51e76 commit 8d4df91

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

main/messages/new_message.php

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@ function manageForm($default, $select_from_user_list = null, $sent_to = '', $tpl
157157
'url' => api_get_path(WEB_AJAX_PATH).'message.ajax.php?a=find_users',
158158
]
159159
);
160+
$form->addRule('users', get_lang('ThisFieldIsRequired'), 'required');
160161
} else {
161162
$form->addElement('hidden', 'hidden_user', $default['users'][0], ['id' => 'hidden_user']);
162163
}
@@ -251,8 +252,8 @@ function manageForm($default, $select_from_user_list = null, $sent_to = '', $tpl
251252

252253
$form->addLabel(
253254
'',
254-
'<iframe
255-
frameborder="0" height="200" width="100%" scrolling="no"
255+
'<iframe
256+
frameborder="0" height="200" width="100%" scrolling="no"
256257
src="'.api_get_path(WEB_CODE_PATH).'messages/record_audio.php"></iframe>'
257258
);
258259

@@ -427,10 +428,10 @@ function manageForm($default, $select_from_user_list = null, $sent_to = '', $tpl
427428
if (isset($_POST['hidden_user'])) {
428429
$default['users'] = [$_POST['hidden_user']];
429430
}
430-
$social_right_content .= manageForm($default, null, null, $tpl);
431-
} else {
431+
} /*else {
432432
$social_right_content .= Display::return_message(get_lang('ErrorSendingMessage'), 'error');
433-
}
433+
}*/
434+
$social_right_content .= manageForm($default, null, null, $tpl);
434435
}
435436
}
436437

0 commit comments

Comments
 (0)