From a56f7a66979b72d0eec1a582e920dac706b79ec2 Mon Sep 17 00:00:00 2001 From: Steve Sutton Date: Thu, 1 Sep 2016 10:57:46 -0400 Subject: [PATCH] Taking care of php errors from the event plugin. Turned on error reporting and testing the plugin. Found some errors that are outputting and now taking care of them. --- models/front/events/frontAdd.php | 25 ++++++++++++++++++------- models/front/events/list.php | 12 ++++++------ 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/models/front/events/frontAdd.php b/models/front/events/frontAdd.php index 075dc1f..6ac49e1 100644 --- a/models/front/events/frontAdd.php +++ b/models/front/events/frontAdd.php @@ -89,6 +89,17 @@ class GLmMembersFront_events_frontAdd extends GlmDataEvents */ public function modelAction($actionData = false) { + // Set initial values for variables. + $fromDate = ''; + $permalink = ''; + $title = ''; + $errorMsg = ''; + $days = + $lastDayOfMonth = + $startTime = + $endTime = 0; + $status = false; + if( ! wp_script_is( 'jquery-ui', 'enqueued' ) ){ wp_enqueue_script('jquery-ui-datepicker', false, array('jquery'), false, true); wp_enqueue_style('jquery-style', 'http://ajax.googleapis.com/ajax/libs/jqueryui/1.11.4/themes/smoothness/jquery-ui.css'); @@ -128,7 +139,7 @@ class GLmMembersFront_events_frontAdd extends GlmDataEvents $newEvent = $events->newEntry(); // if form is submitted - if ( $_REQUEST['newEvent'] == "Add Event" ) { + if ( isset( $_REQUEST['newEvent'] ) && $_REQUEST['newEvent'] == "Add Event" ) { // parse dates and times date_default_timezone_set('America/New_York'); @@ -179,8 +190,8 @@ class GLmMembersFront_events_frontAdd extends GlmDataEvents $admin_org = trim(filter_var($_REQUEST['admin_org'],FILTER_SANITIZE_STRING)); $adminPhone = trim(filter_var($_REQUEST['admin_phone'],FILTER_SANITIZE_STRING)); $adminEmail = trim(filter_var($_REQUEST['admin_email'],FILTER_SANITIZE_STRING)); - $facebook = trim(filter_var($_REQUEST['facebook'],FILTER_SANITIZE_STRING)); - $twitter = trim(filter_var($_REQUEST['twitter'],FILTER_SANITIZE_STRING)); + //$facebook = trim(filter_var($_REQUEST['facebook'],FILTER_SANITIZE_STRING)); + //$twitter = trim(filter_var($_REQUEST['twitter'],FILTER_SANITIZE_STRING)); $contactFirst = trim(filter_var($_REQUEST['contact_fname'],FILTER_SANITIZE_STRING)); $contactLast = trim(filter_var($_REQUEST['contact_lname'],FILTER_SANITIZE_STRING)); @@ -432,8 +443,8 @@ class GLmMembersFront_events_frontAdd extends GlmDataEvents // event category data $categoryData = array( - 'event' => $eventID, - 'category' => $category + 'event' => $eventID, + 'category' => $category ); $this->wpdb->insert( GLM_MEMBERS_EVENTS_PLUGIN_DB_PREFIX . 'event_categories', @@ -522,14 +533,14 @@ class GLmMembersFront_events_frontAdd extends GlmDataEvents 'mainImgUrl' => GLM_MEMBERS_PLUGIN_MEDIA_URL . '/images/large/' ); - error_reporting(E_ALL ^ E_NOTICE); + //error_reporting(E_ALL ^ E_NOTICE); return array( 'status' => $status, 'menuItemRedirect' => false, 'modelRedirect' => false, 'view' => 'front/events/'.$view.'.html', 'data' => $templateData, - 'settings' => $settings + //'settings' => $settings ); } } diff --git a/models/front/events/list.php b/models/front/events/list.php index cc532a5..5cc185f 100644 --- a/models/front/events/list.php +++ b/models/front/events/list.php @@ -504,12 +504,12 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction $view = 'agenda.html'; $events = $this->getModelEventsData($categoryId, null, $memberId); - + // Also get event times for calendar display // require_once GLM_MEMBERS_EVENTS_PLUGIN_CLASS_PATH . '/data/dataTimes.php'; // $Times = new GlmDataEventsTimes($this->wpdb, $this->config); // $calDates = $Times->getEventTimesSimplified($categoryId); - + break; } @@ -611,14 +611,14 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction $mainEventPageUrl = get_permalink( $event_page_id ); } - + global $wpdb; $sql = "SELECT calendar_view FROM " . GLM_MEMBERS_EVENTS_PLUGIN_DB_PREFIX . "management"; $calendar_view = $wpdb->get_results($sql, ARRAY_A); - + // check if event search was performed and if it is override the view to agenda - $override_default_view = $_REQUEST['override_default']; - + $override_default_view = ( isset( $_REQUEST['override_default'] ) ) ? $_REQUEST['override_default'] : ''; + if ( $override_default_view === 'yes' ){ $calendar_view = "agenda"; }else if ( $calendar_view[0]['calendar_view'] === "" || empty($calendar_view[0]['calendar_view'] ) ){ -- 2.17.1