Skip to content

Commit

Permalink
Merge pull request #1503 from wpeventmanager/3_1_38
Browse files Browse the repository at this point in the history 
3 1 38
  • Loading branch information
@krinaydhanani
krinaydhanani authored Sep 20, 2023
2 parents cda76d7 + ab9c207 commit 191a4e5
Show file tree
Hide file tree
Showing 55 changed files with 19,872 additions and 16,358 deletions.
71 changes: 36 additions & 35 deletions admin/wp-event-manager-field-editor.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,19 @@ public function get_group_field_html() {
$field_types = apply_filters(
'event_manager_form_group_field_types',
array(
'text' => __('Text', 'wp-event-manager'),
'time' => __('Time', 'wp-event-manager'),
'checkbox' => __('Checkbox', 'wp-event-manager'),
'date' => __('Date', 'wp-event-manager'),
'timezone' => __('Timezone', 'wp-event-manager'),
'file' => __('File', 'wp-event-manager'),
'hidden' => __('Hidden', 'wp-event-manager'),
'multiselect' => __('Multiselect', 'wp-event-manager'),
'number' => __('Number', 'wp-event-manager'),
'password' => __('Password', 'wp-event-manager'),
'radio' => __('Radio', 'wp-event-manager'),
'select' => __('Select', 'wp-event-manager'),
'textarea' => __('Textarea', 'wp-event-manager'),
'text' => esc_html__('Text', 'wp-event-manager'),
'time' => esc_html__('Time', 'wp-event-manager'),
'checkbox' => esc_html__('Checkbox', 'wp-event-manager'),
'date' => esc_html__('Date', 'wp-event-manager'),
'timezone' => esc_html__('Timezone', 'wp-event-manager'),
'file' => esc_html__('File', 'wp-event-manager'),
'hidden' => esc_html__('Hidden', 'wp-event-manager'),
'multiselect' => esc_html__('Multiselect', 'wp-event-manager'),
'number' => esc_html__('Number', 'wp-event-manager'),
'password' => esc_html__('Password', 'wp-event-manager'),
'radio' => esc_html__('Radio', 'wp-event-manager'),
'select' => esc_html__('Select', 'wp-event-manager'),
'textarea' => esc_html__('Textarea', 'wp-event-manager'),
)
);

Expand Down Expand Up @@ -90,7 +90,7 @@ public function output() {
<div class="wrap wp-event-manager-registrations-form-editor">
<h1 class="wp-heading-inline"><?php esc_attr_e('Form fields'); ?></h1>
<div class="wpem-wrap wp-event-manager-form-field-editor">
<form method="post" id="mainform" action="edit.php?post_type=event_listing&amp;page=event-manager-form-editor">
<form method="post" id="mainform" action="<?php echo esc_url("edit.php?post_type=event_listing&amp;page=event-manager-form-editor");?>">
<?php $this->form_editor(); ?>
<?php wp_nonce_field('save-wp-event-manager-form-field-editor'); ?>
</form>
Expand Down Expand Up @@ -124,28 +124,29 @@ private function form_editor() {
}

$disbled_fields = apply_filters('wpem_admin_field_editor_disabled_fields', array('event_title', 'event_description', 'organizer_name', 'organizer_description', 'venue_name', 'venue_description'));
$taxonomy_fields = apply_filters('wpem_admin_field_editor_taxonomy_fields', array('event_type', 'event_category'));
$field_types = apply_filters(
'event_manager_form_field_types',
array(
'text' => __('Text', 'wp-event-manager'),
'time' => __('Time', 'wp-event-manager'),
'checkbox' => __('Checkbox', 'wp-event-manager'),
'date' => __('Date', 'wp-event-manager'),
'timezone' => __('Timezone', 'wp-event-manager'),
'file' => __('File', 'wp-event-manager'),
'hidden' => __('Hidden', 'wp-event-manager'),
'multiselect' => __('Multiselect', 'wp-event-manager'),
'number' => __('Number', 'wp-event-manager'), /*'password' => __('Password', 'wp-event-manager'),*/
'radio' => __('Radio', 'wp-event-manager'),
'repeated' => __('Repeated', 'wp-event-manager'),
'select' => __('Select', 'wp-event-manager'),
'term-checklist' => __('Term Checklist', 'wp-event-manager'),
'term-multiselect' => __('Term Multiselect', 'wp-event-manager'),
'term-select' => __('Term Select', 'wp-event-manager'),
'textarea' => __('Textarea', 'wp-event-manager'),
'wp-editor' => __('WP Editor', 'wp-event-manager'),
'url' => __('URL', 'wp-event-manager'), /*'group' => __('Group', 'wp-event-manager'), */
'email' => __('Email', 'wp-event-manager'),
'text' => esc_html__('Text', 'wp-event-manager'),
'time' => esc_html__('Time', 'wp-event-manager'),
'checkbox' => esc_html__('Checkbox', 'wp-event-manager'),
'date' => esc_html__('Date', 'wp-event-manager'),
'timezone' => esc_html__('Timezone', 'wp-event-manager'),
'file' => esc_html__('File', 'wp-event-manager'),
'hidden' => esc_html__('Hidden', 'wp-event-manager'),
'multiselect' => esc_html__('Multiselect', 'wp-event-manager'),
'number' => esc_html__('Number', 'wp-event-manager'), /*'password' => __('Password', 'wp-event-manager'),*/
'radio' => esc_html__('Radio', 'wp-event-manager'),
'repeated' => esc_html__('Repeated', 'wp-event-manager'),
'select' => esc_html__('Select', 'wp-event-manager'),
'term-checklist' => esc_html__('Term Checklist', 'wp-event-manager'),
'term-multiselect' => esc_html__('Term Multiselect', 'wp-event-manager'),
'term-select' => esc_html__('Term Select', 'wp-event-manager'),
'textarea' => esc_html__('Textarea', 'wp-event-manager'),
'wp-editor' => esc_html__('WP Editor', 'wp-event-manager'),
'url' => esc_html__('URL', 'wp-event-manager'), /*'group' => __('Group', 'wp-event-manager'), */
'email' => esc_html__('Email', 'wp-event-manager'),
)
);

Expand Down Expand Up @@ -177,7 +178,7 @@ private function form_editor() {
} ?>

<div class="wp-event-manager-event-form-field-editor">
<h3><?php printf(esc_attr__('%s form fields', 'wp-event-manager'), ucfirst($group_key)); ?></h3>
<h3><?php printf(esc_attr__('%s form fields', 'wp-event-manager'), ucfirst(esc_attr($group_key))); ?></h3>
<table class="widefat">
<thead>
<tr>
Expand Down Expand Up @@ -292,7 +293,7 @@ private function form_editor_save() {
$new_fields = array(
'event' => $event_field,
'organizer' => $event_organizer,
'venue' => $event_venue,
'venue' => $event_venue,
);
// find the numers keys from the fields array and replace with lable if label not exist remove that field
foreach ($new_fields as $group_key => $group_fields) {
Expand Down
110 changes: 51 additions & 59 deletions admin/wp-event-manager-form-field-editor-field.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,13 @@
if (empty($field_key)) {
$field_key = $index;
}
$taxonomies = get_object_taxonomies((object) array('post_type' => 'event_listing'));
?>
<tr data-field-type="<?php echo esc_attr($field['type']); ?>">
<td class="sort-column">&nbsp;</td>
$taxonomies = get_object_taxonomies((object) array('post_type' => 'event_listing')); ?>

<tr data-field-type="text-field">
<td class="sort-column">&nbsp;</td>
<td>
<input type="text" class="input-text" name="<?php echo wp_kses_post($group_key); ?>[<?php echo esc_attr($field_key); ?>][label]" value="<?php echo esc_attr(stripslashes($field['label'])); ?>" />
</td>

<td class="field-type">
<select name="<?php echo esc_attr($group_key); ?>[<?php echo esc_attr($field_key); ?>][type]" class="field_type">
<?php
Expand All @@ -19,22 +17,27 @@
if ($key == $field['type']) {
printf('<option value="' . esc_attr($key) . '" ' . selected($field['type'], $key, false) . '>' . esc_html($type) . '</option>');
}
}elseif(in_array($field_key, $taxonomy_fields)){
if(strpos($key, 'term') === 0){
if($key == $field['type']) {
printf('<option value="' . esc_attr($key) . '" ' . selected($field['type'], $key, false) . '>' . esc_html($type) . '</option>');
}else{
printf('<option value="' . esc_attr($key) . '" >' . esc_html($type) . '</option>');
}
}
} else {
printf('<option value="' . esc_attr($key) . '" ' . selected($field['type'], $key, false) . '>' . esc_html($type) . '</option>');
}
}
?>
</select>
</td>

<td>
<input type="text" class="input-text" name="<?php echo esc_attr($group_key); ?>[<?php echo esc_attr($field_key); ?>][description]" value="<?php echo esc_attr(isset($field['description']) ? stripslashes($field['description']) : ''); ?>" placeholder="<?php esc_attr_e('N/A', 'wp-event-manager'); ?>" />
</td>


<td class="field-options">
<?php
if (isset($field['options'])) {
if (isset($field['options']) && is_array($field['options'])) {
$options = implode(
'|',
array_map(
Expand All @@ -47,13 +50,11 @@ function ($v, $k) {
);
} else {
$options = '';
}
?>
} ?>
<input type="text" class="input-text placeholder" name="<?php echo esc_attr($group_key); ?>[<?php echo esc_attr($field_key); ?>][placeholder]" value="<?php if (isset($field['placeholder'])) {
printf(esc_html__('%s', 'wp-event-manager'), esc_attr(stripslashes($field['placeholder'])));
} ?>" placeholder="<?php esc_attr_e('N/A', 'wp-event-manager'); ?>" />
printf(esc_html__('%s', 'wp-event-manager'), esc_attr(stripslashes($field['placeholder'])));
} ?>" placeholder="<?php esc_attr_e('N/A', 'wp-event-manager'); ?>" />
<input type="text" class="input-text options" name="<?php echo esc_attr($group_key); ?>[<?php echo esc_attr($field_key); ?>][options]" placeholder="<?php esc_attr_e('Pipe (|) separate options.', 'wp-event-manager'); ?>" value="<?php echo esc_attr($options); ?>" />

<div class="file-options">
<label class="multiple-files"><input type='hidden' value='0' name="<?php echo esc_attr($group_key); ?>[<?php echo esc_attr($field_key); ?>][multiple]"><input type="checkbox" class="input-text" name="<?php echo esc_attr($group_key); ?>[<?php echo esc_attr($field_key); ?>][multiple]" value="1" <?php checked(!empty($field['multiple']), true); ?> /> <?php esc_attr_e('Multiple Files?', 'wp-event-manager'); ?></label>
</div>
Expand All @@ -63,33 +64,31 @@ function ($v, $k) {
<select class="input-text taxonomy-select" name="<?php echo esc_attr($group_key); ?>[<?php echo esc_attr($field_key); ?>][taxonomy]">
<?php foreach ($taxonomies as $taxonomy) : ?>
<option value="<?php echo esc_attr($taxonomy); ?>" <?php
if (isset($field['taxonomy'])) {
echo selected($field['taxonomy'], $taxonomy, false);
}
?>><?php echo esc_html($taxonomy); ?></option>
if (isset($field['taxonomy'])) {
echo selected($field['taxonomy'], $taxonomy, false);
}
?>>
<?php echo esc_html($taxonomy); ?>
</option>
<?php endforeach; ?>
</select>
<?php endif; ?>
</label>
</div>
<span class="na">&ndash;</span>
</td>

<td> <input type="text" value="_<?php echo esc_attr($field_key); ?>" readonly></td>

<td> <input type="text" value="_<?php echo esc_attr(stripslashes($field_key)); ?>" readonly></td>
<td>
<?php if (!in_array($field_key, $disbled_fields)) : ?>
<input type="checkbox" name="<?php echo esc_attr($group_key); ?>[<?php echo esc_attr($field_key); ?>][admin_only]" value="1" <?php checked(!empty($field['admin_only']), true); ?> />
<?php endif; ?>
</td>

<td>

<input type="text" class="input-text placeholder" name="<?php echo esc_attr($group_key); ?>[<?php echo esc_attr($field_key); ?>][priority]" value="<?php
if (isset($field['priority'])) {
echo esc_attr($field['priority']);
}
?>" placeholder="<?php esc_attr_e('N/A', 'wp-event-manager'); ?>" disabled />
if (isset($field['priority'])) {
echo esc_attr($field['priority']);
}
?>" placeholder="<?php esc_attr_e('N/A', 'wp-event-manager'); ?>" disabled />
</td>

<td class="field-rules">
Expand All @@ -98,15 +97,17 @@ function ($v, $k) {
<select name="<?php echo esc_attr($group_key); ?>[<?php echo esc_attr($field_key); ?>][required]">
<?php $field['required'] = (isset($field['required']) ? $field['required'] : false); ?>
<option value="0" <?php
if ($field['required'] == false) {
echo wp_kses_post('selected="selected"');
}
?>><?php esc_attr_e('Not Required', 'wp-event-manager'); ?></option>
if ($field['required'] == false) {
echo wp_kses_post('selected="selected"');
} ?>>
<?php esc_attr_e('Not Required', 'wp-event-manager'); ?>
</option>
<option value="1" <?php
if ($field['required'] == true) {
echo wp_kses_post('selected="selected"');
}
?>><?php esc_attr_e('Required', 'wp-event-manager'); ?></option>
if ($field['required'] == true) {
echo wp_kses_post('selected="selected"');
} ?>>
<?php esc_attr_e('Required', 'wp-event-manager'); ?>
</option>
</select>
</div>
<?php endif; ?>
Expand All @@ -118,9 +119,7 @@ function ($v, $k) {
<a class="delete-field" href='#'>X</a>
<?php endif; ?>
</td>

</tr>

<?php
if (isset($field['type']) && $field['type'] == 'group') {
$field_types = apply_filters(
Expand All @@ -141,9 +140,7 @@ function ($v, $k) {
'textarea' => __('Textarea', 'wp-event-manager'),
)
);

$child_index = -1;
?>
$child_index = -1; ?>
<tr class="group">
<td colspan="10">
<table class="widefat child_table" id="<?php echo esc_attr($field_key); ?>">
Expand All @@ -169,34 +166,29 @@ function ($v, $k) {
</tr>
</tfoot>
<tbody class="child-form-fields" data-name="<?php echo esc_attr($group_key); ?>[<?php echo esc_attr($field_key); ?>][fields]" data-field="
<?php
ob_start();

$child_field_key = '';
$child_field = array(
'type' => 'text',
'label' => '',
'placeholder' => '',
);
include 'wp-event-manager-form-field-editor-group-field.php';
echo wp_kses_post(ob_get_clean());
?>
<?php
ob_start();

$child_field_key = '';
$child_field = array(
'type' => 'text',
'label' => '',
'placeholder' => '',
);
include 'wp-event-manager-form-field-editor-group-field.php';
echo wp_kses_post(ob_get_clean());
?>
">

<?php
if (isset($field['fields']) && !empty($field['fields'])) {
foreach ($field['fields'] as $child_field_key => $child_field) {
$child_index++;

include 'wp-event-manager-form-field-editor-group-field.php';
}
}
?>
} ?>
</tbody>
</table>
</td>
</tr>

<?php
}
?>
<?php } ?>
4 changes: 2 additions & 2 deletions admin/wp-event-manager-form-field-editor-group-field-row.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
'label' => '',
'placeholder' => '',
);
require 'wp-event-manager-form-field-editor-group-field.php';
require esc_html('wp-event-manager-form-field-editor-group-field.php');
echo wp_kses_post(ob_get_clean());
?> ">
</tbody>
</table>
</td>
</tr>
</tr>
19 changes: 9 additions & 10 deletions admin/wp-event-manager-form-field-editor-group-field.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@
echo wp_kses_post('<option value="' . esc_attr($key) . '" ' . selected($child_field['type'], $key, false) . '>' . esc_html($type) . '</option>');
}
}
}
?>
} ?>
</select>
</td>
<td>
Expand All @@ -43,10 +42,10 @@ function ($child_v, $child_k) {
$child_options = '';
} ?>
<input type="text" class="input-text placeholder" name="<?php echo esc_attr($group_key); ?>[<?php echo esc_attr($field_key); ?>][fields][<?php echo esc_attr($child_field_key); ?>][placeholder]" value="
<?php
if(isset($child_field['placeholder'])) {
printf(esc_html__('%s', 'wp-event-manager'), esc_attr(stripslashes($child_field['placeholder'])));}
?>
<?php
if(isset($child_field['placeholder'])) {
printf(esc_html__('%s', 'wp-event-manager'), esc_attr(stripslashes($child_field['placeholder'])));}
?>
" placeholder="<?php esc_attr_e('N/A', 'wp-event-manager'); ?>" />
<input type="text" class="input-text options" name="<?php echo esc_attr($group_key); ?>[<?php echo esc_attr($field_key); ?>][fields][<?php echo esc_attr($child_field_key); ?>][options]" placeholder="<?php esc_attr_e('Pipe (|) separate options.', 'wp-event-manager'); ?>" value="<?php echo esc_attr($child_options); ?>" />

Expand Down Expand Up @@ -79,10 +78,10 @@ function ($child_v, $child_k) {
</td>
<td>
<input type="text" class="input-text placeholder" name="<?php echo esc_attr($group_key); ?>[<?php echo esc_attr($field_key); ?>][fields][<?php echo esc_attr($child_field_key); ?>][priority]" value="
<?php
if(isset($child_field['priority'])) {
printf(esc_html__('%s', 'wp-event-manager'), esc_attr(stripslashes($child_field['priority'])));}
?>
<?php
if(isset($child_field['priority'])) {
printf(esc_html__('%s', 'wp-event-manager'), esc_attr(stripslashes($child_field['priority'])));}
?>
" placeholder="<?php esc_attr_e('N/A', 'wp-event-manager'); ?>" disabled />
</td>
<td class="field-rules">
Expand Down
Loading

0 comments on commit 191a4e5

Please sign in to comment.