removed twitter, facebook, set no endtime to use start time

diff --git a/models/front/events/frontAdd.php b/models/front/events/frontAdd.php
index 9d366d7..694390b 100644 (file)
--- a/models/front/events/frontAdd.php
+++ b/models/front/events/frontAdd.php
@@ -90,17 +90,7 @@ class GLmMembersFront_events_frontAdd extends GlmDataEvents
              
              
              
-             // if there are no times selected, default the start time to midnight 
-             if(empty($_REQUEST['ehour']) && strlen($_REQUEST['emin']) === 0){
-                 $startTimeOnly = 1;
-                 $emilitaryTime = "00:00:00";
-             } else {
-            
-                 $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));
-                 $emilitaryTime = date("H:i:s", strtotime($endTime));
-             }
-             
-             
+             // if there are no times selected, default the start time to midnight or get the starting / ending times
              if(empty($_REQUEST['shour']) && strlen($_REQUEST['smin']) === 0){
                  $smilitaryTime = "00:00:00";
              } else {
@@ -109,7 +99,16 @@ class GLmMembersFront_events_frontAdd extends GlmDataEvents
 
                  $smilitaryTime = date("H:i:s", strtotime($startTime));
              }
- 
+             
+             // Get the ending time
+             if(empty($_REQUEST['ehour']) && strlen($_REQUEST['emin']) === 0){
+                 $startTimeOnly = 1;
+                 $emilitaryTime = $smilitaryTime;
+             } else {
+            
+                 $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));
+                 $emilitaryTime = date("H:i:s", strtotime($endTime));
+             }
              
              if(empty($_REQUEST['shour'])  && empty($_REQUEST['ehour'])){
                  $allDay = true;

diff --git a/views/front/events/frontAdd.html b/views/front/events/frontAdd.html
index f123aee..0f4f12a 100644 (file)
--- a/views/front/events/frontAdd.html
+++ b/views/front/events/frontAdd.html
@@ -174,22 +174,7 @@
                 {if $event.fieldFail.intro}<p>{$event.fieldFail.intro}</p>{/if}
             </td>
         </tr>
-        <tr>
-            <td>
-               <label>Facebook</label>
-            </td>
-            <td>
-               <input name="facebook" maxlength="100" type="text">
-            </td>
-        </tr>
-        <tr>
-            <td>
-               <label>Twitter</label>
-            </td>
-            <td>
-               <input name="twitter" maxlength="100" type="text">
-            </td>
-        </tr>
+      
         <tr>
             <th>Free Event</th>
             <td>

diff --git a/views/front/events/shortCuts.html b/views/front/events/shortCuts.html
index c8b9f51..cbcb852 100644 (file)
--- a/views/front/events/shortCuts.html
+++ b/views/front/events/shortCuts.html
@@ -3,7 +3,7 @@
             <li><a href="{$currentUrl}?t=today" class="shortcuts-button">Today's Events</a></li>
             <li><a href="{$currentUrl}?t=tomorrow" class="shortcuts-button">Tomorrow's Events</a></li>
             <li><a href="{$currentUrl}?t=nextseven" class="shortcuts-button">Next 7 Days</a></li>
-            <!-- <li><a href="#" class="shortcuts-button">Add an Event</a></li>-->
+            <li><a href="{$siteBaseUrl}add-event/" class="shortcuts-button">Add an Event</a></li>
         </ul>
     </div>