Fixed some errors that showed up in error log.
authorChuck Scott <cscott@gaslightmedia.com>
Thu, 6 Dec 2018 16:31:11 +0000 (11:31 -0500)
committerChuck Scott <cscott@gaslightmedia.com>
Thu, 6 Dec 2018 16:31:11 +0000 (11:31 -0500)
Updated admin/events/list.php to fix some undefined references.
Moved E-mail notification code into conditional block if eventID exists.
Fixed buttons showing that shouldn't on add event page.

models/admin/events/list.php
views/admin/events/edit.html
views/admin/events/editStatus.html
views/admin/events/eventExportModal.html
views/admin/management/events.html
views/admin/settings/emailNotifications.html
views/front/events/frontAdd.html

index f73c314..3aefba1 100644 (file)
@@ -104,6 +104,7 @@ class GlmMembersAdmin_events_list extends GlmDataEvents
         $events           = false;
         $haveEvents       = false;
         $event            = false;
+        $eventSlug        = false;
         $haveEvent        = false;
         $this->eventID    = false;
         $eventUpdated     = false;
@@ -925,66 +926,68 @@ class GlmMembersAdmin_events_list extends GlmDataEvents
             }
 
 
-        }
+            // DECLINED & APPROVED EVENT EMAIL FUNCTIONALITY ///////
+            //$sql = "SELECT * FROM " . GLM_MEMBERS_EVENTS_PLUGIN_DB_PREFIX . "email_notifications";
+            //$email_notifications = !empty($this->wpdb->get_results($sql, ARRAY_A)) ? $this->wpdb->get_results($sql, ARRAY_A)[0] : false;
+            $email_notifications = $this->config['settings'];
+            $from_email = $email_notifications ? $email_notifications['from_email'] : false;
 
-        // DECLINED & APPROVED EVENT EMAIL FUNCTIONALITY ///////
-        //$sql = "SELECT * FROM " . GLM_MEMBERS_EVENTS_PLUGIN_DB_PREFIX . "email_notifications";
-        //$email_notifications = !empty($this->wpdb->get_results($sql, ARRAY_A)) ? $this->wpdb->get_results($sql, ARRAY_A)[0] : false;
-        $email_notifications = $this->config['settings'];
-        $from_email = $email_notifications ? $email_notifications['from_email'] : false;
-
-        $to_email = (isset($event['fieldData']['admin_email']) ? $event['fieldData']['admin_email'] : '' );
-        $event_title = (isset($event['fieldData']['name']) ? $event['fieldData']['name'] : '' );
-        $admin_name = (isset($event['fieldData']['admin_name']) ? $event['fieldData']['admin_name'] : '' );
-        $event_intro = (isset($event['fieldData']['intro']) ? $event['fieldData']['intro'] : '' );
-        $site_name = get_bloginfo( 'name' );
-
-        $header[] = "From: $site_name <$from_email>";
-        $header[] = 'Reply-To: ' . $from_email;
-        $header[] = "Return-Path: $from_email";
-
-        // change the default wordpress from name when sending mail
-        function set_content_type(){
-            return "text/html";
-        }
+            $to_email = (isset($event['fieldData']['admin_email']) ? $event['fieldData']['admin_email'] : '' );
+            $event_title = (isset($event['fieldData']['name']) ? $event['fieldData']['name'] : '' );
+            $admin_name = (isset($event['fieldData']['admin_name']) ? $event['fieldData']['admin_name'] : '' );
+            $event_intro = (isset($event['fieldData']['intro']) ? $event['fieldData']['intro'] : '' );
+            $site_name = get_bloginfo( 'name' );
 
-        // Send confirmation email, set the content type to allow html by using this filter
-        add_filter( 'wp_mail_content_type', 'set_content_type' );
+            $header[] = "From: $site_name <$from_email>";
+            $header[] = 'Reply-To: ' . $from_email;
+            $header[] = "Return-Path: $from_email";
+
+            // change the default wordpress from name when sending mail
+            function set_content_type(){
+                return "text/html";
+            }
 
