From: Chuck Scott Date: Tue, 20 Sep 2016 20:25:17 +0000 (-0400) Subject: Changed Live Cam to include the ability to use it as an off-site link to a Webcam... X-Git-Tag: v2.6.0^2~3 X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=318567ce5634c0af6e86b8168f13e674e69f8974;p=WP-Plugins%2Fglm-member-db.git Changed Live Cam to include the ability to use it as an off-site link to a Webcam (or whatever) page. --- diff --git a/classes/data/settings/dataSettingsTerms.php b/classes/data/settings/dataSettingsTerms.php index d379f960..64451238 100644 --- a/classes/data/settings/dataSettingsTerms.php +++ b/classes/data/settings/dataSettingsTerms.php @@ -433,6 +433,13 @@ class GlmDataSettingsTerms extends GlmDataAbstract 'field' => 'term_contact_plur_cap', 'type' => 'text', 'use' => 'a' + ), + + // Live Camera Cap + 'term_webcam_cap' => array( + 'field' => 'term_webcam_cap', + 'type' => 'text', + 'use' => 'a' ) diff --git a/config/plugin.ini b/config/plugin.ini index 24dec222..df74ff41 100644 --- a/config/plugin.ini +++ b/config/plugin.ini @@ -323,8 +323,10 @@ video_type_numb['Vimeo'] = 2 ;video_type_numb['Ogg'] = 23 ; Live Cam Types -live_cam_type[1] = 'Image' -;live_cam_type[2] = 'Stream' +live_cam_type[1] = 'Web Page' +live_cam_type[2] = 'Camera Image' +;live_cam_type[3] = 'Video Stream' -live_cam_type_numb['Image'] = 1 -;live_cam_type_numb['Stream'] = 2 +live_cam_type_numb['Web Page'] = 1 +live_cam_type_numb['Camera Image'] = 2 +;live_cam_type_numb['Video Stream'] = 3 diff --git a/index.php b/index.php index 37a78778..0b1c6260 100644 --- a/index.php +++ b/index.php @@ -39,7 +39,7 @@ */ define('GLM_MEMBERS_PLUGIN_VERSION', '2.5.6'); -define('GLM_MEMBERS_PLUGIN_DB_VERSION', '1.1.18'); +define('GLM_MEMBERS_PLUGIN_DB_VERSION', '1.1.19'); // Check if plugin version is not current in WordPress option and if needed updated it if (GLM_MEMBERS_PLUGIN_VERSION != get_option('glmMembersDatabasePluginVersion')) { diff --git a/models/front/members/detail.php b/models/front/members/detail.php index 1cd7eb06..a1624dda 100644 --- a/models/front/members/detail.php +++ b/models/front/members/detail.php @@ -315,22 +315,7 @@ class GlmMembersFront_members_detail extends GlmDataMemberInfo } else { $memberData['video_embed'] = "Could not find video"; } - - // Create embed code for the live cam feed. Image or video based on selected type - $liveCamType = $memberData['live_cam_type']['name']; - $liveCamUrl = $memberData['live_cam_url']; - if (!preg_match("~^(?:f|ht)tps?://~i", $liveCamUrl)) { - $liveCamUrl = "http://" . $liveCamUrl; - } - if ($liveCamType == 'Image') { - $liveCamEmbed = ''; - } else if ($liveCamType == 'Stream') { - $liveCamEmbed = ''; - } else { - $liveCamEmbed = "Nope"; - } - $memberData['live_cam_embed'] = $liveCamEmbed; - + } diff --git a/setup/databaseScripts/create_database_V1.1.18.sql b/setup/databaseScripts/create_database_V1.1.18.sql deleted file mode 100644 index cc17b946..00000000 --- a/setup/databaseScripts/create_database_V1.1.18.sql +++ /dev/null @@ -1,554 +0,0 @@ --- Gaslight Media Members Database --- File Created: 12/09/14 15:27:15 --- Database Version: 1.1.18 --- Database Creation Script --- --- To permit each query below to be executed separately, --- all queries must be separated by a line with four dashes --- --- **** BE SURE TO ALSO UPDATE drop_database_Vxxx.sql FILE WHEN CHANGING TABLES **** --- - --- Amenities -CREATE TABLE {prefix}amenities ( - id INT NOT NULL AUTO_INCREMENT, - active TINYINT(1) NULL, -- Amenity is active flag - name TINYTEXT NULL, -- Name of amenity - descr TEXT NULL, -- Description of amenity - short_descr TINYTEXT NULL, -- Short description of amenity - ref_type INT NULL, -- Type of entity these amenities are associated with - see plugin.ini ref_type tables - uses_value BOOLEAN NULL, -- Flag indicating whether the amenity requires a quantity number - PRIMARY KEY (id), - INDEX(name(20)) -); - ----- - --- Amenity Reference - Links a specific amenity to a specific entity of type ref_type -CREATE TABLE {prefix}amenity_ref ( - id INT NOT NULL AUTO_INCREMENT, - amenity INT NULL, -- Pointer to amenity in amenities table - ref_type INT NULL, -- Copy of ref_type from matching amenities table entry - to simplify searches - ref_dest INT NULL, -- Pointer to the specific entity of type ref_type - amenity_value TINYTEXT NULL, -- Quantity if amenity uses values - PRIMARY KEY (id), - INDEX(ref_type), - INDEX(ref_dest) -); - ----- - --- groups -CREATE TABLE {prefix}amenity_groups ( - id INT NOT NULL AUTO_INCREMENT, - name TINYTEXT NULL, -- Name of the Group - PRIMARY KEY (id), - INDEX(name(20)) -); - ----- - --- Amenity Group - Links a specific amenity to groups -CREATE TABLE {prefix}grouped_amenities ( - id INT NOT NULL AUTO_INCREMENT, - group_id INT, -- Pointer to the group - amenity_id INT, -- Pointer to the Amenity - searchable BOOLEAN DEFAULT '0', -- Flag indicating whether the amenity group will show in the search form - PRIMARY KEY (id) -); - ----- - --- Member Cateogries - used with member information records -CREATE TABLE {prefix}categories ( - id INT NOT NULL AUTO_INCREMENT, - name TINYTEXT NULL, -- Name of this category - descr TEXT NULL, -- Description of this category - short_descr TINYTEXT NULL, -- Short description of this category - parent INT NULL, -- Pointer to parent category in this table - if there is one - PRIMARY KEY (id) -); - ----- - --- Mapping of categories to specific member information records -CREATE TABLE {prefix}category_member_info ( - id INT NOT NULL AUTO_INCREMENT, - category INT NULL, -- Pointer to category in categories table - member_info INT NULL, -- Pointer to member information record - PRIMARY KEY (id), - CONSTRAINT {prefix}categories_fk_1 - FOREIGN KEY (category) - REFERENCES {prefix}categories (id) - ON DELETE CASCADE, - INDEX(category), - INDEX(member_info) -); - ----- - --- Cities -CREATE TABLE {prefix}cities ( - id INT NOT NULL AUTO_INCREMENT, - name TINYTEXT NULL, -- Name of city - PRIMARY KEY (id) -); - ----- - --- Member Click Through Stats Data - Totals of URL click-throughs - Preserved for 2 years -CREATE TABLE {prefix}clickthrough_stats ( - member INT NULL, -- ID of member - stat_type INT NULL, -- Type of stat 1 = day, 2 = week, 3 = month - stat_date DATE NULL, -- Date for which these stats are accumulated (date or first date of week or month) - clicks INT NULL, -- Number of Clicks - PRIMARY KEY (member, stat_type, stat_date), - INDEX (member), - INDEX (stat_type), - INDEX (stat_date) -); - ----- - --- Files - Files are stored under /wp-content/uploads/glm-member-db/files/ -CREATE TABLE {prefix}files ( - id INT NOT NULL AUTO_INCREMENT, - name TINYTEXT NULL, -- Original name of the file - might be URL if copied via HTTP - status TINYINT(1) NULL, -- Display/Use status - See plugin.ini status table - file_name TINYTEXT NULL, -- Stored file name for the file - descr TEXT NULL, -- Description - position INT NULL, -- Numeric position for sequence of display - ref_type INT NULL, -- Type of entity this image is associated with - ref_dest INT NULL, -- Pointer to the specific entity of ref_type this image is associated with - PRIMARY KEY (id), - INDEX(name(20)), - INDEX(file_name(20)), - INDEX(ref_type), - INDEX(ref_dest) -); - ----- - --- Images - Images are stored under /wp-content/uploads/glm-member-db/images/{size}/ -CREATE TABLE {prefix}images ( - id INT NOT NULL AUTO_INCREMENT, - name TINYTEXT NULL, -- Original name of the image - might be URL if copied via HTTP - status TINYINT(1) NULL, -- Display/Use status - See plugin.ini status table - selected BOOLEAN NULL, -- A single special image in the current gallery for this entity - featured BOOLEAN null, -- Image is a member of a group of featured images - file_name TINYTEXT NULL, -- Stored file name for the image - descr TEXT NULL, -- Description - caption TINYTEXT NULL, -- Caption for the image - position INT NULL, -- Numeric position for sequence of display - ref_type INT NULL, -- Type of entity this image is associated with - ref_dest INT NULL, -- Pointer to the specific entity of ref_type this image is associated with - PRIMARY KEY (id), - INDEX(name(20)), - INDEX(file_name(20)), - INDEX(ref_type), - INDEX(ref_dest) -); - ----- - --- Primary member records - One for each member -CREATE TABLE {prefix}members ( - id INT NOT NULL AUTO_INCREMENT, - access INT NULL, -- Access type - See access table in plugin.ini - member_type INT NULL, -- Pointer to member type in member_type table - created DATE NULL, -- Date member record was created - name TINYTEXT NULL, -- Member name - member_slug TINYTEXT NULL, -- Member name slug for canonical URLs (lowercase, "-" for spaces, no punctuation) - notes TEXT NULL, -- General notes - Not displayed in front-end - old_member_id INT NULL, -- Old member ID if imported from old database - featured BOOLEAN DEFAULT '0', -- Whether the member is featured - PRIMARY KEY (id), - INDEX(name(20)), - INDEX(member_slug(20)), - INDEX(created) -); - ----- - --- Member Detail Display Stats Data - Totals of times detail page is displayed - Preserved for 2 years -CREATE TABLE {prefix}member_detail_stats ( - member INT NULL, -- ID of member - stat_type INT NULL, -- Type of stat 1 = day, 2 = week, 3 = month - stat_date DATE NULL, -- Date for which these stats are accumulated (date or first date of week or month) - clicks INT NULL, -- Number of Clicks - PRIMARY KEY (member, stat_type, stat_date), - INDEX (member), - INDEX (stat_type), - INDEX (stat_date) -); - ----- - --- Member information version record - May be multiples per member - Only one with status "Active" for a distinct date range -CREATE TABLE {prefix}member_info ( - id INT NOT NULL AUTO_INCREMENT, - member INT NULL, -- Pointer to member record in table members - member_name TINYTEXT NULL, -- Copy of member name from members table entry for fast reference - status INT NULL, -- Status of this member information record - See plugin.ini status table - reference_name TINYTEXT NULL, -- Reference name for this member information record - Not displayed on front-end - descr TEXT NULL, -- Description - short_descr TEXT NULL, -- Short description - addr1 TINYTEXT NULL, -- Main member location address line 1 - addr2 TINYTEXT NULL, -- Address line 2 - city INT NULL, -- Pointer to City in cities table - state TINYTEXT NULL, -- Two character state code - matches states.ini entries - country TINYTEXT NULL, -- Two character country code - matches countries.ini entries - zip TINYTEXT NULL, -- ZIP/Postal code - lat FLOAT NULL, -- Latitude of member's location - lon FLOAT NULL, -- Longitude of member's location - region INT NULL, -- Pointer to entry in regions table - phone TINYTEXT NULL, -- Primary phone number - toll_free TINYTEXT NULL, -- Toll Free phone number - url TINYTEXT NULL, -- URL with information about this member - email TINYTEXT NULL, -- Main E-Mail address for this member - logo TINYTEXT NULL, -- Member logo - cc_type INT NULL, -- Bitmap of credit card types accepted - See credit_card array in plugin.ini - video_url TINYTEXT NULL, -- Video URL - video_file TINYTEXT NULL, -- Video File Name - video_title TINYTEXT NULL, -- Video Title - video_descr TEXT NULL, -- Video Description - video_type INT NULL, -- Video Type - See plugin.ini video type table. - live_cam_url TINYTEXT NULL, -- Live Cam URL - live_cam_title TINYTEXT NULL, -- Live Cam Title - live_cam_descr TEXT NULL, -- Live Cam Description - live_cam_type INT NULL, -- Live Cam Type - See plugin.ini video type table. - notes TEXT NULL, -- General notes - Not displayed in front-end - create_time TIMESTAMP NULL, -- Create date/time - modify_time TIMESTAMP NULL, -- Last update date/time - PRIMARY KEY (id), - INDEX(status), - INDEX(city), - INDEX(zip(10)), - INDEX(lat), - INDEX(lon), - INDEX(region) -); - ----- - --- Member type - Can be used to assign members to different "classes" of membership (i.e. Full, Associate, Premium) --- Mostly for internal use by the member organization, but could be displayed - Consider a short_description if they are. -CREATE TABLE {prefix}member_type ( - id INT NOT NULL AUTO_INCREMENT, - name TINYTEXT NULL, -- Name of member type - descr TINYTEXT NULL, -- Description of member type - PRIMARY KEY (id) -); - ----- - --- Regions - Used to segment members into various geographical regions - can be cities, counties, or other logical regions -CREATE TABLE {prefix}regions ( - id INT NOT NULL AUTO_INCREMENT, - name TINYTEXT NULL, -- Name of region - descr TEXT NULL, -- Description of region - short_descr TINYTEXT NULL, -- Short description of region - PRIMARY KEY (id) -); - ----- - --- General settings available on Management page in admin - Only 1 entry in this table --- Items in this table should be all self-explanatory -CREATE TABLE {prefix}settings_general ( - id INT NOT NULL AUTO_INCREMENT, - admin_debug BOOLEAN DEFAULT '0', - admin_debug_verbose BOOLEAN DEFAULT '0', - front_debug BOOLEAN DEFAULT '0', - front_debug_verbose BOOLEAN DEFAULT '0', - google_maps_api_key TINYTEXT DEFAULT '', - maps_default_lat FLOAT DEFAULT '45.3749', - maps_default_lon FLOAT DEFAULT '-84.9592', - maps_default_zoom INTEGER DEFAULT '10', - time_zone TINYTEXT DEFAULT NULL, - canonical_member_page TINYTEXT DEFAULT NULL, - phone_infix TINYTEXT DEFAULT NULL, - default_state TINYTEXT DEFAULT NULL, - list_show_map BOOLEAN DEFAULT '1', - list_show_list BOOLEAN DEFAULT '1', - list_show_search_filters_opened BOOLEAN DEFAULT '0', - list_show_search BOOLEAN DEFAULT '1', - list_show_search_text BOOLEAN DEFAULT '1', - list_show_search_category BOOLEAN DEFAULT '1', - list_show_search_amenities BOOLEAN DEFAULT '1', - list_show_search_alpha BOOLEAN DEFAULT '1', - list_floating_search BOOLEAN DEFAULT '0', - list_floating_search_distance_top INTEGER DEFAULT '0', -- How far from the top the sticky Search/Filters box should hover - list_show_detail_link BOOLEAN DEFAULT '1', - list_show_logo BOOLEAN DEFAULT '1', - list_logo_size TINYTEXT NULL, - list_show_address BOOLEAN DEFAULT '1', - list_show_street BOOLEAN DEFAULT '1', - list_show_citystatezip BOOLEAN DEFAULT '1', - list_show_country BOOLEAN DEFAULT '1', - list_show_region BOOLEAN DEFAULT '1', - list_show_descr BOOLEAN DEFAULT '0', - list_show_short_descr BOOLEAN DEFAULT '1', - list_show_phone BOOLEAN DEFAULT '1', - list_show_tollfree BOOLEAN DEFAULT '1', - list_show_url BOOLEAN DEFAULT '1', - list_show_url_newtarget BOOLEAN DEFAULT '1', - list_show_email BOOLEAN DEFAULT '1', - list_show_categories BOOLEAN DEFAULT '0', - list_show_creditcards BOOLEAN DEFAULT '0', - list_show_amenities BOOLEAN DEFAULT '0', - list_show_logo_filler BOOLEAN DEFAULT '1', - list_map_show_opened BOOLEAN DEFAULT '0', - list_map_show_detaillink BOOLEAN DEFAULT '1', - list_map_show_logo BOOLEAN DEFAULT '0', - list_map_logo_size TINYTEXT NULL, - list_map_show_descr BOOLEAN DEFAULT '0', - list_map_show_short_descr BOOLEAN DEFAULT '1', - list_map_show_address BOOLEAN DEFAULT '1', - list_map_show_street BOOLEAN DEFAULT '1', - list_map_show_citystatezip BOOLEAN DEFAULT '1', - list_map_show_country BOOLEAN DEFAULT '1', - list_map_show_region BOOLEAN DEFAULT '1', - list_map_show_phone BOOLEAN DEFAULT '1', - list_map_show_tollfree BOOLEAN DEFAULT '1', - list_map_show_url BOOLEAN DEFAULT '1', - list_map_show_url_newtarget BOOLEAN DEFAULT '1', - list_map_show_email BOOLEAN DEFAULT '1', - list_map_show_categories BOOLEAN DEFAULT '0', - list_map_show_creditcards BOOLEAN DEFAULT '0', - list_map_show_amenities BOOLEAN DEFAULT '0', - list_show_packages BOOLEAN DEFAULT '0', - list_show_packages_link BOOLEAN DEFAULT '0', - list_header_text TINYTEXT DEFAULT NULL, - detail_show_map BOOLEAN DEFAULT '1', - detail_show_directions BOOLEAN DEFAULT '1', - detail_show_logo BOOLEAN DEFAULT '1', - detail_logo_size TINYTEXT NULL, - detail_show_descr BOOLEAN DEFAULT '1', - detail_show_short_descr BOOLEAN DEFAULT '0', - detail_show_address BOOLEAN DEFAULT '1', - detail_show_street BOOLEAN DEFAULT '1', - detail_show_citystatezip BOOLEAN DEFAULT '1', - detail_show_country BOOLEAN DEFAULT '1', - detail_show_region BOOLEAN DEFAULT '1', - detail_show_phone BOOLEAN DEFAULT '1', - detail_show_tollfree BOOLEAN DEFAULT '1', - detail_show_url BOOLEAN DEFAULT '1', - detail_show_url_newtarget BOOLEAN DEFAULT '1', - detail_show_email BOOLEAN DEFAULT '1', - detail_show_categories BOOLEAN DEFAULT '0', - detail_show_creditcards BOOLEAN DEFAULT '0', - detail_show_amenities BOOLEAN DEFAULT '1', - detail_show_imagegallery BOOLEAN DEFAULT '1', - detail_show_coupons BOOLEAN DEFAULT '0', - detail_show_packages BOOLEAN DEFAULT '0', - detail_show_events BOOLEAN DEFAULT '0', - detail_show_video BOOLEAN DEFAULT '0', - detail_show_live_cam BOOLEAN DEFAULT '0', - detail_top_offset_autoscroll INTEGER DEFAULT '0', -- Determines the distance from the top when autoscrolling to a section on member detail pages - detail_map_show_logo BOOLEAN DEFAULT '0', - detail_map_logo_size TINYTEXT NULL, - detail_map_show_descr BOOLEAN DEFAULT '0', - detail_map_show_short_descr BOOLEAN DEFAULT '1', - detail_map_show_address BOOLEAN DEFAULT '1', - detail_map_show_street BOOLEAN DEFAULT '1', - detail_map_show_citystatezip BOOLEAN DEFAULT '1', - detail_map_show_country BOOLEAN DEFAULT '1', - detail_map_show_region BOOLEAN DEFAULT '1', - detail_map_show_phone BOOLEAN DEFAULT '1', - detail_map_show_tollfree BOOLEAN DEFAULT '1', - detail_map_show_url BOOLEAN DEFAULT '1', - detail_map_show_url_newtarget BOOLEAN DEFAULT '1', - detail_map_show_email BOOLEAN DEFAULT '1', - detail_map_show_categories BOOLEAN DEFAULT '0', - detail_map_show_creditcards BOOLEAN DEFAULT '0', - detail_map_show_amenities BOOLEAN DEFAULT '0', - members_only_support_email TINYTEXT DEFAULT '', - members_only_support_phone TINYTEXT DEFAULT '', - PRIMARY KEY (id) -); - ----- - --- Set default entry -INSERT INTO {prefix}settings_general - ( id, time_zone, canonical_member_page, list_logo_size, list_map_logo_size, detail_logo_size, detail_map_logo_size ) - VALUES - ( 1, 'America/Detroit', 'member-detail', 'large', 'thumb', 'large', 'thumb' ) -; - ----- - --- Terms used in site modifiable on Management page in admin - Only 1 entry in this table --- Terms in this table should be all self-explanatory -CREATE TABLE {prefix}settings_terms ( - id INT NOT NULL AUTO_INCREMENT, - term_admin_menu_members TINYTEXT NULL, - term_admin_menu_member_list TINYTEXT NULL, - term_admin_menu_member TINYTEXT NULL, - term_admin_menu_configure TINYTEXT NULL, - term_admin_menu_settings TINYTEXT NULL, - term_admin_menu_shortcodes TINYTEXT NULL, - term_admin_menu_members_dashboard TINYTEXT NULL, - term_admin_menu_members_list TINYTEXT NULL, - term_admin_menu_members_reports TINYTEXT NULL, - term_admin_menu_member_dashboard TINYTEXT NULL, - term_admin_menu_member_info TINYTEXT NULL, - term_admin_menu_member_locations TINYTEXT NULL, - term_admin_menu_member_facilities TINYTEXT NULL, - term_admin_menu_member_attractions TINYTEXT NULL, - term_admin_menu_member_contacts TINYTEXT NULL, - term_admin_menu_configure_member_types TINYTEXT NULL, - term_admin_menu_configure_member_cats TINYTEXT NULL, - term_admin_menu_configure_accom_types TINYTEXT NULL, - term_admin_menu_configure_amenities TINYTEXT NULL, - term_admin_menu_configure_cities TINYTEXT NULL, - term_admin_menu_configure_regions TINYTEXT NULL, - term_admin_menu_settings_general TINYTEXT NULL, - term_admin_menu_settings_terms TINYTEXT NULL, - term_admin_menu_settings_development TINYTEXT NULL, - term_member TINYTEXT NULL, - term_member_cap TINYTEXT NULL, - term_member_plur TINYTEXT NULL, - term_member_plur_cap TINYTEXT NULL, - term_location TINYTEXT NULL, - term_location_cap TINYTEXT NULL, - term_location_plur TINYTEXT NULL, - term_location_plur_cap TINYTEXT NULL, - term_facility TINYTEXT NULL, - term_facility_cap TINYTEXT NULL, - term_facility_plur TINYTEXT NULL, - term_facility_plur_cap TINYTEXT NULL, - term_attraction TINYTEXT NULL, - term_attraction_cap TINYTEXT NULL, - term_attraction_plur TINYTEXT NULL, - term_attraction_plur_cap TINYTEXT NULL, - term_contact TINYTEXT NULL, - term_contact_cap TINYTEXT NULL, - term_contact_plur TINYTEXT NULL, - term_contact_plur_cap TINYTEXT NULL, - PRIMARY KEY (id) -); - ----- - --- Default terms entry -INSERT INTO {prefix}settings_terms - ( - id, - term_admin_menu_members, - term_admin_menu_member_list, - term_admin_menu_member, - term_admin_menu_configure, - term_admin_menu_settings, - term_admin_menu_shortcodes, - term_admin_menu_members_dashboard, - term_admin_menu_members_list, - term_admin_menu_members_reports, - term_admin_menu_member_dashboard, - term_admin_menu_member_info, - term_admin_menu_member_locations, - term_admin_menu_member_facilities, - term_admin_menu_member_attractions, - term_admin_menu_member_contacts, - term_admin_menu_configure_member_types, - term_admin_menu_configure_member_cats, - term_admin_menu_configure_accom_types, - term_admin_menu_configure_amenities, - term_admin_menu_configure_cities, - term_admin_menu_configure_regions, - term_admin_menu_settings_general, - term_admin_menu_settings_terms, - term_admin_menu_settings_development, - term_member, - term_member_cap, - term_member_plur, - term_member_plur_cap, - term_location, - term_location_cap, - term_location_plur, - term_location_plur_cap, - term_facility, - term_facility_cap, - term_facility_plur, - term_facility_plur_cap, - term_attraction, - term_attraction_cap, - term_attraction_plur, - term_attraction_plur_cap, - term_contact, - term_contact_cap, - term_contact_plur, - term_contact_plur_cap - ) - VALUES - ( - 1, - 'Members', - 'Member', - 'Member', - 'Configure', - 'Management', - 'Shortcodes', - 'Dashboard', - 'Member List', - 'Reports', - 'Member Dashboard', - 'Member Info', - 'Locations', - 'Facilities', - 'Attractions', - 'Contacts', - 'Member Types', - 'Member Categories', - 'Accommodation Types', - 'Amenities', - 'Cities', - 'Regions', - 'General Settings', - 'Terms & Phrases', - 'Development', - 'member', - 'Member', - 'members', - 'Members', - 'location', - 'Location', - 'locations', - 'Locations', - 'facility', - 'Facility', - 'facilities', - 'Facilities', - 'attraction', - 'Attraction', - 'attractions', - 'Attractions', - 'contact', - 'Contact', - 'contacts', - 'Contacts' - ) -; - ----- - --- Theme Settings - Only 1 entry in this table -CREATE TABLE {prefix}settings_theme ( - id INT NOT NULL AUTO_INCREMENT, - PRIMARY KEY (id) -); - ----- - --- Default Theme Settings entry -INSERT INTO {prefix}settings_theme - ( - id - ) - VALUES - ( - 1 - ) -; - diff --git a/setup/databaseScripts/create_database_V1.1.19.sql b/setup/databaseScripts/create_database_V1.1.19.sql new file mode 100644 index 00000000..86e7d14f --- /dev/null +++ b/setup/databaseScripts/create_database_V1.1.19.sql @@ -0,0 +1,557 @@ +-- Gaslight Media Members Database +-- File Created: 12/09/14 15:27:15 +-- Database Version: 1.1.18 +-- Database Creation Script +-- +-- To permit each query below to be executed separately, +-- all queries must be separated by a line with four dashes +-- +-- **** BE SURE TO ALSO UPDATE drop_database_Vxxx.sql FILE WHEN CHANGING TABLES **** +-- + +-- Amenities +CREATE TABLE {prefix}amenities ( + id INT NOT NULL AUTO_INCREMENT, + active TINYINT(1) NULL, -- Amenity is active flag + name TINYTEXT NULL, -- Name of amenity + descr TEXT NULL, -- Description of amenity + short_descr TINYTEXT NULL, -- Short description of amenity + ref_type INT NULL, -- Type of entity these amenities are associated with - see plugin.ini ref_type tables + uses_value BOOLEAN NULL, -- Flag indicating whether the amenity requires a quantity number + PRIMARY KEY (id), + INDEX(name(20)) +); + +---- + +-- Amenity Reference - Links a specific amenity to a specific entity of type ref_type +CREATE TABLE {prefix}amenity_ref ( + id INT NOT NULL AUTO_INCREMENT, + amenity INT NULL, -- Pointer to amenity in amenities table + ref_type INT NULL, -- Copy of ref_type from matching amenities table entry - to simplify searches + ref_dest INT NULL, -- Pointer to the specific entity of type ref_type + amenity_value TINYTEXT NULL, -- Quantity if amenity uses values + PRIMARY KEY (id), + INDEX(ref_type), + INDEX(ref_dest) +); + +---- + +-- groups +CREATE TABLE {prefix}amenity_groups ( + id INT NOT NULL AUTO_INCREMENT, + name TINYTEXT NULL, -- Name of the Group + PRIMARY KEY (id), + INDEX(name(20)) +); + +---- + +-- Amenity Group - Links a specific amenity to groups +CREATE TABLE {prefix}grouped_amenities ( + id INT NOT NULL AUTO_INCREMENT, + group_id INT, -- Pointer to the group + amenity_id INT, -- Pointer to the Amenity + searchable BOOLEAN DEFAULT '0', -- Flag indicating whether the amenity group will show in the search form + PRIMARY KEY (id) +); + +---- + +-- Member Cateogries - used with member information records +CREATE TABLE {prefix}categories ( + id INT NOT NULL AUTO_INCREMENT, + name TINYTEXT NULL, -- Name of this category + descr TEXT NULL, -- Description of this category + short_descr TINYTEXT NULL, -- Short description of this category + parent INT NULL, -- Pointer to parent category in this table - if there is one + PRIMARY KEY (id) +); + +---- + +-- Mapping of categories to specific member information records +CREATE TABLE {prefix}category_member_info ( + id INT NOT NULL AUTO_INCREMENT, + category INT NULL, -- Pointer to category in categories table + member_info INT NULL, -- Pointer to member information record + PRIMARY KEY (id), + CONSTRAINT {prefix}categories_fk_1 + FOREIGN KEY (category) + REFERENCES {prefix}categories (id) + ON DELETE CASCADE, + INDEX(category), + INDEX(member_info) +); + +---- + +-- Cities +CREATE TABLE {prefix}cities ( + id INT NOT NULL AUTO_INCREMENT, + name TINYTEXT NULL, -- Name of city + PRIMARY KEY (id) +); + +---- + +-- Member Click Through Stats Data - Totals of URL click-throughs - Preserved for 2 years +CREATE TABLE {prefix}clickthrough_stats ( + member INT NULL, -- ID of member + stat_type INT NULL, -- Type of stat 1 = day, 2 = week, 3 = month + stat_date DATE NULL, -- Date for which these stats are accumulated (date or first date of week or month) + clicks INT NULL, -- Number of Clicks + PRIMARY KEY (member, stat_type, stat_date), + INDEX (member), + INDEX (stat_type), + INDEX (stat_date) +); + +---- + +-- Files - Files are stored under /wp-content/uploads/glm-member-db/files/ +CREATE TABLE {prefix}files ( + id INT NOT NULL AUTO_INCREMENT, + name TINYTEXT NULL, -- Original name of the file - might be URL if copied via HTTP + status TINYINT(1) NULL, -- Display/Use status - See plugin.ini status table + file_name TINYTEXT NULL, -- Stored file name for the file + descr TEXT NULL, -- Description + position INT NULL, -- Numeric position for sequence of display + ref_type INT NULL, -- Type of entity this image is associated with + ref_dest INT NULL, -- Pointer to the specific entity of ref_type this image is associated with + PRIMARY KEY (id), + INDEX(name(20)), + INDEX(file_name(20)), + INDEX(ref_type), + INDEX(ref_dest) +); + +---- + +-- Images - Images are stored under /wp-content/uploads/glm-member-db/images/{size}/ +CREATE TABLE {prefix}images ( + id INT NOT NULL AUTO_INCREMENT, + name TINYTEXT NULL, -- Original name of the image - might be URL if copied via HTTP + status TINYINT(1) NULL, -- Display/Use status - See plugin.ini status table + selected BOOLEAN NULL, -- A single special image in the current gallery for this entity + featured BOOLEAN null, -- Image is a member of a group of featured images + file_name TINYTEXT NULL, -- Stored file name for the image + descr TEXT NULL, -- Description + caption TINYTEXT NULL, -- Caption for the image + position INT NULL, -- Numeric position for sequence of display + ref_type INT NULL, -- Type of entity this image is associated with + ref_dest INT NULL, -- Pointer to the specific entity of ref_type this image is associated with + PRIMARY KEY (id), + INDEX(name(20)), + INDEX(file_name(20)), + INDEX(ref_type), + INDEX(ref_dest) +); + +---- + +-- Primary member records - One for each member +CREATE TABLE {prefix}members ( + id INT NOT NULL AUTO_INCREMENT, + access INT NULL, -- Access type - See access table in plugin.ini + member_type INT NULL, -- Pointer to member type in member_type table + created DATE NULL, -- Date member record was created + name TINYTEXT NULL, -- Member name + member_slug TINYTEXT NULL, -- Member name slug for canonical URLs (lowercase, "-" for spaces, no punctuation) + notes TEXT NULL, -- General notes - Not displayed in front-end + old_member_id INT NULL, -- Old member ID if imported from old database + featured BOOLEAN DEFAULT '0', -- Whether the member is featured + PRIMARY KEY (id), + INDEX(name(20)), + INDEX(member_slug(20)), + INDEX(created) +); + +---- + +-- Member Detail Display Stats Data - Totals of times detail page is displayed - Preserved for 2 years +CREATE TABLE {prefix}member_detail_stats ( + member INT NULL, -- ID of member + stat_type INT NULL, -- Type of stat 1 = day, 2 = week, 3 = month + stat_date DATE NULL, -- Date for which these stats are accumulated (date or first date of week or month) + clicks INT NULL, -- Number of Clicks + PRIMARY KEY (member, stat_type, stat_date), + INDEX (member), + INDEX (stat_type), + INDEX (stat_date) +); + +---- + +-- Member information version record - May be multiples per member - Only one with status "Active" for a distinct date range +CREATE TABLE {prefix}member_info ( + id INT NOT NULL AUTO_INCREMENT, + member INT NULL, -- Pointer to member record in table members + member_name TINYTEXT NULL, -- Copy of member name from members table entry for fast reference + status INT NULL, -- Status of this member information record - See plugin.ini status table + reference_name TINYTEXT NULL, -- Reference name for this member information record - Not displayed on front-end + descr TEXT NULL, -- Description + short_descr TEXT NULL, -- Short description + addr1 TINYTEXT NULL, -- Main member location address line 1 + addr2 TINYTEXT NULL, -- Address line 2 + city INT NULL, -- Pointer to City in cities table + state TINYTEXT NULL, -- Two character state code - matches states.ini entries + country TINYTEXT NULL, -- Two character country code - matches countries.ini entries + zip TINYTEXT NULL, -- ZIP/Postal code + lat FLOAT NULL, -- Latitude of member's location + lon FLOAT NULL, -- Longitude of member's location + region INT NULL, -- Pointer to entry in regions table + phone TINYTEXT NULL, -- Primary phone number + toll_free TINYTEXT NULL, -- Toll Free phone number + url TINYTEXT NULL, -- URL with information about this member + email TINYTEXT NULL, -- Main E-Mail address for this member + logo TINYTEXT NULL, -- Member logo + cc_type INT NULL, -- Bitmap of credit card types accepted - See credit_card array in plugin.ini + video_url TINYTEXT NULL, -- Video URL + video_file TINYTEXT NULL, -- Video File Name + video_title TINYTEXT NULL, -- Video Title + video_descr TEXT NULL, -- Video Description + video_type INT NULL, -- Video Type - See plugin.ini video type table. + live_cam_url TINYTEXT NULL, -- Live Cam URL + live_cam_title TINYTEXT NULL, -- Live Cam Title + live_cam_descr TEXT NULL, -- Live Cam Description + live_cam_type INT NULL, -- Live Cam Type - See plugin.ini video type table. + notes TEXT NULL, -- General notes - Not displayed in front-end + create_time TIMESTAMP NULL, -- Create date/time + modify_time TIMESTAMP NULL, -- Last update date/time + PRIMARY KEY (id), + INDEX(status), + INDEX(city), + INDEX(zip(10)), + INDEX(lat), + INDEX(lon), + INDEX(region) +); + +---- + +-- Member type - Can be used to assign members to different "classes" of membership (i.e. Full, Associate, Premium) +-- Mostly for internal use by the member organization, but could be displayed - Consider a short_description if they are. +CREATE TABLE {prefix}member_type ( + id INT NOT NULL AUTO_INCREMENT, + name TINYTEXT NULL, -- Name of member type + descr TINYTEXT NULL, -- Description of member type + PRIMARY KEY (id) +); + +---- + +-- Regions - Used to segment members into various geographical regions - can be cities, counties, or other logical regions +CREATE TABLE {prefix}regions ( + id INT NOT NULL AUTO_INCREMENT, + name TINYTEXT NULL, -- Name of region + descr TEXT NULL, -- Description of region + short_descr TINYTEXT NULL, -- Short description of region + PRIMARY KEY (id) +); + +---- + +-- General settings available on Management page in admin - Only 1 entry in this table +-- Items in this table should be all self-explanatory +CREATE TABLE {prefix}settings_general ( + id INT NOT NULL AUTO_INCREMENT, + admin_debug BOOLEAN DEFAULT '0', + admin_debug_verbose BOOLEAN DEFAULT '0', + front_debug BOOLEAN DEFAULT '0', + front_debug_verbose BOOLEAN DEFAULT '0', + google_maps_api_key TINYTEXT DEFAULT '', + maps_default_lat FLOAT DEFAULT '45.3749', + maps_default_lon FLOAT DEFAULT '-84.9592', + maps_default_zoom INTEGER DEFAULT '10', + time_zone TINYTEXT DEFAULT NULL, + canonical_member_page TINYTEXT DEFAULT NULL, + phone_infix TINYTEXT DEFAULT NULL, + default_state TINYTEXT DEFAULT NULL, + list_show_map BOOLEAN DEFAULT '1', + list_show_list BOOLEAN DEFAULT '1', + list_show_search_filters_opened BOOLEAN DEFAULT '0', + list_show_search BOOLEAN DEFAULT '1', + list_show_search_text BOOLEAN DEFAULT '1', + list_show_search_category BOOLEAN DEFAULT '1', + list_show_search_amenities BOOLEAN DEFAULT '1', + list_show_search_alpha BOOLEAN DEFAULT '1', + list_floating_search BOOLEAN DEFAULT '0', + list_floating_search_distance_top INTEGER DEFAULT '0', -- How far from the top the sticky Search/Filters box should hover + list_show_detail_link BOOLEAN DEFAULT '1', + list_show_logo BOOLEAN DEFAULT '1', + list_logo_size TINYTEXT NULL, + list_show_address BOOLEAN DEFAULT '1', + list_show_street BOOLEAN DEFAULT '1', + list_show_citystatezip BOOLEAN DEFAULT '1', + list_show_country BOOLEAN DEFAULT '1', + list_show_region BOOLEAN DEFAULT '1', + list_show_descr BOOLEAN DEFAULT '0', + list_show_short_descr BOOLEAN DEFAULT '1', + list_show_phone BOOLEAN DEFAULT '1', + list_show_tollfree BOOLEAN DEFAULT '1', + list_show_url BOOLEAN DEFAULT '1', + list_show_url_newtarget BOOLEAN DEFAULT '1', + list_show_email BOOLEAN DEFAULT '1', + list_show_categories BOOLEAN DEFAULT '0', + list_show_creditcards BOOLEAN DEFAULT '0', + list_show_amenities BOOLEAN DEFAULT '0', + list_show_logo_filler BOOLEAN DEFAULT '1', + list_map_show_opened BOOLEAN DEFAULT '0', + list_map_show_detaillink BOOLEAN DEFAULT '1', + list_map_show_logo BOOLEAN DEFAULT '0', + list_map_logo_size TINYTEXT NULL, + list_map_show_descr BOOLEAN DEFAULT '0', + list_map_show_short_descr BOOLEAN DEFAULT '1', + list_map_show_address BOOLEAN DEFAULT '1', + list_map_show_street BOOLEAN DEFAULT '1', + list_map_show_citystatezip BOOLEAN DEFAULT '1', + list_map_show_country BOOLEAN DEFAULT '1', + list_map_show_region BOOLEAN DEFAULT '1', + list_map_show_phone BOOLEAN DEFAULT '1', + list_map_show_tollfree BOOLEAN DEFAULT '1', + list_map_show_url BOOLEAN DEFAULT '1', + list_map_show_url_newtarget BOOLEAN DEFAULT '1', + list_map_show_email BOOLEAN DEFAULT '1', + list_map_show_categories BOOLEAN DEFAULT '0', + list_map_show_creditcards BOOLEAN DEFAULT '0', + list_map_show_amenities BOOLEAN DEFAULT '0', + list_show_packages BOOLEAN DEFAULT '0', + list_show_packages_link BOOLEAN DEFAULT '0', + list_header_text TINYTEXT DEFAULT NULL, + detail_show_map BOOLEAN DEFAULT '1', + detail_show_directions BOOLEAN DEFAULT '1', + detail_show_logo BOOLEAN DEFAULT '1', + detail_logo_size TINYTEXT NULL, + detail_show_descr BOOLEAN DEFAULT '1', + detail_show_short_descr BOOLEAN DEFAULT '0', + detail_show_address BOOLEAN DEFAULT '1', + detail_show_street BOOLEAN DEFAULT '1', + detail_show_citystatezip BOOLEAN DEFAULT '1', + detail_show_country BOOLEAN DEFAULT '1', + detail_show_region BOOLEAN DEFAULT '1', + detail_show_phone BOOLEAN DEFAULT '1', + detail_show_tollfree BOOLEAN DEFAULT '1', + detail_show_url BOOLEAN DEFAULT '1', + detail_show_url_newtarget BOOLEAN DEFAULT '1', + detail_show_email BOOLEAN DEFAULT '1', + detail_show_categories BOOLEAN DEFAULT '0', + detail_show_creditcards BOOLEAN DEFAULT '0', + detail_show_amenities BOOLEAN DEFAULT '1', + detail_show_imagegallery BOOLEAN DEFAULT '1', + detail_show_coupons BOOLEAN DEFAULT '0', + detail_show_packages BOOLEAN DEFAULT '0', + detail_show_events BOOLEAN DEFAULT '0', + detail_show_video BOOLEAN DEFAULT '0', + detail_show_live_cam BOOLEAN DEFAULT '0', + detail_top_offset_autoscroll INTEGER DEFAULT '0', -- Determines the distance from the top when autoscrolling to a section on member detail pages + detail_map_show_logo BOOLEAN DEFAULT '0', + detail_map_logo_size TINYTEXT NULL, + detail_map_show_descr BOOLEAN DEFAULT '0', + detail_map_show_short_descr BOOLEAN DEFAULT '1', + detail_map_show_address BOOLEAN DEFAULT '1', + detail_map_show_street BOOLEAN DEFAULT '1', + detail_map_show_citystatezip BOOLEAN DEFAULT '1', + detail_map_show_country BOOLEAN DEFAULT '1', + detail_map_show_region BOOLEAN DEFAULT '1', + detail_map_show_phone BOOLEAN DEFAULT '1', + detail_map_show_tollfree BOOLEAN DEFAULT '1', + detail_map_show_url BOOLEAN DEFAULT '1', + detail_map_show_url_newtarget BOOLEAN DEFAULT '1', + detail_map_show_email BOOLEAN DEFAULT '1', + detail_map_show_categories BOOLEAN DEFAULT '0', + detail_map_show_creditcards BOOLEAN DEFAULT '0', + detail_map_show_amenities BOOLEAN DEFAULT '0', + members_only_support_email TINYTEXT DEFAULT '', + members_only_support_phone TINYTEXT DEFAULT '', + PRIMARY KEY (id) +); + +---- + +-- Set default entry +INSERT INTO {prefix}settings_general + ( id, time_zone, canonical_member_page, list_logo_size, list_map_logo_size, detail_logo_size, detail_map_logo_size ) + VALUES + ( 1, 'America/Detroit', 'member-detail', 'large', 'thumb', 'large', 'thumb' ) +; + +---- + +-- Terms used in site modifiable on Management page in admin - Only 1 entry in this table +-- Terms in this table should be all self-explanatory +CREATE TABLE {prefix}settings_terms ( + id INT NOT NULL AUTO_INCREMENT, + term_admin_menu_members TINYTEXT NULL, + term_admin_menu_member_list TINYTEXT NULL, + term_admin_menu_member TINYTEXT NULL, + term_admin_menu_configure TINYTEXT NULL, + term_admin_menu_settings TINYTEXT NULL, + term_admin_menu_shortcodes TINYTEXT NULL, + term_admin_menu_members_dashboard TINYTEXT NULL, + term_admin_menu_members_list TINYTEXT NULL, + term_admin_menu_members_reports TINYTEXT NULL, + term_admin_menu_member_dashboard TINYTEXT NULL, + term_admin_menu_member_info TINYTEXT NULL, + term_admin_menu_member_locations TINYTEXT NULL, + term_admin_menu_member_facilities TINYTEXT NULL, + term_admin_menu_member_attractions TINYTEXT NULL, + term_admin_menu_member_contacts TINYTEXT NULL, + term_admin_menu_configure_member_types TINYTEXT NULL, + term_admin_menu_configure_member_cats TINYTEXT NULL, + term_admin_menu_configure_accom_types TINYTEXT NULL, + term_admin_menu_configure_amenities TINYTEXT NULL, + term_admin_menu_configure_cities TINYTEXT NULL, + term_admin_menu_configure_regions TINYTEXT NULL, + term_admin_menu_settings_general TINYTEXT NULL, + term_admin_menu_settings_terms TINYTEXT NULL, + term_admin_menu_settings_development TINYTEXT NULL, + term_member TINYTEXT NULL, + term_member_cap TINYTEXT NULL, + term_member_plur TINYTEXT NULL, + term_member_plur_cap TINYTEXT NULL, + term_location TINYTEXT NULL, + term_location_cap TINYTEXT NULL, + term_location_plur TINYTEXT NULL, + term_location_plur_cap TINYTEXT NULL, + term_facility TINYTEXT NULL, + term_facility_cap TINYTEXT NULL, + term_facility_plur TINYTEXT NULL, + term_facility_plur_cap TINYTEXT NULL, + term_attraction TINYTEXT NULL, + term_attraction_cap TINYTEXT NULL, + term_attraction_plur TINYTEXT NULL, + term_attraction_plur_cap TINYTEXT NULL, + term_contact TINYTEXT NULL, + term_contact_cap TINYTEXT NULL, + term_contact_plur TINYTEXT NULL, + term_contact_plur_cap TINYTEXT NULL, + term_webcam_cap TINYTEXT NULL, + PRIMARY KEY (id) +); + +---- + +-- Default terms entry +INSERT INTO {prefix}settings_terms + ( + id, + term_admin_menu_members, + term_admin_menu_member_list, + term_admin_menu_member, + term_admin_menu_configure, + term_admin_menu_settings, + term_admin_menu_shortcodes, + term_admin_menu_members_dashboard, + term_admin_menu_members_list, + term_admin_menu_members_reports, + term_admin_menu_member_dashboard, + term_admin_menu_member_info, + term_admin_menu_member_locations, + term_admin_menu_member_facilities, + term_admin_menu_member_attractions, + term_admin_menu_member_contacts, + term_admin_menu_configure_member_types, + term_admin_menu_configure_member_cats, + term_admin_menu_configure_accom_types, + term_admin_menu_configure_amenities, + term_admin_menu_configure_cities, + term_admin_menu_configure_regions, + term_admin_menu_settings_general, + term_admin_menu_settings_terms, + term_admin_menu_settings_development, + term_member, + term_member_cap, + term_member_plur, + term_member_plur_cap, + term_location, + term_location_cap, + term_location_plur, + term_location_plur_cap, + term_facility, + term_facility_cap, + term_facility_plur, + term_facility_plur_cap, + term_attraction, + term_attraction_cap, + term_attraction_plur, + term_attraction_plur_cap, + term_contact, + term_contact_cap, + term_contact_plur, + term_contact_plur_cap, + term_webcam_cap + ) + VALUES + ( + 1, + 'Members', + 'Member', + 'Member', + 'Configure', + 'Management', + 'Shortcodes', + 'Dashboard', + 'Member List', + 'Reports', + 'Member Dashboard', + 'Member Info', + 'Locations', + 'Facilities', + 'Attractions', + 'Contacts', + 'Member Types', + 'Member Categories', + 'Accommodation Types', + 'Amenities', + 'Cities', + 'Regions', + 'General Settings', + 'Terms & Phrases', + 'Development', + 'member', + 'Member', + 'members', + 'Members', + 'location', + 'Location', + 'locations', + 'Locations', + 'facility', + 'Facility', + 'facilities', + 'Facilities', + 'attraction', + 'Attraction', + 'attractions', + 'Attractions', + 'contact', + 'Contact', + 'contacts', + 'Contacts', + 'Webcam' + ) +; + +---- + +-- Theme Settings - Only 1 entry in this table +CREATE TABLE {prefix}settings_theme ( + id INT NOT NULL AUTO_INCREMENT, + PRIMARY KEY (id) +); + +---- + +-- Default Theme Settings entry +INSERT INTO {prefix}settings_theme + ( + id + ) + VALUES + ( + 1 + ) +; + diff --git a/setup/databaseScripts/dbVersions.php b/setup/databaseScripts/dbVersions.php index befc21dd..d31121a8 100644 --- a/setup/databaseScripts/dbVersions.php +++ b/setup/databaseScripts/dbVersions.php @@ -50,6 +50,7 @@ $glmMembersDbVersions = array( '1.1.16' => array('version' => '1.1.16', 'tables' => 18, 'date' => '8/22/16'), '1.1.17' => array('version' => '1.1.17', 'tables' => 18, 'date' => '8/29/16'), '1.1.18' => array('version' => '1.1.18', 'tables' => 18, 'date' => '9/16/16'), + '1.1.19' => array('version' => '1.1.19', 'tables' => 18, 'date' => '9/20/16') ); diff --git a/setup/databaseScripts/drop_database_V1.1.18.sql b/setup/databaseScripts/drop_database_V1.1.18.sql deleted file mode 100644 index 935890b5..00000000 --- a/setup/databaseScripts/drop_database_V1.1.18.sql +++ /dev/null @@ -1,27 +0,0 @@ --- Gaslight Media Members Database --- File Created: 12/09/14 15:27:15 --- Database Version: 1.1.16 --- Database Deletion Script --- Note: Tables with DELETE CASCADE must appear before referenced table - -DROP TABLE IF EXISTS - {prefix}amenities, - {prefix}amenity_ref, - {prefix}category_member_info, - {prefix}cities, - {prefix}clickthrough_stats, - {prefix}images, - {prefix}files, - {prefix}members, - {prefix}member_detail_stats, - {prefix}member_info, - {prefix}member_type, - {prefix}regions, - {prefix}settings_general, - {prefix}settings_terms, - {prefix}settings_theme, - {prefix}categories, - {prefix}amenity_groups, - {prefix}grouped_amenities -; - diff --git a/setup/databaseScripts/drop_database_V1.1.19.sql b/setup/databaseScripts/drop_database_V1.1.19.sql new file mode 100644 index 00000000..935890b5 --- /dev/null +++ b/setup/databaseScripts/drop_database_V1.1.19.sql @@ -0,0 +1,27 @@ +-- Gaslight Media Members Database +-- File Created: 12/09/14 15:27:15 +-- Database Version: 1.1.16 +-- Database Deletion Script +-- Note: Tables with DELETE CASCADE must appear before referenced table + +DROP TABLE IF EXISTS + {prefix}amenities, + {prefix}amenity_ref, + {prefix}category_member_info, + {prefix}cities, + {prefix}clickthrough_stats, + {prefix}images, + {prefix}files, + {prefix}members, + {prefix}member_detail_stats, + {prefix}member_info, + {prefix}member_type, + {prefix}regions, + {prefix}settings_general, + {prefix}settings_terms, + {prefix}settings_theme, + {prefix}categories, + {prefix}amenity_groups, + {prefix}grouped_amenities +; + diff --git a/setup/databaseScripts/update_database_V1.1.19.sql b/setup/databaseScripts/update_database_V1.1.19.sql new file mode 100644 index 00000000..4cda599d --- /dev/null +++ b/setup/databaseScripts/update_database_V1.1.19.sql @@ -0,0 +1,14 @@ +-- Gaslight Media Members Database +-- File Created: 8/15/16 14:59:42 +-- Database Version: 1.1.18 +-- Database Update From Previous Version Script +-- +-- To permit each query below to be executed separately, +-- all queries must be separated by a line with four dashes +-- Sets which character to use to separate phone numbers + +ALTER TABLE {prefix}settings_terms ADD COLUMN term_webcam_cap TINYTEXT NULL; + +---- + +UPDATE TABLE {prefix}settings_terms SET term_webcam_cap = 'Webcam'; \ No newline at end of file diff --git a/views/admin/management/terms.html b/views/admin/management/terms.html index 01824b7a..9e6b67b9 100644 --- a/views/admin/management/terms.html +++ b/views/admin/management/terms.html @@ -377,6 +377,20 @@ + + Live Camera: + + + + + + +
Capitalized: + + {if $termSettings.fieldFail.term_webcam_cap}

