Changeset 677286

Timestamp:

03/07/2013 02:46:00 AM (11 years ago)

Author:

stephenh1988

Message:

Committing 1.7.4

Location:

event-organiser/trunk

Files:

• .gitignore (modified) (1 diff)
• classes/class-eventorganiser-shortcodes.php (modified) (5 diffs)
• css/images/help-14.png (added)
• event-organiser-calendar.php (modified) (1 diff)
• event-organiser-edit.php (modified) (1 diff)
• event-organiser-settings.php (modified) (1 diff)
• event-organiser.php (modified) (3 diffs)
• includes/event-organiser-archives.php (modified) (1 diff)
• includes/event-organiser-event-functions.php (modified) (2 diffs)
• includes/event-organiser-register.php (modified) (4 diffs)
• includes/event-organiser-utility-functions.php (modified) (1 diff)
• includes/event-organiser-venue-functions.php (modified) (1 diff)
• js/inline-help.js (added)
• readme.md (modified) (1 diff)
• readme.txt (modified) (2 diffs)
• templates/shortcode-event-list.php (modified) (1 diff)
• templates/widget-event-list.php (modified) (1 diff)

event-organiser/trunk/.gitignore

@@ -4 +4 @@
 .buildpath
 .metadata
+
+
+
+

event-organiser/trunk/classes/class-eventorganiser-shortcodes.php

@@ -182 +182 @@
             '/%(event_venue_city)%/',
             '/%(event_venue_country)%/',
+
+
             '/%(schedule_start)({([^{}]*)}{([^{}]*)}|{[^{}]*})?%/',
+
             '/%(schedule_end)({([^{}]*)}{([^{}]*)}|{[^{}]*})?%/',
             '/%(event_thumbnail)(?:{([^{}]+)})?(?:{([^{}]+)})?%/',
@@ -201 +204 @@
         global $post;
         $replacement='';
-        $col = array(
-            'start'=>array('date'=>'StartDate','time'=>'StartTime'),
-            'end'=>array('date'=>'EndDate','time'=>'FinishTime'),
-            'schedule_start'=>array('date'=>'reoccurrence_start','time'=>'StartTime'),
-            'schedule_end'=>array('date'=>'reoccurrence_end','time'=>'FinishTime')
-        );
-        
+
         switch($matches[1]):
             case 'event_title':
@@ -216 +213 @@
             case 'end':
             case 'schedule_start':
+
             case 'schedule_end':
                 switch(count($matches)):
@@ -232 +230 @@
                 endswitch;
         
-                if( eo_is_all_day(get_the_ID()) ){
-                    $replacement = eo_format_date($post->$col[$matches[1]]['date'].' '.$post->$col[$matches[1]]['time'], $dateFormat);
-                }else{  
-                    $replacement = eo_format_date($post->$col[$matches[1]]['date'].' '.$post->$col[$matches[1]]['time'], $dateFormat.$dateTime);                    
-                }
+                $format = eo_is_all_day(get_the_ID()) ? $dateFormat : $dateFormat . $dateTime;
+
+                switch( $matches[1] ):
+                    case 'start':
+                        $replacement = eo_get_the_start( $format );
+                    break;
+                    case 'end':
+                        $replacement = eo_get_the_end( $format );
+                    break;
+                    case 'schedule_start':
+                        $replacement = eo_get_schedule_start( $format );
+                    break;
+                        case 'schedule_last':
+                        case 'schedule_end':
+                        $replacement = eo_get_schedule_end( $format );
+                    break;
+                endswitch;
+
                 break;
             case 'event_duration':
@@ -292 +303 @@
                 $replacement =$address['country'];
                 break;
+
+
+
+
+
+
+
+
             case 'event_thumbnail':
                 $size = (isset($matches[2]) ? self::eo_clean_input($matches[2]) : '');

event-organiser/trunk/event-organiser-calendar.php

@@ -152 +152 @@
                     wp_die( __( 'You do not have sufficient permissions to edit this event', 'eventorganiser' ) );
         
