WordPress.org

Plugin Directory

Changeset 1802844


Ignore:
Timestamp:
01/15/18 00:34:35 (5 weeks ago)
Author:
netweblogic
Message:

updating stable tag 5.8.1.2 and dev version 5.8.1.22

Location:
events-manager
Files:
328 added
7 edited

Legend:

Unmodified
Added
Removed
  • events-manager/trunk/classes/em-bookings.php

    r1786433 r1802844  
    320320            $result = $wpdb->query("DELETE FROM ".EM_BOOKINGS_TABLE." WHERE event_id = '$event_id'"); 
    321321        }else{ 
    322             $result = $result_tickets == true; 
     322            //we have not bookings loaded to delete, nor an event to delete bookings from, so bookings are considered 'deleted' since there's nothing ot delete 
     323            $result = $result_tickets = true; 
    323324        } 
    324325        do_action('em_bookings_deleted', $result, $booking_ids); 
  • events-manager/trunk/classes/em-event.php

    r1787564 r1802844  
    156156        'event_end_date' => array( 'name'=>'end_date', 'type'=>'%s', 'null'=>true ), 
    157157        'post_content' => array( 'name'=>'notes', 'type'=>'%s', 'null'=>true ), 
    158         'event_rsvp' => array( 'name'=>'rsvp', 'type'=>'%d', 'null'=>true ), //has a default, so can be null/excluded 
     158        'event_rsvp' => array( 'name'=>'rsvp', 'type'=>'%d' ), 
    159159        'event_rsvp_date' => array( 'name'=>'rsvp_date', 'type'=>'%s', 'null'=>true ), 
    160160        'event_rsvp_time' => array( 'name'=>'rsvp_time', 'type'=>'%s', 'null'=>true ), 
     
    17081708    function output($format, $target="html") {   
    17091709        global $wpdb; 
     1710        $format = do_shortcode($format); //parse shortcode first, so that formats within shortcodes are parsed properly 
    17101711        $event_string = $format; 
    17111712        //Time place holder that doesn't show if empty. 
  • events-manager/trunk/em-actions.php

    r1722840 r1802844  
    314314                $EM_Booking->tickets_bookings->booking = $EM_Ticket_Booking->booking = $EM_Booking; 
    315315                $EM_Booking->tickets_bookings->add( $EM_Ticket_Booking ); 
    316                 //Now save booking 
    317                 if( $EM_Event->get_bookings()->add($EM_Booking) ){ 
    318                     $result = true; 
    319                     $EM_Notices->add_confirm( $EM_Event->get_bookings()->feedback_message );         
    320                     $feedback = $EM_Event->get_bookings()->feedback_message;     
     316                $post_validation = $EM_Booking->validate(); 
     317                do_action('em_booking_add', $EM_Event, $EM_Booking, $post_validation); 
     318                if( $post_validation ){ 
     319                    //Now save booking 
     320                    if( $EM_Event->get_bookings()->add($EM_Booking) ){ 
     321                        $result = true; 
     322                        $EM_Notices->add_confirm( $EM_Event->get_bookings()->feedback_message );         
     323                        $feedback = $EM_Event->get_bookings()->feedback_message;     
     324                    }else{ 
     325                        $result = false; 
     326                        $EM_Notices->add_error( $EM_Event->get_bookings()->get_errors() );           
     327                        $feedback = $EM_Event->get_bookings()->feedback_message;     
     328                    } 
    321329                }else{ 
    322330                    $result = false; 
    323                     $EM_Notices->add_error( $EM_Event->get_bookings()->get_errors() );           
    324                     $feedback = $EM_Event->get_bookings()->feedback_message;     
     331                    $EM_Notices->add_error( $EM_Booking->get_errors() ); 
     332                    $feedback = $EM_Event->get_bookings()->feedback_message; 
    325333                } 
    326334            }else{ 
  • events-manager/trunk/events-manager.php

    r1787564 r1802844  
    22/* 
    33Plugin Name: Events Manager 
    4 Version: 5.8.1.21 
     4Version: 5.8.1.22 
    55Plugin URI: http://wp-events-plugin.com 
    66Description: Event registration and booking management for WordPress. Recurring events, locations, google maps, rss, ical, booking registration and more! 
  • events-manager/trunk/includes/js/events-manager.js

    r1657109 r1802844  
    926926    em_LatLng = new google.maps.LatLng( jQuery('#em-location-map-coords-'+map_id+' .lat').text(), jQuery('#em-location-map-coords-'+map_id+' .lng').text()); 
    927927    //extend map and markers via event triggers 
    928     var is_touch = 'ontouchstart' in window || navigator.maxTouchPoints; 
    929928    var map_options = { 
    930929        zoom: 14, 
     
    932931        mapTypeId: google.maps.MapTypeId.ROADMAP, 
    933932        mapTypeControl: false, 
    934         scrollwheel: is_touch 
     933        gestureHandling: 'cooperative' 
    935934    }; 
    936935    if( typeof EM.google_map_id_styles == 'object' && typeof EM.google_map_id_styles[map_id] !== 'undefined' ){ console.log(EM.google_map_id_styles[map_id]); map_options.styles = EM.google_map_id_styles[map_id]; } 
     
    938937    jQuery(document).triggerHandler('em_maps_location_map_options', map_options); 
    939938    maps[map_id] = new google.maps.Map( document.getElementById('em-location-map-'+map_id), map_options); 
    940     if( !is_touch ){ 
    941         maps[map_id].addListener('click', function(){ maps[map_id].setOptions({ scrollwheel:true }); }); 
    942         maps[map_id].addListener('mouseout', function(){ maps[map_id].setOptions({ scrollwheel:false }); }); 
    943     } 
    944939    var marker_options = { 
    945940        position: em_LatLng, 
     
    984979                var position = new google.maps.LatLng(location_latitude, location_longitude); //the location coords 
    985980                marker.setPosition(position); 
    986                 var mapTitle = (jQuery('input#location-name').length > 0) ? jQuery('input#location-name').val():jQuery('input#title').val(); 
     981                var mapTitle = (jQuery('input#location-name').length > 0) ? jQuery(jQuery.parseHTML(jQuery('input#location-name').val())).text():jQuery('input#title').val(); 
     982                var mapAddress = jQuery('#location-address').val(); 
     983                var mapTown = jQuery('#location-town').val(); 
    987984                marker.setTitle( jQuery('input#location-name input#title, #location-select-id').first().val() ); 
    988985                jQuery('#em-map').show(); 
     
    994991                    '<div id="location-balloon-content"><strong>' +  
    995992                    mapTitle +  
    996                     '</strong><br/>' +  
    997                     jQuery('#location-address').val() +  
    998                     '<br/>' + jQuery('#location-town').val()+  
     993                    '</strong><br>' +  
     994                    jQuery(jQuery.parseHTML(mapAddress)).text() +  
     995                    '<br>' + jQuery(jQuery.parseHTML(mapTown)).text() +  
    999996                    '</div>' 
    1000997                ); 
     
    10641061        if(jQuery('#em-map').length > 0){ 
    10651062            var em_LatLng = new google.maps.LatLng(0, 0); 
    1066             var is_touch = 'ontouchstart' in window || navigator.maxTouchPoints; 
    10671063            var map_options = { 
    10681064                    zoom: 14, 
     
    10701066                    mapTypeId: google.maps.MapTypeId.ROADMAP, 
    10711067                    mapTypeControl: false, 
    1072                     scrollwheel: is_touch 
     1068                    gestureHandling: 'cooperative' 
    10731069            }; 
    10741070            if( typeof EM.google_maps_styles !== 'undefined' ){ map_options.styles = EM.google_maps_styles; } 
    10751071            map = new google.maps.Map( document.getElementById('em-map'), map_options); 
    1076             if( !is_touch ){ 
    1077                 map.addListener('click', function(){ map.setOptions({ scrollwheel:true }); }); 
    1078                 map.addListener('mouseout', function(){ map.setOptions({ scrollwheel:false }); }); 
    1079             } 
    10801072            var marker = new google.maps.Marker({ 
    10811073                position: em_LatLng, 
  • events-manager/trunk/readme.txt

    r1787564 r1802844  
    66Requires at least: 3.5 
    77Tested up to: 4.9 
    8 Stable tag: 5.8.1.1 
     8Stable tag: 5.8.1.2 
    99 
    1010Fully featured event registration management including recurring events, locations management, calendar, Google map integration, booking management 
     
    101101== Changelog == 
    102102 
    103 = 5.8.1.21 (dev) = 
     103= 5.8.1.22 (dev) = 
    104104* added timezone support 
     105* fixes applied to 5.8.1.2 merged into dev version 
     106 
     107= 5.8.1.2 = 
     108* security release fixing a potential stored XSS vulnerability (disclosure pending, props to Luigi Gubello for responsible disclosure) 
     109* fixed scrolling issues on Google Maps 
     110* fixed duplicate value attribute in custom fields/attributes front-end editor 
     111* fixed shortcodes getting parsed after formats resulting in preparsed formats within shortcode 
     112* fixed lack of booking validation filter on single booking button 
     113* fixed minor PHP warning 
     114* fixed duplication errors for events without bookings enabled 
    105115 
    106116= 5.8.1.1 = 
  • events-manager/trunk/templates/forms/event/attributes-public.php

    r1311743 r1802844  
    2424        </select> 
    2525        <?php else: ?> 
    26         <?php $default_value = (!empty($attributes['values'][$name][0])) ? $attributes['values'][$name][0]:''; ?> 
    27         <input type="text" name="em_attributes[<?php echo $name ?>]" value="<?php echo array_key_exists($name, $EM_Event->event_attributes) ? esc_attr($EM_Event->event_attributes[$name], ENT_QUOTES):''; ?>" value="<?php echo $default_value; ?>" /> 
     26        <input type="text" name="em_attributes[<?php echo $name ?>]" value="<?php echo array_key_exists($name, $EM_Event->event_attributes) ? esc_attr($EM_Event->event_attributes[$name], ENT_QUOTES):''; ?>" /> 
    2827        <?php endif; ?> 
    2928    </div> 
Note: See TracChangeset for help on using the changeset viewer.