From: Chuck Scott Date: Mon, 29 Aug 2016 18:22:54 +0000 (-0400) Subject: Removed all parens from require and include statements. X-Git-Tag: v1.3.3^2~26 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=71d6d4b31f2e28840410745d716ae86a2fc7ff7b;p=WP-Plugins%2Fglm-member-db-events.git Removed all parens from require and include statements. --- diff --git a/classes/data/dataEvents.php b/classes/data/dataEvents.php index c6d43ce..12a445a 100644 --- a/classes/data/dataEvents.php +++ b/classes/data/dataEvents.php @@ -676,11 +676,11 @@ class GlmDataEvents extends GlmDataAbstract { // Load locations data class - require_once(GLM_MEMBERS_EVENTS_PLUGIN_CLASS_PATH.'/data/dataLocations.php'); + require_once GLM_MEMBERS_EVENTS_PLUGIN_CLASS_PATH.'/data/dataLocations.php'; $Locations = new GlmDataEventsLocations($this->wpdb, $this->config); // Load recurrences data class to deal with event times - require_once(GLM_MEMBERS_EVENTS_PLUGIN_CLASS_PATH.'/data/dataRecurrences.php'); + require_once GLM_MEMBERS_EVENTS_PLUGIN_CLASS_PATH.'/data/dataRecurrences.php'; $Recurrences = new GlmDataEventsRecurrences($this->wpdb, $this->config); // Check ID @@ -778,7 +778,7 @@ class GlmDataEvents extends GlmDataAbstract $lastDate = ''; // Load the data class for Event Times - require_once(GLM_MEMBERS_EVENTS_PLUGIN_CLASS_PATH.'/data/dataTimes.php'); + require_once GLM_MEMBERS_EVENTS_PLUGIN_CLASS_PATH.'/data/dataTimes.php'; $Times = new GlmDataEventsTimes($this->wpdb, $this->config); // Select the first entry by matching min start time diff --git a/models/admin/ajax/eventsCalMonthAJAX.php b/models/admin/ajax/eventsCalMonthAJAX.php index d8669be..cafdc26 100644 --- a/models/admin/ajax/eventsCalMonthAJAX.php +++ b/models/admin/ajax/eventsCalMonthAJAX.php @@ -14,7 +14,7 @@ */ // Load Event Times data abstract -require_once(GLM_MEMBERS_EVENTS_PLUGIN_CLASS_PATH.'/data/dataTimes.php'); +require_once GLM_MEMBERS_EVENTS_PLUGIN_CLASS_PATH.'/data/dataTimes.php'; require_once GLM_MEMBERS_EVENTS_PLUGIN_CLASS_PATH . '/data/dataEvents.php'; require_once GLM_MEMBERS_EVENTS_PLUGIN_PATH . '/models/front/events/baseAction.php'; @@ -81,16 +81,16 @@ class GlmMembersAdmin_ajax_eventsCalMonthAJAX extends GlmDataEventsTimes $this->postAddTimes = true; $where = ''; - + $where .= "T.active = 1 AND T.event IN ( SELECT event FROM " . GLM_MEMBERS_EVENTS_PLUGIN_DB_PREFIX . "times AS ET - WHERE active + WHERE active AND " . $this->dateRange . " ) "; - + $events = $this->getList( $where ); // echo "
", print_r($events), '
'; $this->postAddTimes = false; @@ -114,8 +114,8 @@ class GlmMembersAdmin_ajax_eventsCalMonthAJAX extends GlmDataEventsTimes * Echos JSON string as response and does not return */ public function modelAction ($actionData = false) - { - + { + $event_data = []; $month = $_POST['month']; $from = date('Y-m-d', strtotime($month['start'])); @@ -130,26 +130,26 @@ class GlmMembersAdmin_ajax_eventsCalMonthAJAX extends GlmDataEventsTimes $times = $this->getModelTimesData(); // var_dump($events); - + foreach ($times as $e=>$val){ $event_data[$e]['title'] = html_entity_decode($val['event_name']); - + // $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'])); $last = date('Y-m-d H:i:s', strtotime($val['end_time']['datetime'])); - + $all_day = $val['all_day']['value']; - + $event_data[$e]['all_day'] = ($all_day === "0" ? false : true); $event_data[$e]['start'] = ($start); $event_data[$e]['last'] = ($last); } - + $return = array( 'status' => false, // Assume nothing works 'events' => $event_data, // Where our events list will go diff --git a/models/admin/ajax/icalFeed.php b/models/admin/ajax/icalFeed.php index e7db76c..82bc6bf 100644 --- a/models/admin/ajax/icalFeed.php +++ b/models/admin/ajax/icalFeed.php @@ -31,7 +31,7 @@ require_once GLM_MEMBERS_EVENTS_PLUGIN_PATH . '/models/front/events/icalFeed.php */ // Load Members data abstract -// require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataImages.php'); +// require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataImages.php'; /** * This class performs the work of handling images passed to it via diff --git a/models/admin/ajax/icalFeedImport.php b/models/admin/ajax/icalFeedImport.php index ddc79a7..9b34592 100644 --- a/models/admin/ajax/icalFeedImport.php +++ b/models/admin/ajax/icalFeedImport.php @@ -31,7 +31,7 @@ require_once GLM_MEMBERS_EVENTS_PLUGIN_PATH . '/models/front/events/icalFeedImpo */ // Load Members data abstract -// require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataImages.php'); +// require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataImages.php'; /** * This class performs the work of handling images passed to it via diff --git a/models/admin/ajax/nameSearch.php b/models/admin/ajax/nameSearch.php index 364df40..b0dd199 100644 --- a/models/admin/ajax/nameSearch.php +++ b/models/admin/ajax/nameSearch.php @@ -31,7 +31,7 @@ require_once GLM_MEMBERS_EVENTS_PLUGIN_PATH . '/models/front/events/list.php'; */ // Load Members data abstract -// require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataImages.php'); +// require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataImages.php'; /** * This class performs the work of handling images passed to it via diff --git a/models/admin/ajax/pdfOutput.php b/models/admin/ajax/pdfOutput.php index a9b7a34..e8f4a29 100644 --- a/models/admin/ajax/pdfOutput.php +++ b/models/admin/ajax/pdfOutput.php @@ -31,7 +31,7 @@ require_once GLM_MEMBERS_EVENTS_PLUGIN_PATH . '/models/front/events/list.php'; */ // Load Members data abstract -// require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataImages.php'); +// require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataImages.php'; /** * This class performs the work of handling images passed to it via diff --git a/models/admin/ajax/rssFeed.php b/models/admin/ajax/rssFeed.php index ecb0c2a..c910caa 100644 --- a/models/admin/ajax/rssFeed.php +++ b/models/admin/ajax/rssFeed.php @@ -31,7 +31,7 @@ require_once GLM_MEMBERS_EVENTS_PLUGIN_PATH . '/models/front/events/rssFeed.php' */ // Load Members data abstract -// require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataImages.php'); +// require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataImages.php'; /** * This class performs the work of handling images passed to it via diff --git a/models/admin/dashboard/index.php b/models/admin/dashboard/index.php index e151af3..86902b1 100644 --- a/models/admin/dashboard/index.php +++ b/models/admin/dashboard/index.php @@ -14,7 +14,7 @@ */ // Load Events data abstract -require_once(GLM_MEMBERS_EVENTS_PLUGIN_CLASS_PATH.'/data/dataEvents.php'); +require_once GLM_MEMBERS_EVENTS_PLUGIN_CLASS_PATH.'/data/dataEvents.php'; class GlmMembersAdmin_events_index extends GlmDataEvents { @@ -107,7 +107,7 @@ class GlmMembersAdmin_events_index extends GlmDataEvents } // Check for required Event Categories - require_once(GLM_MEMBERS_EVENTS_PLUGIN_CLASS_PATH.'/data/dataCategories.php'); + require_once GLM_MEMBERS_EVENTS_PLUGIN_CLASS_PATH.'/data/dataCategories.php'; $EventCategories = new GlmDataEventsCategories($this->wpdb, $this->config); $eventCategoriesStats = $EventCategories->getStats(); if ($eventCategoriesStats && $eventCategoriesStats > 0) { diff --git a/models/admin/events/index.php b/models/admin/events/index.php index e151af3..86902b1 100644 --- a/models/admin/events/index.php +++ b/models/admin/events/index.php @@ -14,7 +14,7 @@ */ // Load Events data abstract -require_once(GLM_MEMBERS_EVENTS_PLUGIN_CLASS_PATH.'/data/dataEvents.php'); +require_once GLM_MEMBERS_EVENTS_PLUGIN_CLASS_PATH.'/data/dataEvents.php'; class GlmMembersAdmin_events_index extends GlmDataEvents { @@ -107,7 +107,7 @@ class GlmMembersAdmin_events_index extends GlmDataEvents } // Check for required Event Categories - require_once(GLM_MEMBERS_EVENTS_PLUGIN_CLASS_PATH.'/data/dataCategories.php'); + require_once GLM_MEMBERS_EVENTS_PLUGIN_CLASS_PATH.'/data/dataCategories.php'; $EventCategories = new GlmDataEventsCategories($this->wpdb, $this->config); $eventCategoriesStats = $EventCategories->getStats(); if ($eventCategoriesStats && $eventCategoriesStats > 0) { diff --git a/models/admin/events/list.php b/models/admin/events/list.php index 92b8747..379c7a7 100644 --- a/models/admin/events/list.php +++ b/models/admin/events/list.php @@ -14,11 +14,11 @@ */ // Load Contacts data class -require_once(GLM_MEMBERS_EVENTS_PLUGIN_CLASS_PATH.'/data/dataEvents.php'); +require_once GLM_MEMBERS_EVENTS_PLUGIN_CLASS_PATH.'/data/dataEvents.php'; // Load event categories data class -require_once(GLM_MEMBERS_EVENTS_PLUGIN_CLASS_PATH.'/data/dataCategories.php'); -require_once(GLM_MEMBERS_EVENTS_PLUGIN_CLASS_PATH.'/data/dataEventCategories.php'); +require_once GLM_MEMBERS_EVENTS_PLUGIN_CLASS_PATH.'/data/dataCategories.php'; +require_once GLM_MEMBERS_EVENTS_PLUGIN_CLASS_PATH.'/data/dataEventCategories.php'; class GlmMembersAdmin_events_list extends GlmDataEvents { @@ -166,7 +166,7 @@ class GlmMembersAdmin_events_list extends GlmDataEvents if ($memberID > 0) { // Get base member information - require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataMembers.php'); + require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataMembers.php'; $Member = new GlmDataMembers($this->wpdb, $this->config); $memberData = $Member->getEntry($memberID); @@ -192,12 +192,12 @@ class GlmMembersAdmin_events_list extends GlmDataEvents $categories = $Categories->getListSortedParentChild(false); // Load locations data class to get a blank entry for the template - require_once(GLM_MEMBERS_EVENTS_PLUGIN_CLASS_PATH.'/data/dataLocations.php'); + require_once GLM_MEMBERS_EVENTS_PLUGIN_CLASS_PATH.'/data/dataLocations.php'; $Locations = new GlmDataEventsLocations($this->wpdb, $this->config); $newLocation = $Locations->newEntry(); // Load recurrences data class to get a blank entry for the template - require_once(GLM_MEMBERS_EVENTS_PLUGIN_CLASS_PATH.'/data/dataRecurrences.php'); + require_once GLM_MEMBERS_EVENTS_PLUGIN_CLASS_PATH.'/data/dataRecurrences.php'; $Recurrences = new GlmDataEventsRecurrences($this->wpdb, $this->config); $newRecurrence = $Recurrences->newEntry(); @@ -684,7 +684,7 @@ class GlmMembersAdmin_events_list extends GlmDataEvents $numbRecurrences = count($recurrences); // Get list of times - require_once(GLM_MEMBERS_EVENTS_PLUGIN_CLASS_PATH.'/data/dataTimes.php'); + require_once GLM_MEMBERS_EVENTS_PLUGIN_CLASS_PATH.'/data/dataTimes.php'; $Times = new GlmDataEventsTimes($this->wpdb, $this->config); $times = $Times->getList('T.event = '.$this->eventID, 'start_time'); @@ -858,7 +858,7 @@ class GlmMembersAdmin_events_list extends GlmDataEvents if (isset($_REQUEST['newCity'])) { // Try to add the city - require_once(GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataCities.php'); + require_once GLM_MEMBERS_PLUGIN_CLASS_PATH.'/data/dataCities.php'; $Cities = new GlmDataCities($this->wpdb, $this->config); // For each new city submitted diff --git a/models/admin/member/add.php b/models/admin/member/add.php index b8ec9db..7ba3e97 100644 --- a/models/admin/member/add.php +++ b/models/admin/member/add.php @@ -14,7 +14,7 @@ */ // Load Contacts data abstract -require_once(GLM_MEMBERS_EVENTS_PLUGIN_CLASS_PATH.'/data/dataEvents.php'); +require_once GLM_MEMBERS_EVENTS_PLUGIN_CLASS_PATH.'/data/dataEvents.php'; class GlmMembersAdmin_member_add extends GlmDataEvents { @@ -126,23 +126,23 @@ class GlmMembersAdmin_member_add extends GlmDataEvents $eventFields = array_filter($_REQUEST, function($k) { return preg_match('/^events_/',$k); }, ARRAY_FILTER_USE_KEY); - + // echo "
EventsArray:"; foreach($eventFields as $key=>$value) { // echo(""); $formFields[] = $value; } // echo "
$key$value

"; - + // Get field names for each column - $dbFields = " + $dbFields = " SELECT column_name FROM information_schema.columns WHERE table_name = '" .GLM_MEMBERS_EVENTS_PLUGIN_DB_PREFIX . "events' AND table_schema = 'worddb' ;"; $alldbFields = $this->wpdb->get_results($dbFields, ARRAY_A); - + // Store field names in an array for later use foreach($alldbFields as $key=>$value){ $field[] = $value['column_name']; @@ -151,7 +151,7 @@ class GlmMembersAdmin_member_add extends GlmDataEvents if (isset($_REQUEST['events_name'])) { $title = trim(filter_var($_REQUEST['events_name'],FILTER_SANITIZE_STRING)); } - + // sql query $sql = " INSERT INTO ". GLM_MEMBERS_EVENTS_PLUGIN_DB_PREFIX . "events @@ -173,7 +173,7 @@ class GlmMembersAdmin_member_add extends GlmDataEvents 'view' => 'admin/member/add.html', 'data' => $templateData ); - + } diff --git a/models/admin/member/categories.php b/models/admin/member/categories.php index 8f83837..45209ac 100644 --- a/models/admin/member/categories.php +++ b/models/admin/member/categories.php @@ -14,7 +14,7 @@ */ // Load Contacts data abstract -require_once(GLM_MEMBERS_EVENTS_PLUGIN_CLASS_PATH.'/data/dataEvents.php'); +require_once GLM_MEMBERS_EVENTS_PLUGIN_CLASS_PATH.'/data/dataEvents.php'; class GlmMembersAdmin_member_categories extends GlmDataEvents { @@ -146,7 +146,7 @@ class GlmMembersAdmin_member_categories extends GlmDataEvents // (id,name) // VALUES ('3', '" . $title . "') // ;";query($sql); -// +// // $this->wpdb->query($sql); } $templateData = array( @@ -162,7 +162,7 @@ class GlmMembersAdmin_member_categories extends GlmDataEvents 'view' => 'admin/member/categories.html', 'data' => $templateData ); - + } diff --git a/models/admin/members/events.php b/models/admin/members/events.php index b57b1bf..d61907c 100644 --- a/models/admin/members/events.php +++ b/models/admin/members/events.php @@ -14,7 +14,7 @@ */ // Load Contacts data abstract -//require_once(GLM_MEMBERS_CONTACTS_PLUGIN_CLASS_PATH.'/data/dataContacts.php'); +//require_once GLM_MEMBERS_CONTACTS_PLUGIN_CLASS_PATH.'/data/dataContacts.php'; class GlmMembersAdmin_members_events // extends GlmDataContacts { diff --git a/models/admin/settings/eventCategories.php b/models/admin/settings/eventCategories.php index 28d76fb..75714c8 100644 --- a/models/admin/settings/eventCategories.php +++ b/models/admin/settings/eventCategories.php @@ -13,7 +13,7 @@ */ // Load Event Categories data abstract -require_once(GLM_MEMBERS_EVENTS_PLUGIN_CLASS_PATH.'/data/dataCategories.php'); +require_once GLM_MEMBERS_EVENTS_PLUGIN_CLASS_PATH.'/data/dataCategories.php'; /* * This class performs the work for the default action of the "Members" menu