-                //Get current event.
-                $query = new WP_Query( array( 
-                    'event_occurrence_id' => $event_id,
-                    'posts_per_page' => - 1,
-                    'post_type' => 'event',
-                    'showpastevents' => true,
-                    'perm' => 'readable',
-                ));
-
-                global $post;
-                if ( $query->have_posts() ):    
-                    $query->the_post();
-
-                    //Assign new event taxonomy terms
-                    $tax_input = array();
-                    foreach ( array( 'event-category', 'event-tag', 'event-venue' ) as $tax ):
-                        $terms = get_the_terms( $post->ID, $tax );
-                        if ( $terms &&  !is_wp_error( $terms ) ){
-                            $tax_input[$tax] = array_map( 'intval', wp_list_pluck( $terms, 'term_id' ) );
-                        }
-                    endforeach;
-
-                    //Post details
-                    $post_array = array(
-                        'post_title' => $post->post_title, 'post_name' => $post->post_name, 'post_author' => $post->post_author,
-                        'post_content' => $post->post_content, 'post_status' => $post->post_status, 'post_date' => $post->post_date,
-                        'post_date_gmt' => $post->post_date_gmt, 'post_excerpt' => $post->post_excerpt, 'post_password' => $post->post_password,
-                        'post_type' => 'event', 'tax_input' => $tax_input, 'comment_status' => $post->comment_status, 'ping_status' => $post->ping_status,
-                    );  
-
-                    //Event details
-                    $event_array = array(
-                        'start' => eo_get_the_start( DATETIMEOBJ ),
-                        'end' => eo_get_the_start( DATETIMEOBJ ),
-                        'all_day' => ( eo_is_all_day( $post_id )  ? 1 : 0 ),
-                        'schedule' => 'once',
-                        'frequency' => 1,
-                    );
-
-                    //Create new event with duplicated details (new event clears cache)
-                    $new_event_id = eo_insert_event( $post_array, $event_array );
-
-                    //delete occurrence, and copy post meta
-                    if ( $new_event_id && !is_wp_error( $new_event_id ) ){
-                        $response = _eventorganiser_remove_occurrence( $post_id, $event_id );
-
-                        $post_custom = get_post_custom( $post_id );
-                        foreach ( $post_custom as $meta_key => $meta_values ) {
-                            //Don't copy these
-                            if( in_array( $meta_key, array( '_edit_last', '_edit_last', '_edit_lock' ) ) )
-                                continue;
-        
-                            //Don't copy event meta
-                            if( 0 == strncmp( $meta_key,  '_eventorganiser', 15 ) )
-                                continue;
-
-                            foreach ( $meta_values as $meta_value ) {
-                                add_post_meta( $new_event_id, $meta_key, $meta_value );
-                            }
-                        }
-                    }
-
-                    //Redirect to prevent resubmisson
-                    $redirect = add_query_arg( array( 'post_type' => 'event', 'page' => 'calendar' ), admin_url( 'edit.php' ) );
-                    wp_redirect( $redirect );
-                endif;
+                eo_break_occurrence( $post_id, $event_id );
+
+                //Redirect to prevent resubmisson
+                $redirect = add_query_arg( array( 'post_type' => 'event', 'page' => 'calendar' ), admin_url( 'edit.php' ) );
+                wp_redirect( $redirect );
 
             elseif( $action == 'delete_occurrence' ):

event-organiser/trunk/event-organiser-edit.php

@@ -373 +373 @@
     foreach ( $notice as $pid => $messages ){
         if ( $post->ID == $pid ){
-            printf( '<div id="message" class="error"> <p> %s </p> </div>', implode( ' </p> <p> ', $m ) );
+            printf( '<div id="message" class="error"> <p> %s </p> </div>', implode( ' </p> <p> ', $m ) );
 
             //make sure to remove notice after its displayed so its only displayed when needed.

event-organiser/trunk/event-organiser-settings.php

@@ -256 +256 @@
                 ) );
 
