check every booking form input value for emojis

This commit is contained in:
2017-09-09 10:39:08 +10:00
parent 895b3b80e6
commit 3155c277ef
2 changed files with 11 additions and 10 deletions

View File

@@ -1215,7 +1215,14 @@ function booking_form_submit($form, &$form_state)
global $event; global $event;
$values = $form_state['input']; $values = $form_state['input'];
//strip any emojis from user input
if (variable_get('booking_enable_emoji_removal', 1) == 1) {
foreach ($values as $key => $value) {
$values[$key] = _booking_remove_emoji($value);
}
}
//get DOB from form //get DOB from form
$dob = _datearray_to_ts($values['booking_dob']); $dob = _datearray_to_ts($values['booking_dob']);
@@ -1238,7 +1245,7 @@ function booking_form_submit($form, &$form_state)
'!event' => $event->booking_eventname, '!event' => $event->booking_eventname,
'!name' => $values['booking_firstname'] . ' ' . $values['booking_lastname'] '!name' => $values['booking_firstname'] . ' ' . $values['booking_lastname']
)); ));
$title = _booking_remove_emoji($title); //$title = _booking_remove_emoji($title);
$node->title = $title; $node->title = $title;
$node->type = 'booking'; $node->type = 'booking';
$node->status = 1; // set published to true $node->status = 1; // set published to true

View File

@@ -4,19 +4,13 @@
function booking_node_presave($node) { function booking_node_presave($node) {
global $event; global $event;
if($node->type == 'booking') if($node->type == 'booking') {
{
$title = t('!event registration: !name', array( $title = t('!event registration: !name', array(
'!event' => $event->booking_eventname, '!event' => $event->booking_eventname,
'!name' => $node->booking_firstname . ' ' . $node->booking_lastname, '!name' => $node->booking_firstname . ' ' . $node->booking_lastname,
)); ));
$title = _booking_remove_emoji($title); $title = _booking_remove_emoji($title);
$node->title = $title; $node->title = $title;
//$node->title = t('!event registration: !name',
// array('!event' => $event->booking_eventname, '!name' => $node->booking_firstname . ' ' . $node->booking_lastname));
//watchdog('booking', 'Presave of person: @info', array('@info' => var_export($node, TRUE)));
} }
} }