-        $declined  = '';
-        $current_status = $event['fieldData']['status']['value'];
+            // Send confirmation email, set the content type to allow html by using this filter
+            add_filter( 'wp_mail_content_type', 'set_content_type' );
 
-        if($to_email){
-            $message  = $site_name . " Events<br><br>";
-            $message .= "Event Name: " . $event_title . "<br>";
-            $message .= "Event Description: $event_intro<br>";
-            $message .= "Contact Name: $admin_name<br><br>";
+            $declined  = '';
+            $current_status = $event['fieldData']['status']['value'];
 
+            if($to_email){
+                $message  = $site_name . " Events<br><br>";
+                $message .= "Event Name: " . $event_title . "<br>";
+                $message .= "Event Description: $event_intro<br>";
+                $message .= "Contact Name: $admin_name<br><br>";
 
-            if( $old_event_status === '20' && $current_status === '10' ) {
-                $subject  = 'Event Approved';
-                $message  .= $email_notifications['approved_message'];
-                wp_mail( $to_email, $subject, $message, $header );
 
-            } else if( $old_event_status === '20' && $current_status === '40' ){
-                $declined = $email_notifications['declined_message'];
-                $subject  = 'Event Declined';
-                $message  .= "Your event has been declined for the following reason(s):<br> $declined";
-                wp_mail( $to_email, $subject, $message, $header );
+                if( $old_event_status === '20' && $current_status === '10' ) {
+                    $subject  = 'Event Approved';
+                    $message  .= $email_notifications['approved_message'];
+                    wp_mail( $to_email, $subject, $message, $header );
+
+                } else if( $old_event_status === '20' && $current_status === '40' ){
+                    $declined = $email_notifications['declined_message'];
+                    $subject  = 'Event Declined';
+                    $message  .= "Your event has been declined for the following reason(s):<br> $declined";
+                    wp_mail( $to_email, $subject, $message, $header );
+                }
             }
-        }
-        remove_filter( 'wp_mail_content_type', 'set_content_type' );
-        // END DECLINED & APPROVED EVENT EMAIL FUNCTIONALITY ////////
+            remove_filter( 'wp_mail_content_type', 'set_content_type' );
+            // END DECLINED & APPROVED EVENT EMAIL FUNCTIONALITY ////////
 
 
-        // Deterine if we need to request search engine index, re-index, or removal
-        $url = GLM_MEMBERS_SITE_BASE_URL.$this->config['settings']['canonical_event_page'].'/'.$eventSlug.'/';
-        if ($indexEvent) {
-            $result = apply_filters( 'glm_member_db_common_search_indexurl', $url );
-        }
-        if ($removeEventIndex) {
-            $result = apply_filters( 'glm_member_db_common_search_removeurl', $url );
-        }
+            // Deterine if we need to request search engine index, re-index, or removal
+            if ($eventSlug && trim($eventSlug) != '') {
+                $url = GLM_MEMBERS_SITE_BASE_URL.$this->config['settings']['canonical_event_page'].'/'.$eventSlug.'/';
+                if ($indexEvent) {
+                    $result = apply_filters( 'glm_member_db_common_search_indexurl', $url );
+                }
+                if ($removeEventIndex) {
+                    $result = apply_filters( 'glm_member_db_common_search_removeurl', $url );
+                }
+            }
+
+        } // if ($this->eventID)
 
         if (!$this->config['settings']['event_default_state']) {
             $this->config['settings']['event_default_state'] = $this->config['settings']['default_state'];
index da58ab6..5f92260 100755 (executable)
@@ -6,10 +6,12 @@
 
 {if apply_filters('glm_members_permit_admin_member_event', true) && ($option == 'add' || $haveEvent)}
 
-                        {$e_link = apply_filters('glm_members_add_link_to_event_list_entry', $event.fieldData.id)}
-                         {if is_array($e_link)}
-                            <a class="button button-secondary glm-button glm-right" href="{$e_link.url|escape:'string'}">{$e_link.title}</a>
-                         {/if}
+  {if $haveEvent}
+    {$e_link = apply_filters('glm_members_add_link_to_event_list_entry', $event.fieldData.id)}
+      {if is_array($e_link)}
+    <a class="button button-secondary glm-button glm-right" href="{$e_link.url|escape:'string'}">{$e_link.title}</a>
+     {/if}
+  {/if}
 
   {if $haveMember}
     <a href="{$thisUrl}?page=glm-members-admin-menu-member&glm_action=events&member={$memberID}&back=1" class="button button-secondary glm-button glm-right">Return to Events List</a>
index c2f12dd..bcdcb01 100644 (file)
         <tr>
             <th {if $event.fieldRequired.descr}class="glm-required"{/if}>Description:</th>
             <td {if $event.fieldFail.descr}class="glm-form-bad-input" data-tabid="glm-event-descr"{/if}>
-                {php}
-                    wp_editor('{$event.fieldData.descr|escape:quotes}', 'glm_descr', array(
-                        'media_buttons' => false,
-                        // 'quicktags' => false,
-                        // 'wpautop' => false,  NOTE: Dont's use. Problem when numerous spaces before text.
-                        'textarea_name' => 'descr',
-                        'editor_height' => 200,     // Height in px, overrides editor_rows
-                            // 'textarea_rows' => 8
-                    ));
-                {/php}
+                {wp_editor(
+                    $event.fieldData.descr,
+                    'glm_descr',
+                    json_decode('{
+                        "media_buttons":    false,
+                        "quicktags":        false,
+                        "textarea_name":    "descr",
+                        "editor_height":    100
+                    }', true)
+                )}
                 {if $event.fieldFail.descr}<p>{$event.fieldFail.descr}</p>{/if}
             </td>
         </tr>
index d4a83ff..65a4ec2 100644 (file)
@@ -30,7 +30,7 @@
             <tr>
                 <th>Name Search:</th>
                 <td>
-                    <input id="glmEventsExportSearch" name="textSearch" value="{if $searchName}{$searchName}{/if}" />
+                    <input id="glmEventsExportSearch" name="textSearch" value="{if isset($searchName) && $searchName}{$searchName}{/if}" />
                 </td>
             </tr>
             <tr>
index 0add43e..1eb1175 100644 (file)
                         <tr>
                             <th {if $eventsSettings.fieldRequired.event_member_message} class="glm-required"}{/if}>Member Message</th>
                             <td {if $eventsSettings.fieldFail.event_member_message}class="glm-form-bad-input" data-tabid="glm-member-message"{/if}>
