From: Anthony Talarico Date: Wed, 14 Jun 2017 16:42:46 +0000 (-0400) Subject: adding an else statement to the check for groupMonth X-Git-Tag: v1.6.47^2~8 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=18d3b194f807c308c3ebfe552518cc707e0fab5d;p=WP-Plugins%2Fglm-member-db-events.git adding an else statement to the check for groupMonth instead of getting the current date if groupMonth is set and glm_event_ get params are set adding an else to use the glm_event date get params --- diff --git a/models/front/events/frontAdd.php b/models/front/events/frontAdd.php index 1e06f3b..760600b 100644 --- a/models/front/events/frontAdd.php +++ b/models/front/events/frontAdd.php @@ -243,7 +243,7 @@ class GLmMembersFront_events_frontAdd extends GlmDataEvents $fromEmail = trim(filter_var($emailInfo['from_email'], FILTER_VALIDATE_EMAIL)); // get the email notification message - $emailNotification = $emailInfo['email_notification']; + $emailNotification = ( isset($emailInfo['email_notification']) ? $emailInfo['email_notification'] : '' ); $cats = $categories->getList(); foreach($cats as $cat){ diff --git a/models/front/events/list.php b/models/front/events/list.php index 9af4abc..3e6e234 100644 --- a/models/front/events/list.php +++ b/models/front/events/list.php @@ -194,12 +194,16 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction if ( !isset( $_REQUEST['glm_event_from'] ) ) { // use the first date for this month $fromDate = date( 'm/d/Y', mktime( 0, 0, 0, date( 'n' ), 1, date( 'Y' ) ) ); + } else { + $fromDate = $_REQUEST['glm_event_from']; } if ( !isset( $_REQUEST['glm_event_to'] ) ) { $toDate = date( 'm/d/Y', mktime( 0, 0, 0, date( 'n' ), date( 't' ), date( 'Y' ) ) ); + } else { + $toDate = $_REQUEST['glm_event_to']; } - echo '
$fromDate: ' . print_r( $fromDate, true ) . '
'; - echo '
$toDate: ' . print_r( $toDate, true ) . '
'; +// echo '
$fromDate: ' . print_r( $fromDate, true ) . '
'; +// echo '
$toDate: ' . print_r( $toDate, true ) . '
'; } else if ( in_array($action, array( 'event-list-name', 'nameSearch', 'featured' ) ) || $this->config['settings']['use_venue_locations'] ) { $toDate = null; } else { @@ -240,6 +244,7 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction $toDate = date('m/d/Y', strtotime( '+ ' . $weeks_to_check . ' ' . $week_string )); } } + if ( $fromDate && $toDate && !(isset($_REQUEST['event_name']) && $_REQUEST['event_name'])) { $from = date('Y-m-d', strtotime($fromDate)); $to = date('Y-m-d', strtotime($toDate)); diff --git a/views/front/events/confirmation.html b/views/front/events/confirmation.html index a90c497..7dde154 100644 --- a/views/front/events/confirmation.html +++ b/views/front/events/confirmation.html @@ -1,9 +1,15 @@ -
+
Thank you for submitting your event

Your submission is currently pending, please allow up to 48 hours for it to be reviewed

+ +