From: Steve Sutton Date: Fri, 18 Nov 2016 17:05:28 +0000 (-0500) Subject: Add event form bug fix. X-Git-Tag: v1.5.7^2 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=7d9890562f888dcfb7470f0a40df53829831100f;p=WP-Plugins%2Fglm-member-db-events.git Add event form bug fix. When the event times are entered without the min set it goes to the 7pm. --- diff --git a/classes/data/dataEvents.php b/classes/data/dataEvents.php index c048930..7ec2b6c 100644 --- a/classes/data/dataEvents.php +++ b/classes/data/dataEvents.php @@ -163,7 +163,7 @@ class GlmDataEvents extends GlmDataAbstract 'created' => array ( 'field' => 'created', 'type' => 'datetime', - 'use' => 'lgieu' + 'use' => 'lge' ), // Date/Time Updated diff --git a/index.php b/index.php index 21cb5e0..b9d32ea 100644 --- a/index.php +++ b/index.php @@ -3,7 +3,7 @@ * Plugin Name: GLM Members Database Events * Plugin URI: http://www.gaslightmedia.com/ * Description: Gaslight Media Members Database. - * Version: 1.5.6 + * Version: 1.5.7 * Author: Chuck Scott * Author URI: http://www.gaslightmedia.com/ * License: GPL2 @@ -20,7 +20,7 @@ * @package glmMembersDatabaseEventsAddOn * @author Chuck Scott * @license http://www.gaslightmedia.com Gaslightmedia - * @version 1.5.6 + * @version 1.5.7 */ /* @@ -38,7 +38,7 @@ * so that we're sure the other add-ons see an up to date * version from this plugin. */ -define('GLM_MEMBERS_EVENTS_PLUGIN_VERSION', '1.5.6'); +define('GLM_MEMBERS_EVENTS_PLUGIN_VERSION', '1.5.7'); define('GLM_MEMBERS_EVENTS_PLUGIN_DB_VERSION', '0.1.1'); // This is the minimum version of the GLM Members DB plugin require for this plugin. diff --git a/models/front/events/frontAdd.php b/models/front/events/frontAdd.php index 5608882..03e1302 100644 --- a/models/front/events/frontAdd.php +++ b/models/front/events/frontAdd.php @@ -198,6 +198,8 @@ class GLmMembersFront_events_frontAdd extends GlmDataEvents $memberManager = false; $members = false; $eventAmenities = array(); + $venues = false; + $startTimeOnly = 0; if ( isset( $actionData['request']['member_only'] ) && $memberOnly = filter_var( $actionData['request']['member_only'], FILTER_VALIDATE_BOOLEAN ) ) { @@ -274,8 +276,10 @@ class GLmMembersFront_events_frontAdd extends GlmDataEvents if ( empty( $_REQUEST['shour'] ) && strlen( $_REQUEST['smin'] ) === 0 ) { $smilitaryTime = "00:00:00"; } else { + $startMin = trim(filter_var($_REQUEST['smin'],FILTER_SANITIZE_STRING)); + $startPM = trim(filter_var($_REQUEST['sampm'],FILTER_SANITIZE_STRING)); - $startTime = trim(filter_var($_REQUEST['shour'],FILTER_SANITIZE_STRING)) . ':' . trim(filter_var($_REQUEST['smin'],FILTER_SANITIZE_STRING)) . " " . trim(filter_var($_REQUEST['sampm'],FILTER_SANITIZE_STRING)); + $startTime = trim(filter_var($_REQUEST['shour'],FILTER_SANITIZE_STRING)) . ':' . (($startMin) ? $startMin : '00') . " " . (($startPM) ? $startPM : 'AM'); $smilitaryTime = date("H:i:s", strtotime($startTime)); } @@ -285,8 +289,10 @@ class GLmMembersFront_events_frontAdd extends GlmDataEvents $startTimeOnly = 1; $emilitaryTime = $smilitaryTime; } else { + $endMin = trim(filter_var($_REQUEST['emin'],FILTER_SANITIZE_STRING)); + $endPM = trim(filter_var($_REQUEST['eampm'],FILTER_SANITIZE_STRING)); - $endTime = trim(filter_var($_REQUEST['ehour'],FILTER_SANITIZE_STRING)) . ':' . trim(filter_var($_REQUEST['emin'],FILTER_SANITIZE_STRING)) . " " . trim(filter_var($_REQUEST['eampm'],FILTER_SANITIZE_STRING)); + $endTime = trim(filter_var($_REQUEST['ehour'],FILTER_SANITIZE_STRING)) . ':' . ( ($endMin) ? $endMin : '00' ) . " " . (($endPM) ? $endPM : 'AM'); $emilitaryTime = date("H:i:s", strtotime($endTime)); }