All-in-One Event Calendar - Version 1.0.1

Version Description

Download this release

Release Info

Developer theseed
Plugin Icon 128x128 All-in-One Event Calendar
Version 1.0.1
Comparing to
See all releases

Code changes from version 1.0 to 1.0.1

Files changed (4) hide show
  1. all-in-one-events-calendar.php +1 -1
  2. app/controller/class-ai1ec-app-controller.php +3 -2
  3. app/helper/class-ai1ec-app-helper.php +16 -8
  4. readme.txt +9 -1
all-in-one-events-calendar.php CHANGED
@@ -3,7 +3,7 @@
3
  * Plugin Name: All-in-One Events Calendar Plugin
4
  * Plugin URI: http://theseedstudio.com/software/all-in-one-events-calendar-wordpress/
5
  * Description: An events calendar system with month and agenda calendar views, color-coded categories, recurring events, and import/export of iCalendar (.ics) feeds.
6
- * Version: 1.0
7
  * Author: The Seed Studio
8
  * Author URI: http://theseedstudio.com/
9
  */
3
  * Plugin Name: All-in-One Events Calendar Plugin
4
  * Plugin URI: http://theseedstudio.com/software/all-in-one-events-calendar-wordpress/
5
  * Description: An events calendar system with month and agenda calendar views, color-coded categories, recurring events, and import/export of iCalendar (.ics) feeds.
6
+ * Version: 1.0.1
7
  * Author: The Seed Studio
8
  * Author URI: http://theseedstudio.com/
9
  */
app/controller/class-ai1ec-app-controller.php CHANGED
@@ -321,8 +321,9 @@ class Ai1ec_App_Controller {
321
  $ai1ec_calendar_controller,
322
  $ai1ec_events_controller;
323
 
324
- // Find out if we're on the calendar page
325
- if( is_page( $ai1ec_settings->calendar_page_id ) )
 
326
  {
327
  ob_start();
328
  // Render view
321
  $ai1ec_calendar_controller,
322
  $ai1ec_events_controller;
323
 
324
+ // Find out if the calendar page ID is defined, and we're on it
325
+ if( $ai1ec_settings->calendar_page_id &&
326
+ is_page( $ai1ec_settings->calendar_page_id ) )
327
  {
328
  ob_start();
329
  // Render view
app/helper/class-ai1ec-app-helper.php CHANGED
@@ -619,16 +619,24 @@ class Ai1ec_App_Helper {
619
  if( ! $ai1ec_settings->calendar_page_id && ! isset( $_REQUEST['ai1ec_save_settings'] ) )
620
  {
621
  $args = array();
622
- // If not on the settings page already, direct user there with a message
623
- if( $plugin_page == 'all-in-one-events-calendar-settings' ) {
624
- $args['msg'] = __( 'To set up the plugin, please select an option in the <strong>Calendar page</strong> dropdown list, then click <strong>Update Settings</strong>.', AI1EC_PLUGIN_NAME );
625
- // Else instruct user as to what to do on the settings page
 
 
 
 
 
 
 
 
 
 
626
  } else {
627
- $args['msg'] = sprintf(
628
- __( 'The plugin is installed, but has not been configured. <a href="%s">Click here to set it up now »</a>', AI1EC_PLUGIN_NAME ),
629
- admin_url( 'edit.php?post_type=ai1ec_event&page=all-in-one-events-calendar-settings' )
630
- );
631
  }
 
632
  $ai1ec_view_helper->display( 'admin_notices.php', $args );
633
  }
634
  }
619
  if( ! $ai1ec_settings->calendar_page_id && ! isset( $_REQUEST['ai1ec_save_settings'] ) )
620
  {
621
  $args = array();
622
+
623
+ // Display messages for blog admin
624
+ if( current_user_can( 'manage_options' ) ) {
625
+ // If not on the settings page already, direct user there with a message
626
+ if( $plugin_page == $ai1ec_settings->settings_page ) {
627
+ $args['msg'] = __( 'To set up the plugin, please select an option in the <strong>Calendar page</strong> dropdown list, then click <strong>Update Settings</strong>.', AI1EC_PLUGIN_NAME );
628
+ // Else instruct user as to what to do on the settings page
629
+ } else {
630
+ $args['msg'] = sprintf(
631
+ __( 'The plugin is installed, but has not been configured. <a href="%s">Click here to set it up now »</a>', AI1EC_PLUGIN_NAME ),
632
+ admin_url( 'edit.php?post_type=ai1ec_event&page=' . $ai1ec_settings->settings_page )
633
+ );
634
+ }
635
+ // Else display messages for other blog users
636
  } else {
637
+ $args['msg'] = __( 'The plugin is installed, but has not been configured. Please log in as a WordPress Administrator to set it up.', AI1EC_PLUGIN_NAME );
 
 
 
638
  }
639
+
640
  $ai1ec_view_helper->display( 'admin_notices.php', $args );
641
  }
642
  }
readme.txt CHANGED
@@ -4,7 +4,7 @@ Donate link: http://theseedstudio.com/software/all-in-one-events-calendar-wordpr
4
  Tags: calendar, event, events, ics, ics calendar, ical-feed, ics feed, wordpress ics importer, wordpress ical importer, upcoming events, todo, notes, journal, freebusy, availability, web calendar, web events, webcal, google calendar, ical, iCalendar, all-in-one, ai1ec, google calendar sync, ical sync, events sync, holiday calendar, calendar 2011, events 2011
5
  Requires at least: 3.1.3
6
  Tested up to: 3.2.1
7
- Stable tag: 1.0
8
 
9
  An events calendar system with month and agenda calendar views, color-coded categories, recurring events, and import/export of iCalendar (.ics) feeds.
10
 
@@ -49,6 +49,14 @@ The All-in-One Events Calendar Plugin also has a few features that will prove us
49
 
50
  [Check out the demo »](http://thenelsonpost.ca/calendar/)
51
 
 
 
 
 
 
 
 
 
52
  == Installation ==
53
 
54
  1. Upload `all-in-one-events-calendar` to the `/wp-content/plugins/` directory.
4
  Tags: calendar, event, events, ics, ics calendar, ical-feed, ics feed, wordpress ics importer, wordpress ical importer, upcoming events, todo, notes, journal, freebusy, availability, web calendar, web events, webcal, google calendar, ical, iCalendar, all-in-one, ai1ec, google calendar sync, ical sync, events sync, holiday calendar, calendar 2011, events 2011
5
  Requires at least: 3.1.3
6
  Tested up to: 3.2.1
7
+ Stable tag: 1.0.1
8
 
9
  An events calendar system with month and agenda calendar views, color-coded categories, recurring events, and import/export of iCalendar (.ics) feeds.
10
 
49
 
50
  [Check out the demo »](http://thenelsonpost.ca/calendar/)
51
 
52
+ == Changelog ==
53
+
54
+ = Version 1.0.1 =
55
+ * Fixed bug where calendar appears on every page before it's been configured
56
+ * Displayed appropriate setup notice when user lacks administrator capabilities
57
+
58
+ = Version 1.0 =
59
+
60
  == Installation ==
61
 
62
  1. Upload `all-in-one-events-calendar` to the `/wp-content/plugins/` directory.