-                add_settings_field( 'url_cat', __("Event Tags", 'eventorganiser' ), 'eventorganiser_text_field' , 'eventorganiser_'.$tab_id, $tab_id,
+                add_settings_field( 'url_', __("Event Tags", 'eventorganiser' ), 'eventorganiser_text_field' , 'eventorganiser_'.$tab_id, $tab_id,
                     array(
                         'label_for' => 'url_tag',

event-organiser/trunk/event-organiser.php

@@ -3 +3 @@
 Plugin Name: Event Organiser
 Plugin URI: http://www.wp-event-organiser.com
-Version: 1.7.3
+Version: 1.7.
 Description: Creates a custom post type 'events' with features such as reoccurring events, venues, Google Maps, calendar views and events and venue pages
 Author: Stephen Harris
@@ -42 +42 @@
  */ 
 global $eventorganiser_db_version;
-$eventorganiser_db_version = '1.7.3';
-
-/**
- * Defines the plug-in directory url
- * <code>url:http://mysite.com/wp-content/plugins/event-organiser</code>
- */
-define( 'EVENT_ORGANISER_URL', plugin_dir_url( __FILE__ ) );
+$eventorganiser_db_version = '1.7.4';
+
+
+add_action( 'after_setup_theme', '_eventorganiser_set_constants' );
+function _eventorganiser_set_constants(){
+    /*
+    * Defines the plug-in directory url
+    * <code>url:http://mysite.com/wp-content/plugins/event-organiser</code>
+    */
+    define( 'EVENT_ORGANISER_URL', plugin_dir_url( __FILE__ ) );
+}
+
+/*
+ * Defines the plug-in directory path
+ * <code>/home/mysite/public_html/wp-content/plugins/event-organiser</code>
+*/
+define( 'EVENT_ORGANISER_DIR', plugin_dir_path( __FILE__ ) );
 
 /**
@@ -54 +64 @@
  */
 define( 'DATETIMEOBJ', 'DATETIMEOBJ', true );
-
-/**
- * Defines the plug-in directory path
- * <code>/home/mysite/public_html/wp-content/plugins/event-organiser</code>
- */
-define( 'EVENT_ORGANISER_DIR', plugin_dir_path( __FILE__ ) );
 
 

event-organiser/trunk/includes/event-organiser-archives.php

@@ -224 +224 @@
     add_filter('posts_groupby', 'eventorganiser_event_groupby',10,2);
 }
-add_action( 'pre_get_posts', 'eventorganiser_pre_get_posts' );
+add_action( 'pre_get_posts', 'eventorganiser_pre_get_posts', 11 );
+
+//Workaround for https://github.com/stephenharris/Event-Organiser/issues/55,
+add_action( 'pre_get_posts', '__return_false', 10 );
 
 

event-organiser/trunk/includes/event-organiser-event-functions.php

@@ -680 +680 @@
         return false;
 
-    $occurrences = wp_cache_get( 'eventorganiser_occurrences_'.$post_id );
+     //Can't cache datetime objects before 5.3
+     //@see{http://wordpress.org/support/topic/warning-datetimeformat-functiondatetime-format?replies=7#post-3940247}
+    if( version_compare(PHP_VERSION, '5.3.0') >= 0 ){
+        $occurrences = wp_cache_get( 'eventorganiser_occurrences_'.$post_id );
+    }else{
+        $occurrences = false;
+    }
+
     if( !$occurrences ){
 
@@ -1112 +1119 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 ?>

event-organiser/trunk/includes/event-organiser-register.php

@@ -10 +10 @@
 function eventorganiser_register_script() {
     global $wp_locale;
-    $version = '1.7.2';
+    $version = '1.7.';
 
     $ext = (defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG) ? '' : '.min';
@@ -77 +77 @@
  */
 function eventorganiser_register_scripts(){
-    $version = '1.7.2';
+    $version = '1.7.';
     $ext = (defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG) ? '' : '.min';
 
@@ -109 +109 @@
     /* Admin styling */
     wp_register_style('eventorganiser-style',EVENT_ORGANISER_URL.'css/eventorganiser-admin-style.css',array('eventorganiser-jquery-ui-style'),$version);
+
+
+
 }
 add_action('admin_enqueue_scripts', 'eventorganiser_register_scripts',10);
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
  /**
@@ -426 +448 @@
     'update_option_rewrite_rules', /* If permalinks updated - links on fullcalendar might now be invalid */ 
     'delete_option_rewrite_rules',
+
+
     'edited_event-category', /* Colours of events may change */
 );

event-organiser/trunk/includes/event-organiser-utility-functions.php

@@ -838 +838 @@
     return wp_cache_add( "eo_".$ns_key."_".$key, $value, $group, $expire );
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     
 ?>

event-organiser/trunk/includes/event-organiser-venue-functions.php

@@ -792 +792 @@
         '_state'=>  __('State / Province','eventorganiser'),
         '_postcode'=>  __('Post Code','eventorganiser'),
-        '_state'=>  __('State / Province','eventorganiser'),
         '_country'=>  __('Country','eventorganiser'),
     );

event-organiser/trunk/readme.md

@@ -175 +175 @@
 ## Changelog ##
 
+
+
+
+
+
+
+
+
 ### 1.7.3 ###
 * Use home_url instead of site_url.

event-organiser/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 3.3
 Tested up to: 3.5
-Stable tag: 1.7.3
+Stable tag: 1.7.
 License: GPLv3
 
@@ -163 +163 @@
 == Changelog ==
 
+
+
+
+
+
+
+
+
 = 1.7.3 =
 * Use home_url instead of site_url.

event-organiser/trunk/templates/shortcode-event-list.php

@@ -31 +31 @@
 //The list ID / classes
 $id = $eo_event_loop_args['id'];
-$class = $eo_event_loop_args['class'];
+$class = $eo_event_loop_args['class'];
 
 ?>

event-organiser/trunk/templates/widget-event-list.php

@@ -28 +28 @@
 //The list ID / classes
 $id = $eo_event_loop_args['id'];
-$class = $eo_event_loop_args['class'];
+$class = $eo_event_loop_args['class'];
 
 ?>