-                                {php}
-                                    wp_editor('{if $eventsSettings} {$eventsSettings.fieldData.event_member_message|escape:quotes} {/if}', 'event_member_message', array(
-                                        'media_buttons' => false,
-                                        'textarea_name' => 'event_member_message',
-                                        'editor_height' => 300,
-                                    ));
-                                {/php}
+                                {$eventMemberMessage = ''}
+                                {if isset($eventsSettings)}
+                                    {$eventMemberMessage = $eventsSettings.fieldData.event_member_message}
+                                {/if}
+                                {wp_editor(
+                                    $eventMemberMessage,
+                                    'event_member_message',
+                                    json_decode('{
+                                        "media_buttons":    false,
+                                        "quicktags":        false,
+                                        "textarea_name":    "event_member_message",
+                                        "editor_height":    100
+                                    }', true)
+                                )}
                             </td>
                         </tr>
 
index 4519842..68cd1c5 100644 (file)
         <div class="glm-row">
             <div class="glm-small-12 glm-medium-3 glm-column email-notification-label"> Email Notification Message </div>
             <div class="glm-small-12 glm-medium-9 glm-column email-notification-editor">
-                    {php}
-                        wp_editor('{if $email_settings} {$email_settings.email_notification|escape:quotes} {/if}', 'glm_notification', array(
-                            'media_buttons' => false,
-                            // 'quicktags' => false,
-                            // 'wpautop' => false,  NOTE: Dont's use. Problem when numerous spaces before text.
-                            'textarea_name' => 'email_notification',
-                            'editor_height' => 300,     // Height in px, overrides editor_rows
-                                // 'textarea_rows' => 8
-                        ));
-                    {/php}
+                {$emailNotification = ''}
+                {if isset($email_settings)}
+                    {$emailNotification = $email_settings.email_notification}
+                {/if}
+                {wp_editor(
+                    $emailNotification,
+                    'email_notification',
+                    json_decode('{
+                        "media_buttons":    false,
+                        "quicktags":        false,
+                        "textarea_name":    "email_notification",
+                        "editor_height":    300
+                    }', true)
+                )}
             </div>
         </div>
         <div class="glm-row">
             <div class="glm-small-12 glm-medium-3 glm-column email-notification-label"> Declined Message </div>
             <div class="glm-small-12 glm-medium-9 glm-column email-notification-editor">
