Changeset 683356

Timestamp:

03/17/2013 06:49:15 PM (11 years ago)

Author:

stephenh1988

Message:

Merging in 1.8

Location:

event-organiser/trunk

Files:

• .gitignore (modified) (1 diff)
• classes/class-eo-event-list-widget.php (modified) (1 diff)
• classes/class-eo-widget-categories.php (added)
• classes/class-eo-widget-venues.php (added)
• classes/class-eventorganiser-shortcodes.php (modified) (1 diff)
• css/eventorganiser-admin-style.css (modified) (2 diffs)
• css/images/info-14.png (added)
• event-organiser-calendar.php (modified) (1 diff)
• event-organiser-edit.php (modified) (2 diffs)
• event-organiser-settings.php (modified) (2 diffs)
• event-organiser.php (modified) (6 diffs)
• includes/class-event-organiser-im-export.php (modified) (5 diffs)
• includes/event-organiser-archives.php (modified) (8 diffs)
• includes/event-organiser-cpt.php (modified) (1 diff)
• includes/event-organiser-event-functions.php (modified) (6 diffs)
• includes/event-organiser-install.php (modified) (5 diffs)
• includes/event-organiser-register.php (modified) (6 diffs)
• includes/event-organiser-templates.php (modified) (2 diffs)
• includes/event-organiser-utility-functions.php (modified) (10 diffs)
• includes/event-organiser-venue-functions.php (modified) (1 diff)
• includes/event.php (modified) (1 diff)
• js/frontend.js (modified) (2 diffs)
• js/frontend.min.js (modified) (1 diff)
• js/inline-help.js (modified) (1 diff)
• languages/eventorganiser-et.mo (added)
• languages/eventorganiser-et.po (added)
• readme.md (modified) (4 diffs)
• readme.txt (modified) (3 diffs)
• templates/shortcode-event-list.php (modified) (1 diff)
• templates/widget-event-list.php (modified) (1 diff)

event-organiser/trunk/.gitignore

@@ -7 +7 @@
 dist
 externs.js
+
 Makefile

event-organiser/trunk/classes/class-eo-event-list-widget.php

@@ -72 +72 @@
   </p>
   <p>
-    <label for="<?php echo $this->get_field_id('template'); ?>"><?php _e('Template (leave blank for default)', 'eventorganiser'); ?>  </label>
+    <label for="<?php echo $this->get_field_id('template'); ?>">
+    <?php 
+        _e('Template (leave blank for default)', 'eventorganiser'); 
+        echo eventorganiser_inline_help( 
+            __( 'Event list widget placeholders', 'eventorganiser' ),
+            sprintf(
+                    __( 'You can use specified tags as placeholders for event information which you want to appear in the widget. <a href="%s" target="_blank"> Find out more</a>.', 'eventorganiser' ),
+                    'http://wp-event-organiser.com/documentation/widgets/#whatistemplate'
+                )
+            );
+     ?>
+    </label>
       <input  id="<?php echo $this->get_field_id('template'); ?>" class="widefat" name="<?php echo $this->get_field_name('template'); ?>" type="text" value="<?php echo esc_attr($instance['template']);?>" />
-    <small><a href="http://wp-event-organiser.com/documentation/widgets/#whatistemplate" target="_blank"><?php _e("What's this?","eventorganiser"); ?></a></small>
+
   </p>
   <p>

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

@@ -63 +63 @@
         ), $atts ) );
 
-        $url = add_query_arg('feed','eo-events',site_url());
+        $url = );
 
         $class = esc_attr($class);

event-organiser/trunk/css/eventorganiser-admin-style.css

@@ -71 +71 @@
 .eo-venue-combobox-buttons{position: absolute;width:4.5em;}
 
