From: Chuck Scott Date: Thu, 6 Dec 2018 16:31:11 +0000 (-0500) Subject: Fixed some errors that showed up in error log. X-Git-Tag: v1.7.14^2~11 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=8e8a828a7fa5233abf6e0a4bc7a736f8839a6abc;p=WP-Plugins%2Fglm-member-db-events.git Fixed some errors that showed up in error log. 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. --- diff --git a/models/admin/events/list.php b/models/admin/events/list.php index f73c314..3aefba1 100644 --- a/models/admin/events/list.php +++ b/models/admin/events/list.php @@ -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

"; - $message .= "Event Name: " . $event_title . "
"; - $message .= "Event Description: $event_intro
"; - $message .= "Contact Name: $admin_name

"; + $declined = ''; + $current_status = $event['fieldData']['status']['value']; + if($to_email){ + $message = $site_name . " Events

"; + $message .= "Event Name: " . $event_title . "
"; + $message .= "Event Description: $event_intro
"; + $message .= "Contact Name: $admin_name

"; - 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):
$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):
$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']; diff --git a/views/admin/events/edit.html b/views/admin/events/edit.html index da58ab6..5f92260 100755 --- a/views/admin/events/edit.html +++ b/views/admin/events/edit.html @@ -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)} - {$e_link.title} - {/if} + {if $haveEvent} + {$e_link = apply_filters('glm_members_add_link_to_event_list_entry', $event.fieldData.id)} + {if is_array($e_link)} + {$e_link.title} + {/if} + {/if} {if $haveMember} Return to Events List diff --git a/views/admin/events/editStatus.html b/views/admin/events/editStatus.html index c2f12dd..bcdcb01 100644 --- a/views/admin/events/editStatus.html +++ b/views/admin/events/editStatus.html @@ -225,16 +225,16 @@ Description: - {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}

{$event.fieldFail.descr}

{/if} diff --git a/views/admin/events/eventExportModal.html b/views/admin/events/eventExportModal.html index d4a83ff..65a4ec2 100644 --- a/views/admin/events/eventExportModal.html +++ b/views/admin/events/eventExportModal.html @@ -30,7 +30,7 @@ Name Search: - + diff --git a/views/admin/management/events.html b/views/admin/management/events.html index 0add43e..1eb1175 100644 --- a/views/admin/management/events.html +++ b/views/admin/management/events.html @@ -165,13 +165,20 @@ Member Message - {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) + )} diff --git a/views/admin/settings/emailNotifications.html b/views/admin/settings/emailNotifications.html index 4519842..68cd1c5 100644 --- a/views/admin/settings/emailNotifications.html +++ b/views/admin/settings/emailNotifications.html @@ -23,46 +23,58 @@
diff --git a/views/front/events/frontAdd.html b/views/front/events/frontAdd.html index f018adf..d1fe06b 100644 --- a/views/front/events/frontAdd.html +++ b/views/front/events/frontAdd.html @@ -243,16 +243,16 @@
Description:
- {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}

{$event.fieldFail.descr}

{/if}