{$termSettings.fieldFail.term_webcam_cap}

{/if} +
+ + diff --git a/views/admin/member/memberInfo.html b/views/admin/member/memberInfo.html index 18f409c2..a2c634df 100644 --- a/views/admin/member/memberInfo.html +++ b/views/admin/member/memberInfo.html @@ -106,615 +106,35 @@ - - - - - - - - - - - - - - - - - - - - - -
Profile Name: - - {if $memberInfo.fieldFail.reference_name}

{$memberInfo.fieldFail.reference_name}

{/if}
- The "Profile Name" field is used to help identify this particular {$terms.term_member} profile. {$terms.term_member_plur_cap} may have multiple profiles, - only one of which can be active at a time. Multiple profiles make it easy to manage separate sets of information that may be - used at different times, for example seasons of the year or for special events (i.e. "Winter Profile"). -
Profile Status: - - {if $memberInfo.fieldFail.status}

{$memberInfo.fieldFail.status}

{/if} -
Description: - {php} - wp_editor('{$memberInfo.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} - {if $memberInfo.fieldFail.descr}

{$memberInfo.fieldFail.descr}

{/if} -
Short Description: - -
- {if $memberInfo.fieldFail.short_descr}

{$memberInfo.fieldFail.short_descr}

{/if} -
Notes: - - {if $memberInfo.fieldFail.notes} -

{$memberInfo.fieldFail.notes}

{/if}
This - "Notes" field is not displayed anywhere else. It is - strictly for making and keeping notes related to this - {$terms.term_member} profile. -
+ {include file='admin/member/memberInfo/editStatus.html'} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {if $memberInfo.fieldRequired.lat} - - -
Address Line 1: - - {if $memberInfo.fieldFail.addr1}

{$memberInfo.fieldFail.addr1}

{/if} -
Address Line 2: - - {if $memberInfo.fieldFail.addr2}

{$memberInfo.fieldFail.addr2}

{/if} -
City - -
Add a new City
-
- - - - - -
City Name: - -
-
-

* Required

- Cancel - -
- - - -
State: - - {if $memberInfo.fieldFail.state}

{$memberInfo.fieldFail.state}

{/if} -
ZIP / Postal Code: - - {if $memberInfo.fieldFail.zip}

{$memberInfo.fieldFail.zip}

{/if} -
Country: - - {if $memberInfo.fieldFail.country}

{$memberInfo.fieldFail.country}

{/if} -
Region: - - {if $memberInfo.fieldFail.region}

{$memberInfo.fieldFail.region}

{/if} -
{else}{/if}Location: -
Map Location Using Above Address
-

- MAP USE: Drag the pointer to the desired location for this {$terms.term_member}. - Use + and - buttons or the mouse wheel to zoom in or out. - Click and drag anywhere else on the map to move to another area. -

-
(map loads here)
-

- Selected Position: -   Latitude -   Longitude -   Update pointer with new lat/lon postion. -

-
+ + {include file='admin/member/memberInfo/editLocation.html'} - - - - - - - - - - - - - - - - - - -
Phone #: - - {if $memberInfo.fieldFail.phone}

{$memberInfo.fieldFail.phone}

{/if} -
Toll Free #: - - {if $memberInfo.fieldFail.toll_free}

{$memberInfo.fieldFail.toll_free}

{/if} -
E-Mail Address: - - {if $memberInfo.fieldFail.email}

{$memberInfo.fieldFail.email}

{/if} -
Web Address (URL): - {if $memberInfo.fieldData.url} - Test Link - {/if} - - {if $memberInfo.fieldFail.url}

{$memberInfo.fieldFail.url}

{/if} -
+ + {include file='admin/member/memberInfo/editContact.html'} - - - - - - - - - -
Categories - - -{if apply_filters('glm_members_menu_members', true)} -
Add a new Category
-{/if} - -
- - - - - - - - - -
Category Name: - -
-
Parent Category: - -
OR
- -
-

* Required

- Cancel - -
- -{if apply_filters('glm_members_menu_members', true)} -    Select a category to add to box below.
-{else} -

You do not have permission to change your {$terms.term_member} categories. Please call if you need changes made here. -{/if} -

- - {if isset($memberInfo.fieldData.categories) && $memberInfo.fieldData.categories} - {foreach from=$memberInfo.fieldData.categories item=c} -
- {if $c.parent_name != ''}{$c.parent_name}: {/if}{$c.name} -{if apply_filters('glm_members_menu_members', true)} - X -{/if} - -
- {/foreach} - {/if} -
-
Amenities - -    Select an amenity to add to box below.
-
- {if isset($memberInfo.fieldData.amenities) && $memberInfo.fieldData.amenities} - {foreach from=$memberInfo.fieldData.amenities item=c} -
- {$c.name} - X - -
- {/foreach} - {/if} -
-
- + {include file='admin/member/memberInfo/editCategory.html'} - - - - - - - - - - - - - -
  -

- Best image size to provide is between 800 and 1000 pixels wide and stored as a JPG or JPEG file. - Also try to supply images that have a reasonable "aspect ratio" (not too tall, not too wide). - Files provided like this should have a file size of 100 to 250 KB. Images will be automatically - resized for use in the Web site. Images that are too large will be rejected. -

-
Profile Image: - - {if $memberInfo.fieldData.logo} - - - - - {/if} - -
-
- -
- 		- Delete Image
- {$memberInfo.fieldData.logo}
-
New image:
- - {if $memberInfo.fieldFail.logo}

{$memberInfo.fieldFail.logo}

{/if} -
Image Gallery - - {if $memberInfoID} - -
- -
- -
- - - Uploading Image { thisFile } of { numbFiles } - - - - - - - - - - - -
-
- -
-
Cancel Upload
Name: { fileName }
Type: { fileType }
Size: { fileSize }
Progress:
- - -
- -
- - -
  • -
    - - - - - - - - - - -
    Caption: - - - - -
    Delete:
    featured Image:
    New Upload
    -
    Description:
    -
    -
    - -
    -
    • -
    - -
    - - -
    -
    -
    -
    Drag and drop new images here
    -
    HTML5 file drag-and-drop not supported by your browser.
    Use "Browse" button above to upload an image.
    -
    -
    No Featured Image:
     
    -
    Click images to view full size.
    -
      - - {if $haveImageGallery} - {foreach $imageGallery as $i} - {if $i.file_name} -
    • -
      - - - - - - - - - - - -
      Caption: - - - -
      Delete:
      Featured Image:
      - -
      Description: -
      -
      -
      - -
      -
      - {/if} -
      • - - {/foreach} - {/if} -
    - {else} - Note: Images may only be added to {$terms.term_member} profile records that have been created. - You are editing information to create a new record. -
    After you click "Add new {$terms.term_member}" below, you may come back here to add images to the gallery. - {/if} -
    + {include file='admin/member/memberInfo/editImages.html'} - - - - - - - - - - - - - - - - - - - - - -
    Video Type: - - {if $memberInfo.fieldFail.video_type}

    {$memberInfo.fieldFail.video_type}

    {/if} -
    Video URL: - - {if $memberInfo.fieldFail.video_url}

    {$memberInfo.fieldFail.video_url}

    {/if} - Only YouTube and Vimeo links are supported -
    Video File: - {if $memberInfo.fieldData.video_file} - File Name: {$memberInfo.fieldData.video_file}
    - Replace this video file: - Delete Video File
    - {else} - New file: - {/if} -
    Video Title: - - {if $memberInfo.fieldFail.video_title}

    {$memberInfo.fieldFail.video_title}

    {/if}
    - -
    Video Description: - {php} - wp_editor('{$memberInfo.fieldData.video_descr|escape:quotes}', 'glm_video_descr', array( - 'media_buttons' => false, - // 'quicktags' => false, - // 'wpautop' => false, NOTE: Dont's use. Problem when numerous spaces before text. - 'textarea_name' => 'video_descr', - 'editor_height' => 200, // Height in px, overrides editor_rows - // 'textarea_rows' => 8 - )); - {/php} - {if $memberInfo.fieldFail.video_descr}

    {$memberInfo.fieldFail.video_descr}

    {/if} -
    + {include file='admin/member/memberInfo/editVideo.html'} - - - - - - - - - - - - - - - - - -
    Source Type: - - {if $memberInfo.fieldFail.live_cam_type}

    {$memberInfo.fieldFail.live_cam_type}

    {/if} -
    Source URL: - - {if $memberInfo.fieldFail.live_cam_url}

    {$memberInfo.fieldFail.live_cam_url}

    {/if} - Only image links are supported -
    Title to Display: - - {if $memberInfo.fieldFail.live_cam_title}

    {$memberInfo.fieldFail.live_cam_title}

    {/if}
    - -
    Description to Display: - {php} - wp_editor('{$memberInfo.fieldData.live_cam_descr|escape:quotes}', 'glm_live_cam_descr', array( - 'media_buttons' => false, - // 'quicktags' => false, - // 'wpautop' => false, NOTE: Dont's use. Problem when numerous spaces before text. - 'textarea_name' => 'live_cam_descr', - 'editor_height' => 200, // Height in px, overrides editor_rows - // 'textarea_rows' => 8 - )); - {/php} - {if $memberInfo.fieldFail.live_cam_descr}

    {$memberInfo.fieldFail.live_cam_descr}

    {/if} -
    + {include file='admin/member/memberInfo/editCamera.html'} - - - - - -
    Credit Cards Accepted: - {foreach from=$memberInfo.fieldData.cc_type.bitmap item=v} - {$v.name}
    - {/foreach} - {if $memberInfo.fieldFail.cc_type}

    {$memberInfo.fieldFail.cc_type}

    {/if} -
    - -

    * Required

    - + {include file='admin/member/memberInfo/editCreditCards.html'} @@ -1312,7 +732,20 @@ // Set masking for phone number fields - see http://digitalbush.com/projects/masked-input-plugin/ $.mask.definitions['e'] = "[A-Za-z0-9: ]"; $(".glm-phone-input").mask("999{$settings.phone_infix}999{$settings.phone_infix}9999? eeeeeeeeeee"); - + + $('#glm-live-cam-type').on("change", function() { + checkLiveCamType(); + }); + function checkLiveCamType() { + var camType = $('#glm-live-cam-type').val(); + if (camType == 1) { + $('.not-with-url-type').addClass('glm-hidden'); + } else { + $('.not-with-url-type').removeClass('glm-hidden'); + } + } + checkLiveCamType(); + }); diff --git a/views/admin/member/memberInfo/editCamera.html b/views/admin/member/memberInfo/editCamera.html new file mode 100644 index 00000000..02c50e35 --- /dev/null +++ b/views/admin/member/memberInfo/editCamera.html @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + +
    Type: + + {if $memberInfo.fieldFail.live_cam_type}

    {$memberInfo.fieldFail.live_cam_type}

    {/if} +
    URL: + + {if $memberInfo.fieldFail.live_cam_url}

    {$memberInfo.fieldFail.live_cam_url}

    {/if} +
    Title to Display: + + {if $memberInfo.fieldFail.live_cam_title}

    {$memberInfo.fieldFail.live_cam_title}

    {/if}
    + +
    Description to Display: + {php} + wp_editor('{$memberInfo.fieldData.live_cam_descr|escape:quotes}', 'glm_live_cam_descr', array( + 'media_buttons' => false, + // 'quicktags' => false, + // 'wpautop' => false, NOTE: Dont's use. Problem when numerous spaces before text. + 'textarea_name' => 'live_cam_descr', + 'editor_height' => 200, // Height in px, overrides editor_rows + // 'textarea_rows' => 8 + )); + {/php} + {if $memberInfo.fieldFail.live_cam_descr}

    {$memberInfo.fieldFail.live_cam_descr}

    {/if} +
    diff --git a/views/admin/member/memberInfo/editCategory.html b/views/admin/member/memberInfo/editCategory.html new file mode 100644 index 00000000..74e59788 --- /dev/null +++ b/views/admin/member/memberInfo/editCategory.html @@ -0,0 +1,106 @@ + + + + + + + + + + +
    Categories + + +{if apply_filters('glm_members_menu_members', true)} +
    Add a new Category
    +{/if} + +
    + + + + + + + + + +
    Category Name: + +
    +
    Parent Category: + +
    OR
    + +
    +

    * Required

    + Cancel + +
    + +{if apply_filters('glm_members_menu_members', true)} +    Select a category to add to box below.
    +{else} +

    You do not have permission to change your {$terms.term_member} categories. Please call if you need changes made here. +{/if} +

    + + {if isset($memberInfo.fieldData.categories) && $memberInfo.fieldData.categories} + {foreach from=$memberInfo.fieldData.categories item=c} +
    + {if $c.parent_name != ''}{$c.parent_name}: {/if}{$c.name} +{if apply_filters('glm_members_menu_members', true)} + X +{/if} + +
    + {/foreach} + {/if} +
    +
    Amenities + +    Select an amenity to add to box below.
    +
    + {if isset($memberInfo.fieldData.amenities) && $memberInfo.fieldData.amenities} + {foreach from=$memberInfo.fieldData.amenities item=c} +
    + {$c.name} + X + +
    + {/foreach} + {/if} +
    +
    + diff --git a/views/admin/member/memberInfo/editContact.html b/views/admin/member/memberInfo/editContact.html new file mode 100644 index 00000000..f23c4f11 --- /dev/null +++ b/views/admin/member/memberInfo/editContact.html @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + + +
    Phone #: + + {if $memberInfo.fieldFail.phone}

    {$memberInfo.fieldFail.phone}

    {/if} +
    Toll Free #: + + {if $memberInfo.fieldFail.toll_free}

    {$memberInfo.fieldFail.toll_free}

    {/if} +
    E-Mail Address: + + {if $memberInfo.fieldFail.email}

    {$memberInfo.fieldFail.email}

    {/if} +
    Web Address (URL): + {if $memberInfo.fieldData.url} + Test Link + {/if} + + {if $memberInfo.fieldFail.url}

    {$memberInfo.fieldFail.url}

    {/if} +
    + diff --git a/views/admin/member/memberInfo/editCreditCards.html b/views/admin/member/memberInfo/editCreditCards.html new file mode 100644 index 00000000..e587ae7f --- /dev/null +++ b/views/admin/member/memberInfo/editCreditCards.html @@ -0,0 +1,15 @@ + + + + + + +
    Credit Cards Accepted: + {foreach from=$memberInfo.fieldData.cc_type.bitmap item=v} + {$v.name}
    + {/foreach} + {if $memberInfo.fieldFail.cc_type}

    {$memberInfo.fieldFail.cc_type}

    {/if} +
    + +

    * Required

    + diff --git a/views/admin/member/memberInfo/editImages.html b/views/admin/member/memberInfo/editImages.html new file mode 100644 index 00000000..a75c16f7 --- /dev/null +++ b/views/admin/member/memberInfo/editImages.html @@ -0,0 +1,166 @@ + + + + + + + + + + + + + + +
      +

    + Best image size to provide is between 800 and 1000 pixels wide and stored as a JPG or JPEG file. + Also try to supply images that have a reasonable "aspect ratio" (not too tall, not too wide). + Files provided like this should have a file size of 100 to 250 KB. Images will be automatically + resized for use in the Web site. Images that are too large will be rejected. +

    +
    Profile Image: + + {if $memberInfo.fieldData.logo} + + + + + {/if} + +
    +
    + +
    +     		+ Delete Image
    + {$memberInfo.fieldData.logo}
    +
    New image:
    + + {if $memberInfo.fieldFail.logo}

    {$memberInfo.fieldFail.logo}

    {/if} +
    Image Gallery + + {if $memberInfoID} + +
    + +
    + +
    + + + Uploading Image { thisFile } of { numbFiles } + + + + + + + + + + + +
    +
    + +
    +
    Cancel Upload
    		Name: { fileName }
    Type: { fileType }
    Size: { fileSize }
    Progress:
    + + +
    + +
    + + +
  • +
    + + + + + + + + + + +
    Caption: + + + + +
    Delete:
    featured Image:
    New Upload
    +
    Description:
    +
    +
    + +
    +
    • +
    + +
    + + +
    +
    +
    +
    Drag and drop new images here
    +
    HTML5 file drag-and-drop not supported by your browser.
    Use "Browse" button above to upload an image.
    +
    +
    No Featured Image:
     
    +
    Click images to view full size.
    +
      + + {if $haveImageGallery} + {foreach $imageGallery as $i} + {if $i.file_name} +
    • +
      + + + + + + + + + + + +
      Caption: + + + +
      Delete:
      Featured Image:
      + +
      Description: +
      +
      +
      + +
      +
      + {/if} +
      • + + {/foreach} + {/if} +
    + {else} + Note: Images may only be added to {$terms.term_member} profile records that have been created. + You are editing information to create a new record. +
    After you click "Add new {$terms.term_member}" below, you may come back here to add images to the gallery. + {/if} +
    diff --git a/views/admin/member/memberInfo/editLocation.html b/views/admin/member/memberInfo/editLocation.html new file mode 100644 index 00000000..ff99a74b --- /dev/null +++ b/views/admin/member/memberInfo/editLocation.html @@ -0,0 +1,110 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {if $memberInfo.fieldRequired.lat} + + +
    Address Line 1: + + {if $memberInfo.fieldFail.addr1}

    {$memberInfo.fieldFail.addr1}

    {/if} +
    Address Line 2: + + {if $memberInfo.fieldFail.addr2}

    {$memberInfo.fieldFail.addr2}

    {/if} +
    City + +
    Add a new City
    +
    + + + + + +
    City Name: + +
    +
    +

    * Required

    + Cancel + +
    + + + +
    State: + + {if $memberInfo.fieldFail.state}

    {$memberInfo.fieldFail.state}

    {/if} +
    ZIP / Postal Code: + + {if $memberInfo.fieldFail.zip}

    {$memberInfo.fieldFail.zip}

    {/if} +
    Country: + + {if $memberInfo.fieldFail.country}

    {$memberInfo.fieldFail.country}

    {/if} +
    Region: + + {if $memberInfo.fieldFail.region}

    {$memberInfo.fieldFail.region}

    {/if} +
    {else}{/if}Location: +
    Map Location Using Above Address
    +

    + MAP USE: Drag the pointer to the desired location for this {$terms.term_member}. + Use + and - buttons or the mouse wheel to zoom in or out. + Click and drag anywhere else on the map to move to another area. +

    +
    (map loads here)
    +

    + Selected Position: +   Latitude +   Longitude +   Update pointer with new lat/lon postion. +

    +
    diff --git a/views/admin/member/memberInfo/editStatus.html b/views/admin/member/memberInfo/editStatus.html new file mode 100644 index 00000000..d72bd460 --- /dev/null +++ b/views/admin/member/memberInfo/editStatus.html @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + +
    Profile Name: + + {if $memberInfo.fieldFail.reference_name}

    {$memberInfo.fieldFail.reference_name}

    {/if}
    + The "Profile Name" field is used to help identify this particular {$terms.term_member} profile. {$terms.term_member_plur_cap} may have multiple profiles, + only one of which can be active at a time. Multiple profiles make it easy to manage separate sets of information that may be + used at different times, for example seasons of the year or for special events (i.e. "Winter Profile"). +
    Profile Status: + + {if $memberInfo.fieldFail.status}

    {$memberInfo.fieldFail.status}

    {/if} +
    Description: + {php} + wp_editor('{$memberInfo.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} + {if $memberInfo.fieldFail.descr}

    {$memberInfo.fieldFail.descr}

    {/if} +
    Short Description: + +
    + {if $memberInfo.fieldFail.short_descr}

    {$memberInfo.fieldFail.short_descr}

    {/if} +
    Notes: + + {if $memberInfo.fieldFail.notes} +

    {$memberInfo.fieldFail.notes}

    {/if}
    This + "Notes" field is not displayed anywhere else. It is + strictly for making and keeping notes related to this + {$terms.term_member} profile. +
    + diff --git a/views/admin/member/memberInfo/editVideo.html b/views/admin/member/memberInfo/editVideo.html new file mode 100644 index 00000000..301171a6 --- /dev/null +++ b/views/admin/member/memberInfo/editVideo.html @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + + + + +
    Video Type: + + {if $memberInfo.fieldFail.video_type}

    {$memberInfo.fieldFail.video_type}

    {/if} +
    Video URL: + + {if $memberInfo.fieldFail.video_url}

    {$memberInfo.fieldFail.video_url}

    {/if} + Only YouTube and Vimeo links are supported +
    Video File: + {if $memberInfo.fieldData.video_file} + File Name: {$memberInfo.fieldData.video_file}
    + Replace this video file: + Delete Video File
    + {else} + New file: + {/if} +
    Video Title: + + {if $memberInfo.fieldFail.video_title}

    {$memberInfo.fieldFail.video_title}

    {/if}
    + +
    Video Description: + {php} + wp_editor('{$memberInfo.fieldData.video_descr|escape:quotes}', 'glm_video_descr', array( + 'media_buttons' => false, + // 'quicktags' => false, + // 'wpautop' => false, NOTE: Dont's use. Problem when numerous spaces before text. + 'textarea_name' => 'video_descr', + 'editor_height' => 200, // Height in px, overrides editor_rows + // 'textarea_rows' => 8 + )); + {/php} + {if $memberInfo.fieldFail.video_descr}

    {$memberInfo.fieldFail.video_descr}

    {/if} +
    diff --git a/views/front/members/detail.html b/views/front/members/detail.html index 6eedd8e2..abfe3188 100644 --- a/views/front/members/detail.html +++ b/views/front/members/detail.html @@ -117,6 +117,7 @@ {apply_filters('glm-member-db-front-members-detail-linksTop', '', $member.id)} {if $member.email && $settings.detail_show_email}Email{/if} {if $settings.detail_show_coupons && $coupons}Coupons{/if} + {if $member.live_cam_type.value==1 && $member.live_cam_url && $settings.detail_show_live_cam}{$terms.term_webcam_cap}{/if} {apply_filters('glm-member-db-front-members-detail-linksBottom', '', $member.id)} @@ -290,14 +291,16 @@ {/if} {apply_filters('glm-member-db-front-members-detail-videoAfter', '', $member.id)} - + {apply_filters('glm-member-db-front-members-detail-liveCamBefore', '', $member.id)} - {if $member.live_cam_url && $settings.detail_show_live_cam} -
    Live Cam
    + {if $member.live_cam_type.value!=1 && $member.live_cam_url && $settings.detail_show_live_cam} +
    {$terms.term_webcam_cap}

    {$member.live_cam_title}

    -
    {$member.live_cam_embed}
    + {if $member.live_cam_type.value == 2} + + {/if}

    {$member.live_cam_descr}

    diff --git a/views/front/members/list.html b/views/front/members/list.html index 72ff1a60..bf1ab8c5 100644 --- a/views/front/members/list.html +++ b/views/front/members/list.html @@ -147,6 +147,9 @@ {$packageLink = apply_filters('glm-member-db-front-members-list-linksBottom', '', $m.member_pointer)} {if $packageLink}
  • {$packageLink}
    • {/if} + {if $m.live_cam_type.value == 1} +
  • {$terms.term_webcam_cap}
    • + {/if}
  • View More
    • {apply_filters('glm-member-db-front-members-list-memberBelow', '', $m.member_pointer)} @@ -283,6 +286,9 @@ {apply_filters('glm-member-db-front-members-list-memberLinksTop', '', $m.member_pointer)} {if $m.url && $settings.list_show_url}Visit Website{/if} {if $m.email && $settings.list_show_email}Email{/if} + {if $m.live_cam_type.value == 1} + {$terms.term_webcam_cap} + {/if} {apply_filters('glm-member-db-front-members-list-linksBottom', '', $m.member_pointer)}