+
+
+
+
+
+
+
+
+
+
+
+
+
 /*
  * Timepicker stylesheet
@@ -90 +103 @@
 .ui-timepicker-table td,.ui-timepicker-table th.periods{width:2.2em;padding:.1em}
 .ui-timepicker .ui-timepicker-now,.ui-timepicker .ui-timepicker-deselect{float:left}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

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

@@ -38 +38 @@
             'ajaxurl' => admin_url( 'admin-ajax.php' ),
             'startday' => intval( get_option( 'start_of_week' ) ),
-            'format' => eventorganiser_get_option( 'dateformat' ).'-yy',
+            'format' => eventorganiser_,
             ));
         wp_localize_script( 'eo_calendar', 'EO_Ajax', array( 
             'ajaxurl' => admin_url( 'admin-ajax.php' ),
             'startday' => intval( get_option( 'start_of_week' ) ),
-            'format' => eventorganiser_get_option( 'dateformat' ).'-yy',
+            'format' => eventorganiser_,
             'timeFormat' => ( get_current_screen()->get_option( 'eofc_time_format', 'value' ) ? 'h:mmtt' : 'HH:mm' ),
             'perm_edit' => current_user_can( 'edit_events' ),

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

@@ -40 +40 @@
 
     //Sets the format as php understands it, and textual.
-    if ( eventorganiser_get_option( 'dateformat' ) == 'dd-mm' ){
-        $phpFormat = 'd-m-Y';
+    
+    
         $format    = 'dd-mm-yyyy'; //Human form
-    } else {
-        $phpFormat = 'm-d-Y';
+    } elseif( 'Y-m-d' == $phpFormat ) {
+        $format = 'yyyy-mm-dd'; //Human form
+    }else{
         $format = 'mm-dd-yyyy'; //Human form
     }
@@ -322 +323 @@
         if ( !empty( $arr ) ){
             foreach ( $arr as $date ):
-                $date_obj = _eventorganiser_check_datetime( $date . ' ' . $raw_data['StartTime'], true );
+                $date_obj = _eventorganiser_check_datetime( $date . ' ' . $raw_data['StartTime'],  );
                 if( $date_obj )
                     $in_ex[$key][] = $date_obj;

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

@@ -125 +125 @@
                         'name' => 'eventorganiser_options[dateformat]',
                         'options' => array(
-                            'dd-mm' => __( 'dd-mm-yyyy', 'eventorganiser' ),
-                            'mm-dd' => __( 'mm-dd-yyyy', 'eventorganiser' ),
+                            'd-m-Y' => __( 'dd-mm-yyyy', 'eventorganiser' ),
+                            'm-d-Y' => __( 'mm-dd-yyyy', 'eventorganiser' ),
+                            'Y-m-d' => __( 'yyyy-mm-dd', 'eventorganiser' ),
                         ),
                         'help' => __("This alters the default format for inputting dates.", 'eventorganiser' ),
@@ -310 +311 @@
                 //Navigation menu - $addtomenu int 0 if no menu, menu databse ID otherwise
                 $clean['menu_item_db_id'] = $this->update_nav_menu( $clean['addtomenu'], $clean['navtitle'] );
+
+
+
+
+
+
             break;
 

event-organiser/trunk/event-organiser.php

@@ -3 +3 @@
 Plugin Name: Event Organiser
 Plugin URI: http://www.wp-event-organiser.com
-Version: 1.7.4
+Version: 1.
 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.4';
+$eventorganiser_db_version = '1.';
 
 
@@ -132 +132 @@
         'supports' => array( 'title', 'editor', 'author', 'thumbnail', 'excerpt', 'custom-fields', 'comments', 'eventtag' ),
         'event_redirect' => 'events',
-        'dateformat' => 'dd-mm',
+        'dateformat' => 'd',
         'prettyurl' => 1,
         'templates' => 1,
@@ -147 +147 @@
     if( $option === 'eventtag' )
         return in_array( 'eventtag', $options['supports'] );
-
-      if( !isset($options[$option]) )
-           return $default;
-
-      return $options[$option];
+    
+    if( $option === 'dateformat' ){
+        //Backwards compatibility (migration from mm-dd/dd-mm to php format):
+        if( $options[$option] == 'mm-dd' ){
+            $options[$option] = 'm-d-Y';
+        }elseif( $options[$option] == 'dd-mm' ){
+            $options[$option] = 'd-m-Y';
+        }
+    }
+
+     if( !isset($options[$option]) )
+          return $default;
+
+    return $options[$option];
 }
 
@@ -200 +209 @@
 require_once(EVENT_ORGANISER_DIR.'classes/class-eo-event-list-widget.php');
 require_once(EVENT_ORGANISER_DIR.'classes/class-eo-calendar-widget.php');
+
+
 require_once(EVENT_ORGANISER_DIR.'classes/class-eventorganiser-shortcodes.php');
 
@@ -208 +219 @@
     register_widget( 'EO_Events_Agenda_Widget' );
     register_widget( 'EO_Calendar_Widget' );
+
+
 }
 ?>

event-organiser/trunk/includes/class-event-organiser-im-export.php

@@ -95 +95 @@
                 <div class="inside">
                     <p><?php _e( 'Import an ICS file.', 'eventorganiser'); ?></p>
-                    <input type="checkbox" name="eo_import_venue" value=1 /> <?php _e( 'Import venues', 'eventorganiser' ); ?>
-                    <input type="checkbox" name="eo_import_cat" value=1 /> <?php _e( 'Import categories', 'eventorganiser' ); ?>
+                    <>
+                    <>
                     <p><input type="file" name="ics" /></p>
                     <?php wp_nonce_field('eventorganiser_import_events'); ?>
@@ -241 +241 @@
         }
     }?>
-EXDATE<?php echo $vdate;?>:<?php echo implode(',',$exclude_strings);
-
-endif; ?>
+EXDATE<?php echo $vdate;?>:<?php echo implode(',',$exclude_strings);
+
+?>
 <?php if( !empty($schedule_data['include']) ):
     $include_strings = array();
@@ -377 +377 @@
         $event_count =0;
 
-            $event_array = array();
+        $event_array = array();
         $event_array['event'] = array();
         $event_array['event_post'] = array();
@@ -421 +421 @@
                         //Otherwise, parse event property
                         try{
+
+
+
+
                             $event_array = $this->parse_Event_Property($event_array,$property,$value,$modifiers,$blog_tz,$cal_tz);
 
@@ -690 +694 @@
  */
     function parse_icalText($text){
-        $text = str_replace("\\r\\n","</br>",$text);
+        //Get rid of carriage returns:
+        $text = str_replace("\r\n","\n",$text);
+        $text = str_replace("\r","\n",$text);
+        
+        //Some calendar apps break up text
+        $text = str_replace("\n ","",$text);
+        $text = str_replace("\r ","",$text);
+        
+        //Any intended carriage returns/new-lines converted to HTML
+        $text = str_replace("\\r\\n","",$text);
         $text = str_replace("\\n","</br>",$text);
         $text = stripslashes($text);

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

@@ -49 +49 @@
         $venue = $query->get('venue');
         $query->set('event-venue',$venue);
+
        }
-
-    //If event-venue, event-tag or event-category is being queried, we must be after events
-    if(isset($query->query_vars['event-venue'])  || isset($query->query_vars['event-category'] ) || isset($query->query_vars['event-tag']) || $query->is_feed('eo-events') ){
-        $query->set('post_type', 'event');
-    }
 
     //If querying for all events starting on given date, set the date parameters
@@ -85 +81 @@
 
     //If not on event, stop here.
-    if('event'!= $query->get('post_type') )
+    if() )
         return $query;
 
@@ -265 +261 @@
     global $wpdb;
 