-                    {php}
-                        wp_editor('{if $email_settings} {$email_settings.declined_message|escape:quotes} {/if}', 'glm_declined', array(
-                            'media_buttons' => false,
-                            // 'quicktags' => false,
-                            // 'wpautop' => false,  NOTE: Dont's use. Problem when numerous spaces before text.
-                            'textarea_name' => 'declined_message',
-                            'editor_height' => 300,     // Height in px, overrides editor_rows
-                                // 'textarea_rows' => 8
-                        ));
-                    {/php}
+                {$declinedMessage = ''}
+                {if isset($email_settings)}
+                    {$declinedMessage = $email_settings.declined_message}
+                {/if}
+                {wp_editor(
+                    $declinedMessage,
+                    'declined_message',
+                    json_decode('{
+                        "media_buttons":    false,
+                        "quicktags":        false,
+                        "textarea_name":    "declined_message",
+                        "editor_height":    300
+                    }', true)
+                )}
             </div>
         </div>
         <div class="glm-row">
             <div class="glm-small-12 glm-medium-3 glm-columns email-notification-label"> Approved Message </div>
             <div class="glm-small-12 glm-medium-9 glm-columns email-notification-editor">
-                    {php}
-                        wp_editor('{if $email_settings} {$email_settings.approved_message|escape:quotes} {/if}', 'glm_approved', array(
-                            'media_buttons' => false,
-                            // 'quicktags' => false,
-                            // 'wpautop' => false,  NOTE: Dont's use. Problem when numerous spaces before text.
-                            'textarea_name' => 'approved_message',
-                            'editor_height' => 300,     // Height in px, overrides editor_rows
-                                // 'textarea_rows' => 8
-                        ));
-                    {/php}
+                {$approvedMessage = ''}
+                {if isset($email_settings)}
+                    {$approvedMessage = $email_settings.approved_message}
+                {/if}
+                {wp_editor(
+                    $approvedMessage,
+                    'approved_message',
+                    json_decode('{
+                        "media_buttons":    false,
+                        "quicktags":        false,
+                        "textarea_name":    "approved_message",
+                        "editor_height":    300
+                    }', true)
+                )}
             </div>
         </div>
          <input type="submit" value="Update Settings" class="button-primary">
index f018adf..d1fe06b 100644 (file)
         <div class="glm-add-event-form-item" id="glm-descr">
             <div class="glm-add-event-form-label"><label{if $event.fieldRequired.descr} style="color: red;"{/if}>Description:</label></div>
             <div class="glm-add-event-form-data{if $event.fieldFail.descr} glm-form-bad-input" data-tabid="glm-event-descr{/if}">
-                {php}
-                    wp_editor('{$event.fieldData.descr|escape:quotes}', 'glm_descr', array(
-                         'media_buttons' => false,
-                        // 'quicktags' => false,
-                        // 'wpautop' => false,  NOTE: Dont's use. Problem when numerous spaces before text.
-                        'textarea_name' => 'descr',
-                        'editor_height' => 200,     // Height in px, overrides editor_rows
-                            // 'textarea_rows' => 8
-                    ));
-                {/php}
+                {wp_editor(
+                    $event.fieldData.descr,
+                    'glm_descr',
+                    json_decode('{
+                        "media_buttons":    false,
+                        "quicktags":        false,
+                        "textarea_name":    "descr",
+                        "editor_height":    100
+                    }', true)
+                )}
                 {if $event.fieldFail.descr}<p>{$event.fieldFail.descr}</p>{/if}
             </div>
         </div>