From e546ee7259a01a0de472f4aa6c3265bd32d3dd5a Mon Sep 17 00:00:00 2001 From: Anthony Talarico Date: Thu, 21 Apr 2016 13:15:44 -0400 Subject: [PATCH] adjusting week bit template values --- models/front/events/frontAdd.php | 23 ++++++++++------------- views/front/events/frontAdd.html | 2 +- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/models/front/events/frontAdd.php b/models/front/events/frontAdd.php index c1ed41e..6f8734f 100644 --- a/models/front/events/frontAdd.php +++ b/models/front/events/frontAdd.php @@ -91,8 +91,8 @@ class GLmMembersFront_events_frontAdd extends GlmDataEvents // if there are no times selected, default the start time to midnight and the endtime to 12:00pm as it is in the admin - if(empty($_REQUEST['ehour']) || empty($_REQUEST['emin']) && strlen($_REQUEST['emin']) == 0){ - $startTimeOnly = true; + if(empty($_REQUEST['ehour']) || empty($_REQUEST['emin']) && strlen($_REQUEST['emin']) === 0){ + $startTimeOnly = 1; $emilitaryTime = "12:00:00"; } else { @@ -101,25 +101,21 @@ class GLmMembersFront_events_frontAdd extends GlmDataEvents } - if(empty($_REQUEST['shour']) || empty($_REQUEST['smin']) && strlen($_REQUEST['emin']) == 0){ + if(empty($_REQUEST['shour']) || empty($_REQUEST['smin']) && strlen($_REQUEST['smin']) === 0){ $smilitaryTime = "12:00:00"; } else { - - + $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)); $smilitaryTime = date("H:i:s", strtotime($startTime)); } - if(empty($_REQUEST['shour']) || empty($_REQUEST['smin']) && empty($_REQUEST['ehour']) || empty($_REQUEST['emin'])){ + if(empty($_REQUEST['shour']) && empty($_REQUEST['ehour'])){ $allDay = true; - $startTimeOnly = false; + $startTimeOnly = 0; } - - - - + $starting_date = strtotime($starting . " " . $smilitaryTime); $mysqlStart = date("Y-m-d H:i:s",$starting_date); @@ -151,8 +147,9 @@ class GLmMembersFront_events_frontAdd extends GlmDataEvents $fileDescr = trim(filter_var($_REQUEST['fileDescription'],FILTER_SANITIZE_STRING)); $weekOfMonth = $_REQUEST['weekom']; - $weekOfMonth = pow(2, $weekOfMonth); - + if(strlen($weekOfMonth) !== 0){ + $weekOfMonth = pow(2, $weekOfMonth); + } $category = $_REQUEST['categories']; // set boolean values based on selected recurrence options diff --git a/views/front/events/frontAdd.html b/views/front/events/frontAdd.html index 46d6e21..f123aee 100644 --- a/views/front/events/frontAdd.html +++ b/views/front/events/frontAdd.html @@ -110,7 +110,7 @@ -- 2.17.1