-    if('event'== $query->get('post_type') ) {
+    if({
         $et =$wpdb->eo_events;
         /* Include 'event_occurrence' for backwards compatibility. Will eventually be removed. */
@@ -299 +295 @@
     }
 
-    if('event'== $query->get('post_type') ) :
+    if(:
         if(empty($groupby))
             return $groupby;
@@ -325 +321 @@
     global $wpdb;
 
-    if('event'== $query->get('post_type') ) {
-            $join .=" LEFT JOIN $wpdb->eo_events ON $wpdb->posts.id = {$wpdb->eo_events}.post_id ";
+    if({
+        $join .=" LEFT JOIN $wpdb->eo_events ON $wpdb->posts.id = {$wpdb->eo_events}.post_id ";
     }
     return $join;
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 /**
@@ -347 +364 @@
 
     //Only alter event queries
-    if('event'== $query->get('post_type') ):
+    if() ):
 
         //If we only want events (or occurrences of events) that belong to a particular 'event'
@@ -396 +413 @@
         }
     endif;
+
     return $where;
 }
@@ -433 +451 @@
         endswitch;
 
-    }elseif('event'== $query->get('post_type') ) {
+    }elseif({
             //If no orderby is set, but we are querying events, return the default order for events;
             $orderby = " {$wpdb->eo_events}.StartDate ASC, {$wpdb->eo_events}.StartTime ASC";

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

@@ -855 +855 @@
 }
 add_filter('get_edit_term_link','eventorganiser_edit_venue_link',10,3);
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 ?>

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

@@ -812 +812 @@
  */
 function eo_is_event_taxonomy(){
-    return (is_tax(array('event-category','event-tag','event-venue')));
+    $event_tax = get_object_taxonomies( 'event' );
+    return ( is_tax( $event_tax ) );
 }
 
@@ -991 +992 @@
         'tooltip'=>true, 'weekends'=>true, 'mintime'=>'0', 'maxtime'=>'24', 'alldayslot'=>true,
         'alldaytext'=>__('All Day','eventorganiser'), 'columnformatmonth'=>'D', 'columnformatweek'=>'D n/j', 'columnformatday'=>'l n/j',
+
     );
     $args = shortcode_atts( $defaults, $args );
@@ -997 +999 @@
     
     //Convert php time format into xDate time format
-    $date_attributes = array( 'timeformat', 'axisformat', 'columnformatday', 'columnformatweek', 'columnformatmonth' );
+    $date_attributes = array( 'timeformat', 'axisformat', 'columnformatday', 'columnformatweek', 'columnformatmonth',
+    'titleformatmonth', 'titleformatday', 'titleformatweek' );
     $args['timeformatphp'] = $args['timeformat'];
     foreach ( $date_attributes as $date_attribute ){
+
+
         $args[$date_attribute.'php'] = $args[$date_attribute];
         $args[$date_attribute] = eventorganiser_php2xdate( $args[$date_attribute] );
@@ -1125 +1130 @@
     $post = get_post( $post_id );
     setup_postdata( $post_id );
+
+
     
     $tax_input = array();
@@ -1160 +1167 @@
         $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' ) ) )
+            $ignore_meta = array( '_eo_tickets', '_edit_last', '_edit_last', '_edit_lock' ) ;
+            $ignore_meta = apply_filters( 'eventorganiser_breaking_occurrence_exclude_meta', $ignore_meta );
+            if( in_array( $meta_key, $ignore_meta ) )
                 continue;
         
@@ -1177 +1187 @@
     }
     _eventorganiser_delete_calendar_cache();
+
+
+
     wp_reset_postdata();
     return $new_event_id;

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

@@ -8 +8 @@
  *@ignore
 */
- function eventorganiser_install(){
-       global $wpdb, $eventorganiser_db_version;
+ function eventorganiser_install( $is_networkwide = false ){
+       global $wpdb;
+
+        // Is this multisite and did the user click network activate?
+        $is_multisite = ( function_exists('is_multisite') && is_multisite() );
+
+        if ($is_multisite && $is_networkwide) {
+                // Get the current blog so we can return to it.
+            $current_blog_id = get_current_blog_id();
+
+            // Get a list of all blogs.
+             $blog_ids = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" );
+        if( $blog_ids ){
+            foreach ( $blog_ids as $blog_id ) {
+                switch_to_blog( $blog_id );
+                        eventorganiser_site_install();
+                 }
+            switch_to_blog( $current_blog_id );
+        }else{
+            eventorganiser_site_install();
+        }
+        }else {
+            eventorganiser_site_install();
+        }
+}
+
+function eventorganiser_site_install(){
+    global $wpdb, $eventorganiser_db_version;
 
     eventorganiser_wpdb_fix();
@@ -103 +129 @@
     //Flush rewrite rules only on activation, and after CPT/CTs has been registered.
     flush_rewrite_rules();
-
 }
 
@@ -109 +134 @@
  * Deactivate routine
  *
- * Clears cron jobs and flushes rewrite rules
+ * 
  *
  *@since 1.5
@@ -116 +141 @@
 */
 function eventorganiser_deactivate(){
-    eventorganiser_clear_cron_jobs();
     flush_rewrite_rules();
     }
@@ -280 +304 @@
  *@ignore
 */
-function eventorganiser_uninstall(){
+function eventorganiser_uninstall( $is_networkwide = false ){
+    global $wpdb;
+
+        // Is this multisite and did the user click network activate?
+        $is_multisite = ( function_exists('is_multisite') && is_multisite() );
+
+        if ( $is_multisite && $is_networkwide ) {
+                // Get the current blog so we can return to it.
+            $current_blog_id = get_current_blog_id();
+
+            // Get a list of all blogs.
+            $blog_ids = $wpdb->get_col( "SELECT blog_id FROM $wpdb->blogs" );
+        if( $blog_ids ){
+            foreach ( $blog_ids as $blog_id ) {
+                switch_to_blog( $blog_id );
+                        eventorganiser_uninstall_install();
+                 }
+            switch_to_blog( $current_blog_id );
+        }else{
+            eventorganiser_uninstall_install();
+        }
+        }else {
+            eventorganiser_uninstall_install();
+        }
+
+}
+
+function eventorganiser_uninstall_site(){
     global $wpdb,$eventorganiser_roles, $wp_roles,$wp_taxonomies;
 

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

@@ -10 +10 @@
 function eventorganiser_register_script() {
     global $wp_locale;
-    $version = '1.7.4';
+    $version = '1.';
 
     $ext = (defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG) ? '' : '.min';
@@ -77 +77 @@
  */
 function eventorganiser_register_scripts(){
-    $version = '1.7.4';
+    $version = '1.';
     $ext = (defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG) ? '' : '.min';
 
@@ -108 +108 @@
 
     /* Admin styling */
-    wp_register_style('eventorganiser-style',EVENT_ORGANISER_URL.'css/eventorganiser-admin-style.css',array('eventorganiser-jquery-ui-style'),$version);
+    wp_register_style('eventorganiser-style',EVENT_ORGANISER_URL.'css/eventorganiser-admin-style.css',array('eventorganiser-jquery-ui-style'),$version);
 
     /* Inline Help */
         wp_register_script( 'eo-inline-help', EVENT_ORGANISER_URL.'js/inline-help.js',array( 'jquery', 'eo_qtip2' ), $version, true );
 }
-add_action('admin_enqueue_scripts', 'eventorganiser_register_scripts',10);
-
+add_action( 'admin_init', 'eventorganiser_register_scripts', 5 );
+
+
+ /**
+ * The "Comprehensive Google Map Plugin" plug-in deregisters all other Google scripts registered
+ * by other plug-ins causing these plug-ins not to function. This plug-in removes that behaviour.
+ *
+ * Of course if two google scripts are loaded there may be problems, but this is better than always having
+ * experiencing a 'bug'. At time writing the function responsible `cgmp_google_map_deregister_scripts()` 
+ * can be found here {@see https://github.com/azagniotov/Comprehensive-Google-Map-Plugin/blob/master/functions.php#L520 }
+ *
+ * @see https://github.com/stephenharris/Event-Organiser/issues/49
+ * @see http://wordpress.org/support/topic/googlemap-doesnt-shown-on-event-detail-page
+ * @since 1.7.4
+ * @ignore
+ * @access private
+ */
+function eventorganiser_cgmp_workaround(){
+    remove_action( 'wp_head', 'cgmp_google_map_deregister_scripts', 200 );
+}
+add_action( 'wp_head', 'eventorganiser_cgmp_workaround', 1 );
 
  /**
@@ -181 +200 @@
                     'ajaxurl' => admin_url( 'admin-ajax.php' ),
                     'startday'=>intval(get_option('start_of_week')),
-                    'format'=> eventorganiser_get_option('dateformat').'-yy',
+                    'format'=> eventorganiser_,
                     'current_user_can' => array(
                         'manage_venues' => current_user_can( 'manage_venues' ),
@@ -343 +362 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 /**
@@ -355 +396 @@
     //Get expired events
     $events = eo_get_events(array('showrepeats'=>0,'showpastevents'=>1,'eo_interval'=>'expired'));
+
     if($events):
+
+
         foreach($events as $event):
-            $now = new DateTime('now', eo_get_blog_timezone());
-            $start = new DateTime($event->StartDate.' '.$event->StartTime, eo_get_blog_timezone());
-            $end = new DateTime($event->EndDate.' '.$event->FinishTime, eo_get_blog_timezone());
+            
+            $start = eo_get_the_start( DATETIMEOBJ, $event->ID, null, $event->occurrence_id );
+            $end = eo_get_the_end( DATETIMEOBJ, $event->ID, null, $event->occurrence_id );
+            
             $expired = round(abs($end->format('U')-$start->format('U'))) + 24*60*60; //Duration + 24 hours
-            $finished =  new DateTime($event->reoccurrence_end.' '.$event->StartTime, eo_get_blog_timezone());
-            $finished->modify("+$expired seconds");
-
+            
+            $finished =  eo_get_schedule_last( DATETIMEOBJ, $event->ID );
+            $finished->modify("+$expired seconds");//24 horus after the last occurrence finishes
+            
             //Delete if 24 hours has passed
-            if($finished <= $now):
+            if($finished <= $now)
                 wp_trash_post((int) $event->ID);
-            endif;
+            }
+            
         endforeach;
     endif;

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

@@ -100 +100 @@
     switch( $type ){
         case 'year':
-            if( _eventorganiser_check_datetime($ondate.'-01-01 00:00',true) )
+            if( _eventorganiser_check_datetime() )
                 return true;
             return false;
 
         case 'month':
-            if( _eventorganiser_check_datetime($ondate.'-01 00:00',true) )
+            if( _eventorganiser_check_datetime() )
                 return true;
             return false;
 
         case 'day':
-            if( _eventorganiser_check_datetime($ondate.' 00:00',true) )
+            if( _eventorganiser_check_datetime() )
                 return true;
             return false;
@@ -149 +149 @@
     }
         
-    $ondate =  _eventorganiser_check_datetime($ondate.' 00:00',true);
+    $ondate =  _eventorganiser_check_datetime();
     return eo_format_datetime($ondate, $format);
 }

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

@@ -458 +458 @@
 
  * @param datetime_string - a datetime string 
- * @param (bool) $ymd_formated - whether the date is formated in the format YYYY-MM-DD or 
+ * @param 
  * @return int DateTime| false - the parsed datetime string as a DateTime object or false on error (incorrectly formatted for example)
  */
-function _eventorganiser_check_datetime($datetime_string='',$ymd_formated=false){
-
-    $formatString = eventorganiser_get_option('dateformat');
-
-    //Get regulgar expression.
-    if( $ymd_formated ){
+function _eventorganiser_check_datetime( $datetime_string = '', $format = null ){
+
+    if( is_null( $format ) )
+        $format = eventorganiser_get_option('dateformat');
+    
+    //Backwards compatible - can probably remove 2.1+
+    if( is_bool( $format ) ){
+        _deprecated_argument('_eventorganiser_check_datetime', '1.8', 'This function no longer accepts a boolean, pass the format of the passed date-time string.');
+        if( true === $format )
+            $format = 'Y-m-d';
+        else
+            $format = eventorganiser_get_option('dateformat');
+    }
+    
+    //Get regular expression.
+    if( $format == 'Y-m-d' ){
         $reg_exp = "/(?P<year>\d{4})[-.\/](?P<month>\d{1,})[-.\/](?P<day>\d{1,}) (?P<hour>\d{2}):(?P<minute>\d{2})/";
 
-    }elseif($formatString =='dd-mm' ){
+    }elseif(' ){
         $reg_exp = "/(?P<day>\d{1,})[-.\/](?P<month>\d{1,})[-.\/](?P<year>\d{4}) (?P<hour>\d{2}):(?P<minute>\d{2})/";
 
@@ -564 +574 @@
 
     $args = wp_parse_args($args,array(
-            'selected'=>'', 'help' => '', 'options'=>'', 'name'=>'', 'echo'=>1,
+            'selected'=>'', 'help' => , 'options'=>'', 'name'=>'', 'echo'=>1,
             'label_for'=>'','class'=>'','disabled'=>false,'multiselect'=>false,
+
         )); 
 
@@ -571 +582 @@
     $name = isset($args['name']) ?  $args['name'] : '';
     $selected = $args['selected'];
-    $class = sanitize_html_class($args['class']);
+    $classes = array_map( 'sanitize_html_class', explode( ' ', $args['class'] ) );
+    $class = implode( ' ', $classes );
     $multiselect = ($args['multiselect'] ? 'multiple' : '' );
     $disabled = ($args['disabled'] ? 'disabled="disabled"' : '' );
@@ -595 +607 @@
             }
         }
-    $html .= '</select>';
-
-    if(!empty($args['help'])){
+    $html .= '</select>';
+
+    if(){
         $html .= '<p class="description">'.esc_html($args['help']).'</p>';
     }
@@ -628 +640 @@
 function eventorganiser_text_field($args){
 
-    $args = wp_parse_args($args,
+    $args = wp_parse_args($args,
         array(
-            'type' => 'text', 'value'=>'', 'placeholder' => '','label_for'=>'',
-             'size'=>false, 'min' => false, 'max' => false, 'style'=>false, 'echo'=>true,
+            'type' => 'text', 'value'=>'', 'placeholder' => '','label_for'=>'', 'inline_help' => false,
+             'size'=>false, 'min' => false, 'max' => false, 'style'=>false, 'echo'=>true, 'data'=>false,
+            'class' => false,
             )
         );      
@@ -639 +652 @@
     $value = $args['value'];
     $type = $args['type'];
-    $class = isset($args['class']) ? esc_attr($args['class'])  : '';
+    $classes = array_map( 'sanitize_html_class', explode( ' ', $args['class'] ) );
+    $class = implode( ' ', $classes );
 
     $min = (  $args['min'] !== false ?  sprintf('min="%d"', $args['min']) : '' );
@@ -647 +661 @@
     $placeholder = ( !empty($args['placeholder']) ? sprintf('placeholder="%s"', $args['placeholder']) : '');
     $disabled = ( !empty($args['disabled']) ? 'disabled="disabled"' : '' );
-    $attributes = array_filter(array($min,$max,$size,$placeholder,$disabled, $style));
-
-    $html = sprintf('<input type="%s" name="%s" class="%s regular-text ltr" id="%s" value="%s" autocomplete="off" %s />',
-        esc_attr($type),
-        esc_attr($name),
-        sanitize_html_class($class),
-        esc_attr($id),
-        esc_attr($value),
-        implode(' ', $attributes)
+
+    //Custom data-* attributes
+    $data = '';
+    if( !empty( $args['data'] ) && is_array( $args['data'] ) ){
+        foreach( $args['data'] as $key => $attr_value ){
+            $data .= sprintf( 'data-%s="%s"', esc_attr( $key ), esc_attr( $attr_value ) );
+        }
+    }
+
+    $attributes = array_filter( array($min,$max,$size,$placeholder,$disabled, $style, $data ) );
+
+    $html = sprintf('<input type="%s" name="%s" class="%s regular-text ltr" id="%s" value="%s" autocomplete="off" %s /> %s',
+        esc_attr( $type ), 
+        esc_attr( $name ),
+        $class,
+        esc_attr( $id ),
+        esc_attr( $value ),
+        implode(' ', $attributes),
+         $args['inline_help']
     );
 
@@ -850 +874 @@
  * @return string
  */
-function eventorganiser_inline_help( $title, $content, $echo = false ){
+function eventorganiser_inline_help( $title, $content, $echo = false ){
     static $help = array();
     
@@ -859 +883 @@
     
     wp_localize_script( 'eo-inline-help', 'eoHelp', $help );
-    wp_enqueue_script( 'eo-inline-help' );
-    wp_enqueue_style( 'eventorganiser-admin-style' );
+
+    //Ensure style is called after  WP styles
+    add_action( 'admin_footer', '_eventorganiser_enqueue_inline_help_scripts', 100 );
 
     $id = count($help)-1;
-    $src = EVENT_ORGANISER_URL.'css/images/help-14.png';
-    
-    $link = sprintf( '<a href="#" id="%s" class="eo-inline-help"><img src="%s" width="16" height="16"></a>', 'eo-inline-help-' . $id, $src );
+    $src = EVENT_ORGANISER_URL."css/images/{$type}-14.png";
+    
+    $link = sprintf( '<a href="#" id="%s" class="eo-inline-help eo-%s-inline"><img src="%s" width="16" height="16"></a>', 
+                'eo-inline-help-' . $id, 
+                $type, 
+                $src 
+            );
     
     if( $echo )
@@ -872 +901 @@
     return $link;
 }
-    
+function _eventorganiser_enqueue_inline_help_scripts(){
+    wp_enqueue_script( 'eo-inline-help' );
+    wp_enqueue_style( 'eventorganiser-style' );
+}
 ?>

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

@@ -661 +661 @@
  *  is true.
  */
-function eo_get_venue_meta($venue_id, $key, $single=true){  
+function eo_get_venue_meta($venue_id, $key, $single=true){  
     return get_metadata('eo_venue', $venue_id, $key, $single); 
 }

event-organiser/trunk/includes/event.php

@@ -85 +85 @@
 
         //Need to replace occurrences
-        if( $delete_existing ){
+        if( $delete_existing ){
             //Generate occurrences
             $event_data = _eventorganiser_generate_occurrences($event_data);

event-organiser/trunk/js/frontend.js

@@ -81 +81 @@
                                  calendars[i].venue ='';
                         }
-
                     $(calendar).fullCalendar({
                 id: calendar,
@@ -109 +108 @@
                     week: calendars[i].columnformatweek,
                     day: calendars[i].columnformatday
+
+
+
+
+
                 },
                 header: {

event-organiser/trunk/js/frontend.min.js

@@ -4 +4 @@
 a("#eo-upcoming-dates-more").click(function(b){b.preventDefault();a("#eo-upcoming-dates-less,#eo-upcoming-dates-pipe, #eo-upcoming-dates li:hidden:lt(5)").show();b=a("#eo-upcoming-dates-pipe").offset();a("html, body").animate({scrollTop:Math.max(b.top+40-a(window).height(),a(window).scrollTop())});a("#eo-upcoming-dates li:hidden").length==0&&a("#eo-upcoming-dates-more,#eo-upcoming-dates-pipe").hide()})}if(a(".eo-fullcalendar").length>0){e=EOAjax.calendars;for(var l,c=0;c<e.length;c++){var n="#eo_fullcalendar_"+
 (c+1);if(typeof e[c].category==="undefined")e[c].category="";if(typeof e[c].venue==="undefined")e[c].venue="";a(n).fullCalendar({id:n,category:e[c].event_category,venue:e[c].event_venue,customButtons:{category:f,venue:k,"goto":j},theme:true,categories:EOAjax.fullcal.categories,venues:EOAjax.fullcal.venues,timeFormatphp:e[c].timeformatphp,timeFormat:e[c].timeformat,editable:false,tooltip:e[c].tooltip,firstDay:parseInt(EOAjax.fullcal.firstDay),weekends:e[c].weekends,allDaySlot:e[c].alldayslot,allDayText:e[c].alldaytext,
-axisFormat:e[c].axisformat,minTime:e[c].mintime,maxTime:e[c].maxtime,columnFormat:{month:e[c].columnformatmonth,week:e[c].columnformatweek,day:e[c].columnformatday},header:{left:e[c].headerleft,center:e[c].headercenter,right:e[c].headerright},eventRender:function(b,d,g){var h=a(g.calendar.options.id).find(".filter-category .eo-cal-filter").val(),i=a(g.calendar.options.id).find(".filter-venue .eo-cal-filter").val();if(typeof h!=="undefined"&&h!=""&&a.inArray(h,b.category)<0)return"<div></div>";if(typeof i!==
-"undefined"&&i!=""&&i!=b.venue)return"<div></div>";g.calendar.options.tooltip&&a(d).qtip({content:{text:b.description,button:"x",title:b.title},position:{my:"top center",at:"bottom center"},hide:{fixed:true,delay:500,effect:function(){a(this).fadeOut("50")}},border:{radius:4,width:3},style:{classes:"ui-tooltip-shadow",widget:true,tip:"topMiddle"}})},buttonText:{today:EOAjaxFront.locale.today,month:EOAjaxFront.locale.month,week:EOAjaxFront.locale.week,day:EOAjaxFront.locale.day,cat:EOAjaxFront.locale.cat,
-venue:EOAjaxFront.locale.venue},monthNames:EOAjaxFront.locale.monthNames,monthNamesShort:EOAjaxFront.locale.monthAbbrev,dayNames:EOAjaxFront.locale.dayNames,dayNamesShort:EOAjaxFront.locale.dayAbbrev,eventColor:"#21759B",defaultView:e[c].defaultview,lazyFetching:"true",events:function(b,d,g,h){b={start:jQuery.fullCalendar.formatDate(b,"yyyy-MM-dd"),end:jQuery.fullCalendar.formatDate(d,"yyyy-MM-dd"),timeformat:h.timeFormatphp};if(typeof h.category!=="undefined"&&h.category!="")b.category=h.category;
-if(typeof h.venue!=="undefined"&&h.venue!="")b.venue=h.venue;jQuery.ajax({url:EOAjax.ajaxurl+"?action=eventorganiser-fullcal",dataType:"JSON",data:b,success:g})},selectable:false,weekMode:"variable",aspectRatio:1.5,loading:function(b){var d=a("#"+a(this).attr("id")+"_loading");if(b){window.clearTimeout(l);l=window.setTimeout(function(){d.show()},1E3)}else{window.clearTimeout(l);d.hide()}}})}a(".eo-cal-filter").change(function(){a(".eo-fullcalendar").fullCalendar("rerenderEvents")});a(".eo-mini-calendar").datepicker({dateFormat:"DD, d MM, yy",
-changeMonth:true,changeYear:true,dateFormat:"DD, d MM, yy",firstDay:parseInt(EOAjax.fullcal.firstDay),buttonText:EOAjaxFront.locale.gotodate,monthNamesShort:EOAjaxFront.locale.monthAbbrev,dayNamesMin:EOAjaxFront.locale.dayAbbrev,showOn:"button",onSelect:function(b){var d=a(this).parents("div.eo-fullcalendar").attr("id");a("#"+d).fullCalendar("gotoDate",new Date(Date.parse(b)))}})}if(a(".eo_widget_calendar").length>0){a(".eo_widget_calendar tfoot").unbind("click");a(".eo_widget_calendar tfoot a").die("click").live("click",
-function(b){b.preventDefault();var d=a(this).closest(".eo_widget_calendar").attr("id");b={showpastevents:1};if(typeof EOAjax!=="undefined"&&typeof EOAjax.widget_calendars!=="undefined")b=EOAjax.widget_calendars[d];if(typeof eo_widget_cal!=="undefined")b=eo_widget_cal[d];b.eo_month=eveorg_getParameterByName("eo_month",a(this).attr("href"));a.getJSON(EOAjaxFront.adminajax+"?action=eo_widget_cal",b,function(g){a("#"+d+"_content").html(g)})})}if(a(".eo-agenda-widget").length>0){function o(b,d){a.ajax({url:EOAjaxFront.adminajax,
-dataType:"JSON",data:{action:"eo_widget_agenda",instance_number:d.number,direction:b,start:d.StartDate,end:d.EndDate},success:function(g){if(!jQuery.isArray(g)||!g[0])return false;else{d.StartDate=g[0].StartDate;d.EndDate=g[g.length-1].StartDate;r(g,d)}}})}function r(b,d){var g=a("#"+d.id+"_container"),h=g.find("ul.dates"),i=h.find("li");a(i).remove();i="";for(c=0;c<b.length;c++){if(i==""||i!=b[c].StartDate&&d.mode=="day"){i=b[c].StartDate;var p=a('<li class="date" >'+b[c].display+'<ul class="a-date"></ul></li>');
-h.append(p)}var q=d.add_to_google?a('<li class="event"></li>').append('<span class="cat"></span><span><strong>'+b[c].time+": </strong></span>"+b[c].post_title).append('<div class="meta" style="display:none;"><span>'+b[c].link+"</span><span> \u00a0 </span><span>"+b[c].Glink+"</span></div>"):a('<li class="event"></li>').append("<a class='eo-agenda-event-permalink' href='"+b[c].event_url+"'><span class='cat'></span><span><strong>"+b[c].time+": </strong></span>"+b[c].post_title+"</a>");q.find("span.cat").css({background:b[c].color});
-p.append(q)}i=h.find("li");g.find("ul li.event").on("click",function(){a(this).find(".meta").toggle("400")})}for(var m in eo_widget_agenda){m=eo_widget_agenda[m];m.StartDate=a.fullCalendar.formatDate(new Date,"yyyy-MM-dd");m.EndDate=m.StartDate;o(1,m)}a(".eo-agenda-widget .agenda-nav span.button").click(function(b){var d=a(this).parents(".eo-agenda-widget").attr("id");m=eo_widget_agenda[d];b.preventDefault();b=a(this).hasClass("next")?"+1":a(this).hasClass("prev")?"-1":a(this).parent().hasClass("prev")?
-"-1":"+1";o(b,m)})}})})(jQuery);function eveorg_getParameterByName(a,f){a=a.replace(/[\[]/,"\\[").replace(/[\]]/,"\\]");a=(new RegExp("[\\?&]"+a+"=([^&#]*)")).exec(f);return a==null?"":decodeURIComponent(a[1].replace(/\+/g," "))}
+axisFormat:e[c].axisformat,minTime:e[c].mintime,maxTime:e[c].maxtime,columnFormat:{month:e[c].columnformatmonth,week:e[c].columnformatweek,day:e[c].columnformatday},
+,
+;
+if(typeof h.
+a(".eo-mini-calendar").datepicker({dateFormat:"DD, d MM, yy",changeMonth:true,changeYear:true,dateFormat:"DD, d MM, yy",firstDay:parseInt(EOAjax.fullcal.firstDay),buttonText:EOAjaxFront.locale.gotodate,monthNamesShort:EOAjaxFront.locale.monthAbbrev,dayNamesMin:EOAjaxFront.locale.dayAbbrev,showOn:"button",onSelect:function(b){var d=a(this).parents("div.eo-fullcalendar").attr("id");a("#"+d).fullCalendar("gotoDate",new Date(Date.parse(b)))}})}if(a(".eo_widget_calendar").length>0){a(".eo_widget_calendar tfoot").unbind("click");
+a(".eo_widget_calendar tfoot a").die("click").live("click",function(b){b.preventDefault();var d=a(this).closest(".eo_widget_calendar").attr("id");b={showpastevents:1};if(typeof EOAjax!=="undefined"&&typeof EOAjax.widget_calendars!=="undefined")b=EOAjax.widget_calendars[d];if(typeof eo_widget_cal!=="undefined")b=eo_widget_cal[d];b.eo_month=eveorg_getParameterByName("eo_month",a(this).attr("href"));a.getJSON(EOAjaxFront.adminajax+"?action=eo_widget_cal",b,function(g){a("#"+d+"_content").html(g)})})}if(a(".eo-agenda-widget").length>
+0){function o(b,d){a.ajax({url:EOAjaxFront.adminajax,dataType:"JSON",data:{action:"eo_widget_agenda",instance_number:d.number,direction:b,start:d.StartDate,end:d.EndDate},success:function(g){if(!jQuery.isArray(g)||!g[0])return false;else{d.StartDate=g[0].StartDate;d.EndDate=g[g.length-1].StartDate;r(g,d)}}})}function r(b,d){var g=a("#"+d.id+"_container"),h=g.find("ul.dates"),i=h.find("li");a(i).remove();i="";for(c=0;c<b.length;c++){if(i==""||i!=b[c].StartDate&&d.mode=="day"){i=b[c].StartDate;var p=
+a('<li class="date" >'+b[c].display+'<ul class="a-date"></ul></li>');h.append(p)}var q=d.add_to_google?a('<li class="event"></li>').append('<span class="cat"></span><span><strong>'+b[c].time+": </strong></span>"+b[c].post_title).append('<div class="meta" style="display:none;"><span>'+b[c].link+"</span><span> \u00a0 </span><span>"+b[c].Glink+"</span></div>"):a('<li class="event"></li>').append("<a class='eo-agenda-event-permalink' href='"+b[c].event_url+"'><span class='cat'></span><span><strong>"+
+b[c].time+": </strong></span>"+b[c].post_title+"</a>");q.find("span.cat").css({background:b[c].color});p.append(q)}i=h.find("li");g.find("ul li.event").on("click",function(){a(this).find(".meta").toggle("400")})}for(var m in eo_widget_agenda){m=eo_widget_agenda[m];m.StartDate=a.fullCalendar.formatDate(new Date,"yyyy-MM-dd");m.EndDate=m.StartDate;o(1,m)}a(".eo-agenda-widget .agenda-nav span.button").click(function(b){var d=a(this).parents(".eo-agenda-widget").attr("id");m=eo_widget_agenda[d];b.preventDefault();
+"-1":"+1";o(b,m)})}})})(jQuery);function eveorg_getParameterByName(a,f){a=a.replace(/[\[]/,"\\[").replace(/[\]]/,"\\]");a=(new RegExp("[\\?&]"+a+"=([^&#]*)")).exec(f);return a==null?"":decodeURIComponent(a[1].replace(/\+/g," "))}
 function eo_load_map(){for(var a=EOAjax.map,f=0;f<a.length;f++){var j=a[f].locations,k={zoom:a[f].zoom,scrollwheel:a[f].scrollwheel,zoomControl:a[f].zoomcontrol,rotateControl:a[f].rotatecontrol,panControl:a[f].pancontrol,overviewMapControl:a[f].overviewmapcontrol,streetViewControl:a[f].streetviewcontrol,draggable:a[f].draggable,mapTypeControl:a[f].maptypecontrol,mapTypeId:google.maps.MapTypeId[a[f].maptypeid]};k=new google.maps.Map(document.getElementById("eo_venue_map-"+(f+1)),k);for(var e=new google.maps.LatLngBounds,
 l=[],c=0;c<j.length;c++){var n=j[c].lat,o=j[c].lng;if(n!==undefined&&o!=undefined){l.push(new google.maps.LatLng(n,o));e.extend(l[c]);n=new google.maps.Marker({position:l[c],map:k,content:j[c].tooltipContent});"false"!=a[f].tooltip&&google.maps.event.addListener(n,"click",eventorganiser_venue_tooltip)}}j.length>1?k.fitBounds(e):k.setCenter(l[0])}}

event-organiser/trunk/js/inline-help.js

@@ -16 +16 @@
             hide: 'unfocus',
             style: {
-                classes: "ui-tooltip-shadow",
-                widget: true,
+                classes: 'qtip-wiki qtip-light qtip-shadow'
+            },
+            position : {
+                 viewport: $(window)
             }
         });

event-organiser/trunk/readme.md

@@ -5 +5 @@
 **Requires at least:** 3.3  
 **Tested up to:** 3.5  
-**Stable tag:** 1.7.3  
+**Stable tag:** 1.  
 **License:** GPLv3  
 
@@ -65 +65 @@
 * Russian - [Sergei](www.vortexinter.ru)
 * Hungarian - Csaba Erdei 
+
 
 ## Installation ##
@@ -148 +149 @@
 * `[eo_fullcalendar]`  - displays a calendar, similiar to the admin calendar, with optional month, week and day views and category and venue filters.
 * `[eo_venue_map]` - displays a Google map of the current venue, or of a particular venue given as an attribute.
-*** `[eo_subscribe]` - wraps the content in a link which allows visitors to subscribe to your events; there are two types:** 'Google' and 'Webcal'.  
+* `[eo_subscribe]` - wraps the content in a link which allows visitors to subscribe to your events; there are two types:** 'Google' and 'Webcal'.  
 
 More information on shortcodes is [available here](http://wp-event-organiser.com/documentation/shortcodes/)
@@ -174 +175 @@
 
 ## Changelog ##
+
+
+
+
+
+
+
+
+
 
 ### 1.7.4 ###

event-organiser/trunk/readme.txt

@@ -5 +5 @@
 Requires at least: 3.3
 Tested up to: 3.5
-Stable tag: 1.7.4
+Stable tag: 1.
 License: GPLv3
 
@@ -65 +65 @@
 * Russian - [Sergei](www.vortexinter.ru)
 * Hungarian - Csaba Erdei 
+
 
 == Installation ==
@@ -162 +163 @@
 
 == Changelog ==
+
+
+
+
+
+
+
+
+
 
 = 1.7.4 =

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

@@ -49 +49 @@
             ?>
 
-            <li class="<? echo esc_attr(implode(' ',$eo_event_classes)); ?>" >
+            <li class="<? echo esc_attr(implode(' ',$eo_event_classes)); ?>" >
                 <a href="<?php the_permalink(); ?>" title="<?php the_title_attribute(); ?>" ><?php the_title(); ?></a> <?php echo __('on','eventorganiser') . ' '.eo_get_the_start($format); ?>
             </li>

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

@@ -46 +46 @@
             ?>
 
-            <li class="<? echo esc_attr(implode(' ',$eo_event_classes)); ?>" >
+            <li class="<? echo esc_attr(implode(' ',$eo_event_classes)); ?>" >
                 <a href="<?php the_permalink(); ?>" title="<?php the_title_attribute(); ?>" ><?php the_title(); ?></a> <?php echo __('on','eventorganiser') . ' '.eo_get_the_start($format); ?>
             </li>