From: Anthony Talarico <talarico@gaslightmedia.com>
Date: Thu, 25 Aug 2016 15:47:20 +0000 (-0400)
Subject: using sanitize title like Chuck does to create a slug from the event title, adding... 
X-Git-Tag: v1.3.3^2~35^2~2
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=e5b673b13e81b9cdc87b404dc82c92004fdea58d;p=WP-Plugins%2Fglm-member-db-events.git

using sanitize title like Chuck does to create a slug from the event title, adding default view option to mgmt settings
---

diff --git a/models/admin/ajax/eventsCalMonthAJAX.php b/models/admin/ajax/eventsCalMonthAJAX.php
index 0945863..a87193a 100644
--- a/models/admin/ajax/eventsCalMonthAJAX.php
+++ b/models/admin/ajax/eventsCalMonthAJAX.php
@@ -62,39 +62,6 @@ class GlmMembersAdmin_ajax_eventsCalMonthAJAX extends GlmDataEventsTimes
         // Run constructor for members data class
         parent::__construct(false, false);
 
-    }
-        /**
-     * getModelEventsData
-     *
-     * Return the array of events.
-     *
-     * @param integer $categoryId Id of the category for filtering events (optional)
-     * @param integer $limit      Number of events to return (optional)
-     * @param integer $memberID Member ID if filtering by member
-     *
-     * @access public
-     * @return array events
-     */
-    public function getModelEventsData(  )
-    {
-
-        $this->postAddTimes = true;
-        $where = '';
-
-        
-            $where .= "T.status = " . $this->config['status_numb']['Active'] . "
-                AND T.id IN (
-                        SELECT id
-                          FROM " . GLM_MEMBERS_EVENTS_PLUGIN_DB_PREFIX . "events AS ET
-                         WHERE active
-                           AND " . $this->dateRange . "
-                    )
-                ";
-        
-            $times = $this->getList( $where );
-
-        $this->postAddTimes = false;
-        return $times;
     }
         /**
      * getModelEventsData
@@ -130,6 +97,7 @@ class GlmMembersAdmin_ajax_eventsCalMonthAJAX extends GlmDataEventsTimes
         return $events;
     }
     function clean($string) {
+        $string= strtolower(str_replace(" ", '-',$string));
         return preg_replace('/[^A-Za-z0-9\-]/', '', $string); // Removes special chars.
     }
 
@@ -147,7 +115,7 @@ class GlmMembersAdmin_ajax_eventsCalMonthAJAX extends GlmDataEventsTimes
      */
     public function modelAction ($actionData = false)
     {   
-   
+        
         $event_data = [];
         $month = $_POST['month'];
         $from = date('Y-m-d', strtotime($month['start']));
@@ -161,14 +129,14 @@ class GlmMembersAdmin_ajax_eventsCalMonthAJAX extends GlmDataEventsTimes
         )";
 
         $times = $this->getModelTimesData();
-//        $all_events = $this->getModelEventsData();
 //        var_dump($events);
         
         foreach ($times as $e=>$val){
-//            $times[] = ($val['times']);
             $event_data[$e]['title'] = $val['event_name'];
-            $slug = strtolower(str_replace(" ", '-',$val['event_name']));
-            $slug = $this->clean($slug);
+            
+//            $slug = strtolower(str_replace(" ", '-',$val['event_name']));
+            $slug = sanitize_title($val['event_name']);
+ 
             $event_data[$e]['url'] = GLM_MEMBERS_EVENTS_SITE_BASE_URL . "event-detail/" . $slug . "/";
             
             $start = date('Y-m-d H:i:s', strtotime($val['start_time']['datetime']));
@@ -181,7 +149,7 @@ class GlmMembersAdmin_ajax_eventsCalMonthAJAX extends GlmDataEventsTimes
             $event_data[$e]['last'] = ($last);
 
         }
-
+        
         $return = array(
             'status' => false,       // Assume nothing works
             'events' => $event_data,       // Where our events list will go
diff --git a/views/admin/management/events.html b/views/admin/management/events.html
index 7b73488..a281b0a 100644
--- a/views/admin/management/events.html
+++ b/views/admin/management/events.html
@@ -5,6 +5,7 @@
         <a id="glm-icalfeed" data-show-table="glm-table-icalfeed" class="glm-settings-tab nav-tab{if $option=='icalfeed'} nav-tab-active{/if}">iCal Feeds</a>
         <a id="glm-eventimport" data-show-table="glm-table-eventimport" class="glm-settings-tab nav-tab{if $option=='eventimport'} nav-tab-active{/if}">Import</a>
         <a id="glm-timelyimport" data-show-table="glm-table-timelyimport" class="glm-settings-tab nav-tab{if $option=='timelyimport'} nav-tab-active{/if}">Timely Import</a>
+        <a id="glm-front-calendar-view" data-show-table="glm-table-front-calendar-view" class="glm-settings-tab nav-tab{if $option=='front-calendar-view'} nav-tab-active{/if}">Front End Calendar View</a>
     </h2>
 
     <!-- Management Settings -->
@@ -51,6 +52,24 @@
                                 {if $eventsSettings.fieldFail.footer_text}<p>{$eventsSettings.fieldFail.footer_text}</p>{/if}
                             </td>
                         </tr>
+                        <tr>
+                            <th >Front-End Calendar View</th>
+                        
+                            <td>
+                                <select id="calendar-view" name="calendar_view">
+                                    <option value="select"> Select View </option>
+                                    <option value="agenda"> Agenda </option>
+                                    <option value="agenda"> Calendar</option>
+                                </select>
+                            </td>
+                            <tr>
+                                <th></th>
+                            <td>
+                                <label>Current View:  </label>
+                            </td>
+                        </tr>
+                     
+                        
                           <tr>
                             <td>
                                 <h1> E-Mail Notification Settings </h1>
@@ -249,7 +268,7 @@
             </td>
         </tr>
   {/if}
-    </table>
+
 
     <script type="text/javascript">