From: Steve Sutton <steve@gaslightmedia.com>
Date: Fri, 27 May 2016 21:00:13 +0000 (-0400)
Subject: Bug fix for common event import
X-Git-Tag: v1.0.1^2
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=a74c69bda0a836267c905275b7c0a552767629e6;p=WP-Plugins%2Fglm-member-db-events.git

Bug fix for common event import
---

diff --git a/index.php b/index.php
index 9cb73ba..7c58c7d 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.0.0
+ * Version: 1.0.1
  * Author: Chuck Scott
  * Author URI: http://www.gaslightmedia.com/
  * License: GPL2
@@ -20,7 +20,7 @@
  * @package glmMembersDatabaseEventsAddOn
  * @author Chuck Scott <cscott@gaslightmedia.com>
  * @license http://www.gaslightmedia.com Gaslightmedia
- * @version 1.0.0
+ * @version 1.0.1
  */
 
 /*
@@ -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.0.0');
+define('GLM_MEMBERS_EVENTS_PLUGIN_VERSION', '1.0.1');
 define('GLM_MEMBERS_EVENTS_PLUGIN_DB_VERSION', '0.0.17');
 
 // This is the minimum version of the GLM Members DB plugin require for this plugin.
diff --git a/models/admin/management/events.php b/models/admin/management/events.php
index bbd7958..bf0990c 100644
--- a/models/admin/management/events.php
+++ b/models/admin/management/events.php
@@ -566,6 +566,7 @@ class GlmMembersAdmin_management_events extends GlmDataEventsManagement
      */
     public function getTime($time)
     {
+		echo '<pre>$time: ' . print_r($time, true) . '</pre>';
         if (!$time) {
             return false;
         }
@@ -573,12 +574,15 @@ class GlmMembersAdmin_management_events extends GlmDataEventsManagement
             //die('not found');
             return false;
         }
-        $hour = (!$timeParts[3] || in_array(strtolower(trim($timeParts[3])), array('pm', 'p')))
-            ? ( ((int)$timeParts[1] === 12) ? 12 : (int)$timeParts[1] += 12 )
-            : ( ((int)$timeParts[1] === 12) ? 0 : (int)$timeParts[1] );
+		echo '<pre>$timeParts: ' . print_r($timeParts, true) . '</pre>';
+        //$hour = (!$timeParts[3] || in_array(strtolower(trim($timeParts[3])), array('pm', 'p')))
+        //    ? ( ((int)$timeParts[1] === 12) ? 12 : (int)$timeParts[1] += 12 )
+        //    : ( ((int)$timeParts[1] === 12) ? 0 : (int)$timeParts[1] );
+		$hour = $timeParts[1];
         // parse the hour from event
         $dateTime = new DateTime();
         $dateTime->setTime($hour, (int)$timeParts[2] );
+		echo '<pre>$dateTime: ' . print_r($dateTime, true) . '</pre>';
         return $dateTime->format('H:i');
     }
 
@@ -651,6 +655,7 @@ class GlmMembersAdmin_management_events extends GlmDataEventsManagement
             $getFileData = $this->dbh->prepare($prepareSql);
         }
         //$sql .=" AND file != '' ";
+		//$sql .= " AND id = 5";
         $this->wpdb->show_errors();
         echo '<pre>$sql: ' . print_r($sql, true) . '</pre>';
         try {