Skip to content

Commit

Permalink
Merge pull request #1456 from wpeventmanager/3_1_37
Browse files Browse the repository at this point in the history 
3 1 37
  • Loading branch information
@krinaydhanani
krinaydhanani authored Aug 7, 2023
2 parents d381c4f + 862b94f commit e52a6b2
Show file tree
Hide file tree
Showing 32 changed files with 757 additions and 550 deletions.
9 changes: 5 additions & 4 deletions admin/wp-event-manager-field-editor.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,7 @@ private function form_editor() {

if(!empty($_GET['event-reset-fields']) && !empty($_GET['_wpnonce']) && wp_verify_nonce($_GET['_wpnonce'], 'reset')) {
delete_option('event_manager_submit_event_form_fields');
echo 'delete fields';
// echo wp_kses_post('<div class="updated"><p>' . esc_attr('The fields were successfully reset.', 'wp-event-manager') . '</p></div>');
echo wp_kses_post('<div class="updated"><p>' . esc_attr('The fields were successfully reset.', 'wp-event-manager') . '</p></div>');
}

if(!empty($_GET['organizer-reset-fields']) && !empty($_GET['_wpnonce']) && wp_verify_nonce($_GET['_wpnonce'], 'reset')) {
Expand Down Expand Up @@ -250,6 +249,7 @@ private function child_form_editor_save($field) {
}
if(isset($field_value['type']) && $field_value['type'] == 'select' || $field_value['type'] == 'radio' || $field_value['type'] == 'multiselect' || $field_value['type'] == 'button-options') {
if(isset($field_value['options']) && !empty($field_value['options'])) {
$field_value['options'] = trim($field_value['options'], '|');
$field_value['options'] = explode('|', $field_value['options']);
$temp_options = array();
foreach ($field_value['options'] as $val) {
Expand Down Expand Up @@ -302,7 +302,7 @@ private function form_editor_save() {
$index++;
if(isset($new_fields[$group_key][$field_key]['type']) && $new_fields[$group_key][$field_key]['type'] === 'group') {
if(isset($field_value['fields']) && !empty($field_value['fields'])) {
$child_fields = $this->child_form_editor_save($field_value);
$child_fields = $this->child_form_editor_save($field_value);
$new_fields[$group_key][$field_key]['fields'] = $child_fields;
}
}
Expand All @@ -313,6 +313,7 @@ private function form_editor_save() {
}
if(isset($new_fields[$group_key][$field_key]['type']) && ($new_fields[$group_key][$field_key]['type'] == 'select' || $new_fields[$group_key][$field_key]['type'] == 'radio' || $new_fields[$group_key][$field_key]['type'] == 'multiselect' || $new_fields[$group_key][$field_key]['type'] == 'button-options')) {
if(isset($new_fields[$group_key][$field_key]['options'])) {
$new_fields[$group_key][$field_key]['options'] = trim($new_fields[$group_key][$field_key]['options'], '|');
$new_fields[$group_key][$field_key]['options'] = explode('|', $new_fields[$group_key][$field_key]['options']);
$temp_options = array();
foreach ($new_fields[$group_key][$field_key]['options'] as $val) {
Expand Down Expand Up @@ -346,7 +347,7 @@ private function form_editor_save() {
// merge field with default fields
$GLOBALS['event_manager']->forms->get_form('submit-event', array());
$form_submit_event_instance = call_user_func(array('WP_Event_Manager_Form_Submit_Event', 'instance'));
$event_fields = $form_submit_event_instance->get_default_fields('backend');
$event_fields = $form_submit_event_instance->get_default_fields();

if(get_option('enable_event_organizer')) {
$GLOBALS['event_manager']->forms->get_form('submit-organizer', array());
Expand Down
4 changes: 2 additions & 2 deletions admin/wp-event-manager-settings.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ protected function init_settings() {
'name' => 'enable_event_organizer',
'std' => '1',
'label' => __('Enable Organizer', 'wp-event-manager'),
'cb_label' => __('Disable this to remove the functionality of Organizers on Your Event Website.', 'wp-event-manager'),
'cb_label' => __('Enable the option to show organizers on your events website.', 'wp-event-manager'),
'desc' => '',
'type' => 'checkbox',
'attributes' => array(),
Expand All @@ -58,7 +58,7 @@ protected function init_settings() {
'name' => 'enable_event_venue',
'std' => '1',
'label' => __('Enable Venue', 'wp-event-manager'),
'cb_label' => __('Disable this to remove the functionality of Venue on your Event Website.', 'wp-event-manager'),
'cb_label' => __('Enable the option to show event venues on your events website.', 'wp-event-manager'),
'desc' => '',
'type' => 'checkbox',
'attributes' => array(),
Expand Down
15 changes: 8 additions & 7 deletions admin/wp-event-manager-writepanels.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -915,14 +915,15 @@ public function save_event_listing_data($post_id, $post){
} elseif('_event_author' === $key) {
$wpdb->update($wpdb->posts, array('post_author' => $_POST[$key] > 0 ? absint($_POST[$key]) : 0), array('ID' => $post_id));
} elseif('_event_banner' === $key) {
if(is_array($_POST[$key])) {
$thumbnail_image = $_POST[$key][0];
update_post_meta($post_id, $key, array_filter(array_map('sanitize_text_field', $_POST[$key])));
} else {
$thumbnail_image = $_POST[$key];
update_post_meta($post_id, $key, sanitize_text_field($_POST[$key]));
if(isset($_POST[$key])){
if(is_array($_POST[$key])) {
$thumbnail_image = $_POST[$key][0];
update_post_meta($post_id, $key, array_filter(array_map('sanitize_text_field', $_POST[$key])));
} else {
$thumbnail_image = $_POST[$key];
update_post_meta($post_id, $key, sanitize_text_field($_POST[$key]));
}
}

$image = get_the_post_thumbnail_url($post_id);

if(empty($image)) {
Expand Down
5 changes: 5 additions & 0 deletions assets/css/frontend.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3434,13 +3434,18 @@ p.post-submitted-success-green-message a {
}
.wpem-main-vmenu-dashboard-content-wrap .wpem-dashboard-main-content .wpem-dashboard-main-header .wpem-events-filter .wpem-form-group {
margin: 5px 0;
display: flex;
align-items: center;
}
.wpem-main-vmenu-dashboard-content-wrap .wpem-dashboard-main-content .wpem-dashboard-main-header .wpem-events-filter .wpem-form-group button {
width: 100%;
height: 45px;
margin: 0;
white-space: nowrap;
}
.wpem-main-vmenu-dashboard-content-wrap .wpem-dashboard-main-content .wpem-dashboard-main-header .wpem-events-filter .wpem-form-group input.wpem-theme-button {
margin: 0 0 0 5px;
}
.wpem-main-vmenu-dashboard-content-wrap .wpem-dashboard-main-content .wpem-dashboard-main-header .wpem-events-filter .wpem-events-filter-block.wpem-events-filter-submit {
width: auto;
}
Expand Down
2 changes: 1 addition & 1 deletion assets/css/frontend.min.css
View file

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion assets/js/admin.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ var Admin = function () {
'attribute': 'data-tip',
'fadeIn': 50,
'fadeOut': 50,
'delay': 200
'delay': 200,
keepAlive: true
});

//load chosen
Expand Down
2 changes: 1 addition & 1 deletion assets/js/admin.min.js
View file

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion assets/js/event-dashboard.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@ var EventDashboard= function () {
return false;
});
}

jQuery("#reset_dashboard").on('click', function(){
window.location.href = window.location.href.split('?')[0];
});
// For Event Filter Toggle
if(jQuery('.wpem-dashboard-main-header .wpem-event-dashboard-filter-toggle').length >0){
jQuery('.wpem-dashboard-main-header .wpem-event-dashboard-filter-toggle').hide();
Expand Down
2 changes: 1 addition & 1 deletion assets/js/event-dashboard.min.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion assets/js/multiselect.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ var MultiSelect= function () {
/// <since>1.0.0</since>
init: function()
{
Common.logInfo("MultiSelect.init...");
jQuery(".event-manager-multiselect").chosen({search_contains:!0});
}
} //enf of returnmultiselect
Expand Down
2 changes: 1 addition & 1 deletion assets/js/multiselect.min.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 8 additions & 5 deletions forms/wp-event-manager-form-submit-event.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,9 @@ public function get_default_event_fields( ) {
break;
}

$organizer_description = is_admin() ? __('<div class="wpem-alert wpem-mt-2 wpem-mb-0 wpem-p-0">If it doesn\'t show organizer(s). Manage your organizer(s) from <a href="post-new.php?post_type=event_organizer" target="_blank" class="wpem_add_organizer_popup wpem-modal-button" data-modal-id="wpem_add_organizer_popup">here</a></div>','wp-event-manager') : __('<div class="wpem-alert wpem-mt-2 wpem-mb-0 wpem-p-0">If it doesn\'t show organizer(s). Manage your organizer(s) from <a href="javascript:void(0)" class="wpem_add_organizer_popup wpem-modal-button" data-modal-id="wpem_add_organizer_popup">here</a></div>','wp-event-manager');
$venue_description = is_admin() ? __('<div class="wpem-alert wpem-mt-2 wpem-mb-0 wpem-p-0">If it doesn\'t show venue(s). Manage your venue(s) from <a href="post-new.php?post_type=event_venue" target="_blank" class="wpem_add_venue_popup wpem-modal-button" data-modal-id="wpem_add_venue_popup">here</a></div>','wp-event-manager') : __('<div class="wpem-alert wpem-mt-2 wpem-mb-0 wpem-p-0">If it doesn\'t show venue(s). Manage your venue(s) from <a href="javascript:void(0)" class="wpem_add_venue_popup wpem-modal-button" data-modal-id="wpem_add_venue_popup">here</a></div>','wp-event-manager');

return apply_filters( 'submit_event_form_fields', array(
'event' => array(
'event_title' => array(
Expand Down Expand Up @@ -320,8 +323,8 @@ public function get_default_event_fields( ) {
'label' => __( 'Organizer', 'wp-event-manager' ),
'type' => 'multiselect',
'default' => '',
'options' => ($current_user_id) ? get_all_organizer_array($current_user_id) : [],
'description' => __('<div class="wpem-alert wpem-mt-2 wpem-mb-0 wpem-p-0">If it doesn\'t show organizer(s). Manage your organizer(s) from <a href="javascript:void(0)" class="wpem_add_organizer_popup wpem-modal-button" data-modal-id="wpem_add_organizer_popup">here</a></div>','wp-event-manager'),
'options' =>($current_user_id) ? get_all_organizer_array($current_user_id) : [],
'description' => $organizer_description,
'priority' => 19,
'required' =>false
),
Expand All @@ -332,8 +335,8 @@ public function get_default_event_fields( ) {
'label' => __( 'Venues', 'wp-event-manager' ),
'type' => 'select',
'default' => '',
'options' => ($current_user_id) ? get_all_venue_array($current_user_id, '', true) : ['' => __( 'Select Venue', 'wp-event-manager' )],
'description' => __('<div class="wpem-alert wpem-mt-2 wpem-mb-0 wpem-p-0">If it doesn\'t show venue(s). Manage your venue(s) from <a href="javascript:void(0)" class="wpem_add_venue_popup wpem-modal-button" data-modal-id="wpem_add_venue_popup">here</a></div>','wp-event-manager'),
'options' =>($current_user_id) ? get_all_venue_array($current_user_id, '', true) : ['' => __( 'Select Venue', 'wp-event-manager')],
'description' => $venue_description,
'priority' => 21,
'required' =>false
),
Expand Down Expand Up @@ -1014,7 +1017,7 @@ public function preview_handler() {
$event = get_post( $this->event_id );
if ( in_array( $event->post_status, array( 'preview', 'expired' ) ) ) {
// Reset expiry
// delete_post_meta( $event->ID, '_event_expiry_date' );
// delete_post_meta( $event->ID, '_event_expiry_date');
// Update event listing
$update_event = array();
$update_event['ID'] = $event->ID;
Expand Down
1 change: 1 addition & 0 deletions includes/wp-event-manager-ajax.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ public function get_listings() {
'order' => sanitize_text_field($_REQUEST['order']),
'offset' => (absint($_REQUEST['page']) - 1) * absint($_REQUEST['per_page']),
'posts_per_page' => absint($_REQUEST['per_page']),
'lang' => apply_filters('wpem_set_default_page_language', $_REQUEST['lang']),
);

if(isset($_REQUEST['cancelled']) && ($_REQUEST['cancelled'] === 'true' || $_REQUEST['cancelled'] === 'false')) {
Expand Down
6 changes: 3 additions & 3 deletions includes/wp-event-manager-post-types.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1038,7 +1038,7 @@ public static function get_permalink_structure() {
if(function_exists('switch_to_locale') && did_action('admin_init')) {
switch_to_locale(get_locale());
}

$wpem_permalinks = get_option('wpem_permalinks', array());
$permalinks = wp_parse_args(
(array) get_option('wpem_permalinks', array()),
array(
Expand All @@ -1049,10 +1049,10 @@ public static function get_permalink_structure() {
);

// Ensure rewrite slugs are set.
$permalinks['event_rewrite_slug'] = untrailingslashit(empty($permalinks['event_base']) ? _x('event', 'Event permalink - resave permalinks after changing this', 'wp-event-manager') : $permalinks['event_base']);
$permalinks['event_rewrite_slug'] = untrailingslashit(empty($permalinks['event_base']) ? _x('event', 'Event permalink - resave permalinks after changing this', 'wp-event-manager') : $permalinks['event_base']);
$permalinks['category_rewrite_slug'] = untrailingslashit(empty($permalinks['category_base']) ? _x('event-category', 'Event category slug - resave permalinks after changing this', 'wp-event-manager') : $permalinks['category_base']);
$permalinks['type_rewrite_slug'] = untrailingslashit(empty($permalinks['type_base']) ? _x('event-type', 'Event type slug - resave permalinks after changing this', 'wp-event-manager') : $permalinks['type_base']);

$permalinks = apply_filters('wpem_set_event_permalinks', $permalinks);
// Restore the original locale.
if(function_exists('restore_current_locale') && did_action('admin_init')) {
restore_current_locale();
Expand Down
Binary file modified languages/wp-event-manager-hi_IN.mo
View file
Binary file not shown.
Loading

0 comments on commit e52a6b2

Please sign in to comment.