Changeset 3087273
- Timestamp:
- 05/15/2024 03:58:52 PM (23 months ago)
- Location:
- groups-for-membermouse
- Files:
-
- 16 edited
- 1 copied
-
tags/2.3.5 (copied) (copied from groups-for-membermouse/trunk)
-
tags/2.3.5/groups-for-membermouse.php (modified) (2 diffs)
-
tags/2.3.5/includes/change_group_cost.php (modified) (1 diff)
-
tags/2.3.5/includes/class.shortcodes.php (modified) (6 diffs)
-
tags/2.3.5/includes/config.php (modified) (2 diffs)
-
tags/2.3.5/includes/create_group.php (modified) (2 diffs)
-
tags/2.3.5/includes/manage_groups.php (modified) (2 diffs)
-
tags/2.3.5/includes/manage_groups_admin.php (modified) (2 diffs)
-
tags/2.3.5/readme.txt (modified) (2 diffs)
-
trunk/groups-for-membermouse.php (modified) (2 diffs)
-
trunk/includes/change_group_cost.php (modified) (1 diff)
-
trunk/includes/class.shortcodes.php (modified) (6 diffs)
-
trunk/includes/config.php (modified) (2 diffs)
-
trunk/includes/create_group.php (modified) (2 diffs)
-
trunk/includes/manage_groups.php (modified) (2 diffs)
-
trunk/includes/manage_groups_admin.php (modified) (2 diffs)
-
trunk/readme.txt (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
groups-for-membermouse/tags/2.3.5/groups-for-membermouse.php
r3012189 r3087273 4 4 * Plugin Name: Groups for MemberMouse 5 5 * Description: Adds group support to MemberMouse. You can define different types of groups allowing a single customer to pay for multiple seats and members to join existing groups for free or for a price based on how you configure the group type. <strong>Requires MemberMouse to activate and use.</strong> 6 * Version: 2.3. 46 * Version: 2.3.5 7 7 * Author: Mintun Media 8 8 * Plugin URI: https://www.mintunmedia.com … … 20 20 21 21 define('MGROUP_TESTING', false); 22 23 global $wpdb; 24 $useLegacyDB = get_option("mm-option-use-legacy-db", null); // checking for custom option that's set in MM ^3.0. Allowing for logic to set the appropriate DB prefix 25 define('MGROUPS_PREFIX', $useLegacyDB === null || $useLegacyDB == 1 ? '' : $wpdb->prefix); 22 26 23 27 /** -
groups-for-membermouse/tags/2.3.5/includes/change_group_cost.php
r2856767 r3087273 22 22 23 23 $costVal = 0; 24 $productSql = "SELECT lp.product_id AS product_id,p.id AS id,p.name AS name FROM mm_membership_level_products AS lp LEFT JOINmm_products AS p ON lp.product_id = p.id WHERE lp.membership_id ='".$levelId."' ORDER BY p.name ASC";24 $productSql = "SELECT lp.product_id AS product_id,p.id AS id,p.name AS name FROM ". MGROUPS_PREFIX ."mm_membership_level_products AS lp LEFT JOIN ". MGROUPS_PREFIX ."mm_products AS p ON lp.product_id = p.id WHERE lp.membership_id ='".$levelId."' ORDER BY p.name ASC"; 25 25 $productResults = $wpdb -> get_results($productSql); 26 26 echo '<td>'; -
groups-for-membermouse/tags/2.3.5/includes/class.shortcodes.php
r2857907 r3087273 149 149 <?php if ($status_type != 'inactive') { 150 150 echo $edit_group_name_link; 151 151 152 152 if ($signup_link_control != 'hide') { 153 153 echo $signup_link_content; … … 159 159 </div> 160 160 161 <!-- TODO create a JS action that refreshes the page & changes the query param for 'search'. -->161 <!-- TODO create a JS action that refreshes the page & changes the query param for 'search'. --> 162 162 <div class="search-input-container"> 163 163 <input type="text" id="members-search-input<? echo '-'.$count ?>" placeholder="Search Members by Email or Name" aria-placeholder="Search Members by Email or Name" value="<?php if($count == $countID) { echo $search; } ?>"> … … 176 176 $userResult = $wpdb->get_row($userSql); 177 177 $registered = $userResult->user_registered; 178 $memSql = "SELECT * FROM mm_user_data WHERE wp_user_id = '" . $gMemRes->member_id . "'";178 $memSql = "SELECT * FROM ". MGROUPS_PREFIX ."mm_user_data WHERE wp_user_id = '" . $gMemRes->member_id . "'"; 179 179 $memResult = $wpdb->get_row($memSql); 180 180 $firstName = $memResult->first_name; … … 183 183 $phone = empty($memResult->phone) ? "—" : $memResult->phone; 184 184 $membershipId = $memResult->membership_level_id; 185 $levelSql = "SELECT name FROM mm_membership_levels WHERE id = '" . $membershipId . "'";185 $levelSql = "SELECT name FROM ". MGROUPS_PREFIX ."mm_membership_levels WHERE id = '" . $membershipId . "'"; 186 186 $levelResult = $wpdb->get_row($levelSql); 187 187 $redirecturl = ""; … … 255 255 <div class="member-count"> 256 256 <p> 257 <? echo ($status_type == 'inactive') ? 'Deactivated Members: ' : 'Members: ';258 echo sizeof($filteredData);259 if($status_type != 'inactive') { echo '/'. $group_size; } ?>257 <? echo ($status_type == 'inactive') ? 'Deactivated Members: ' : 'Members: '; 258 echo sizeof($filteredData); 259 if($status_type != 'inactive') { echo '/'. $group_size; } ?> 260 260 </p> 261 261 </div> … … 487 487 $userResult = $wpdb->get_row($userSql); 488 488 $registered = $userResult->user_registered; 489 $memSql = "SELECT * FROM mm_user_data WHERE wp_user_id = '" . $gMemRes->member_id . "'";489 $memSql = "SELECT * FROM ". MGROUPS_PREFIX ."mm_user_data WHERE wp_user_id = '" . $gMemRes->member_id . "'"; 490 490 $memResult = $wpdb->get_row($memSql); 491 491 $firstName = $memResult->first_name; -
groups-for-membermouse/tags/2.3.5/includes/config.php
r2856767 r3087273 98 98 <tbody> 99 99 <?php foreach($results as $res): 100 $leadermemSql = "SELECT name FROM mm_membership_levels WHERE id = '".$res -> leader_memlevel."'";100 $leadermemSql = "SELECT name FROM ". MGROUPS_PREFIX ."mm_membership_levels WHERE id = '".$res -> leader_memlevel."'"; 101 101 $leadermemResult = $wpdb -> get_row($leadermemSql); 102 102 $leaderCost = ""; 103 103 if(!empty($res -> group_leader_cost)): 104 $leaderSql = "SELECT name FROM mm_products WHERE id = '".$res -> group_leader_cost."'";104 $leaderSql = "SELECT name FROM ". MGROUPS_PREFIX ."mm_products WHERE id = '".$res -> group_leader_cost."'"; 105 105 $leaderResult = $wpdb -> get_row($leaderSql); 106 106 $leaderCost = $leaderResult -> name; 107 107 endif; 108 108 109 $membermemSql = "SELECT name FROM mm_membership_levels WHERE id = '".$res -> member_memlevel."'";109 $membermemSql = "SELECT name FROM ". MGROUPS_PREFIX ."mm_membership_levels WHERE id = '".$res -> member_memlevel."'"; 110 110 $membermemResult = $wpdb -> get_row($membermemSql); 111 111 $memberCost = ""; 112 112 if(!empty($res -> group_member_cost)): 113 $memberSql = "SELECT name FROM mm_products WHERE id = '".$res -> group_member_cost."'";113 $memberSql = "SELECT name FROM ". MGROUPS_PREFIX ."mm_products WHERE id = '".$res -> group_member_cost."'"; 114 114 $memberResult = $wpdb -> get_row($memberSql); 115 115 $memberCost = $memberResult -> name; … … 153 153 <h3>Notices</h3> 154 154 <table class="widefat" id="mm-data-grid"> 155 <thead>155 <thead> 156 156 <tr> 157 157 <th>Name</th> -
groups-for-membermouse/tags/2.3.5/includes/create_group.php
r2856767 r3087273 33 33 endif; 34 34 endif; 35 $leaderSql = "SELECT lp.product_id AS product_id,p.id AS id,p.name AS name FROM mm_membership_level_products AS lp LEFT JOINmm_products AS p ON lp.product_id = p.id WHERE lp.membership_id ='".$leader_memlevel."' ORDER BY p.name ASC";35 $leaderSql = "SELECT lp.product_id AS product_id,p.id AS id,p.name AS name FROM ". MGROUPS_PREFIX ."mm_membership_level_products AS lp LEFT JOIN ". MGROUPS_PREFIX ."mm_products AS p ON lp.product_id = p.id WHERE lp.membership_id ='".$leader_memlevel."' ORDER BY p.name ASC"; 36 36 $leaderResults = $wpdb -> get_results($leaderSql); 37 37 38 $memberSql = "SELECT lp.product_id AS product_id,p.id AS id,p.name AS name FROM mm_membership_level_products AS lp LEFT JOINmm_products AS p ON lp.product_id = p.id WHERE lp.membership_id ='".$member_memlevel."' ORDER BY p.name ASC";38 $memberSql = "SELECT lp.product_id AS product_id,p.id AS id,p.name AS name FROM ". MGROUPS_PREFIX ."mm_membership_level_products AS lp LEFT JOIN ". MGROUPS_PREFIX ."mm_products AS p ON lp.product_id = p.id WHERE lp.membership_id ='".$member_memlevel."' ORDER BY p.name ASC"; 39 39 $memberResults = $wpdb -> get_results($memberSql); 40 40 ?> … … 77 77 <i class="fa fa-circle-o-notch fa-spin fa-2x" aria-hidden="true"></i> 78 78 </div> 79 80 79 </div> 81 80 <div class="groupError" id="leadermemlevelErr"></div> -
groups-for-membermouse/tags/2.3.5/includes/manage_groups.php
r2856767 r3087273 126 126 $userResult = $wpdb->get_row($userSql); 127 127 $registered = $userResult->user_registered; 128 $memSql = "SELECT * FROM mm_user_data WHERE wp_user_id = '" . $gMemRes->member_id . "'";128 $memSql = "SELECT * FROM ". MGROUPS_PREFIX ."mm_user_data WHERE wp_user_id = '" . $gMemRes->member_id . "'"; 129 129 $memResult = $wpdb->get_row($memSql); 130 130 $firstName = $memResult->first_name; … … 134 134 $statusId = $memResult->status; 135 135 $membershipId = $memResult->membership_level_id; 136 $levelSql = "SELECT name FROM mm_membership_levels WHERE id = '" . $membershipId . "'";136 $levelSql = "SELECT name FROM ". MGROUPS_PREFIX ."mm_membership_levels WHERE id = '" . $membershipId . "'"; 137 137 $levelResult = $wpdb->get_row($levelSql); 138 138 $membershipName = $levelResult->name; -
groups-for-membermouse/tags/2.3.5/includes/manage_groups_admin.php
r2856767 r3087273 157 157 $userResult = $wpdb->get_row($userSql); 158 158 $registered = $userResult->user_registered; 159 $memSql = "SELECT * FROM mm_user_data WHERE wp_user_id = '" . $gMemRes->member_id . "'";159 $memSql = "SELECT * FROM ". MGROUPS_PREFIX ."mm_user_data WHERE wp_user_id = '" . $gMemRes->member_id . "'"; 160 160 $memResult = $wpdb->get_row($memSql); 161 161 $firstName = $memResult->first_name; … … 163 163 $email = $userResult->user_email; 164 164 $membershipId = $memResult->membership_level_id; 165 $levelSql = "SELECT name FROM mm_membership_levels WHERE id = '" . $membershipId . "'";165 $levelSql = "SELECT name FROM ". MGROUPS_PREFIX ."mm_membership_levels WHERE id = '" . $membershipId . "'"; 166 166 $levelResult = $wpdb->get_row($levelSql); 167 167 $membershipName = $levelResult->name; -
groups-for-membermouse/tags/2.3.5/readme.txt
r2867087 r3087273 3 3 Tags: membermouse, member management, membership site, groups, mm groups, groups for membermouse, membermouse groups 4 4 Requires at least: 4.8 5 Tested up to: 5.95 Tested up to: 6.5.3 6 6 Requires PHP: 5.6 7 7 Stable tag: trunk … … 70 70 == Changelog == 71 71 72 2.3.5 73 - BUG FIX: There was a compatibility bug when using Membermouse 3.0 and up due to their database changes. This bug has been fixed and backwards compatibility and support has been added to prevent issues if running a membermouse version prior to 3.0 and up. 74 72 75 2.3.2 73 76 - BUG FIX: Fixed a PHP8 compatibility issue causing issues when creating a group leader -
groups-for-membermouse/trunk/groups-for-membermouse.php
r3012189 r3087273 4 4 * Plugin Name: Groups for MemberMouse 5 5 * Description: Adds group support to MemberMouse. You can define different types of groups allowing a single customer to pay for multiple seats and members to join existing groups for free or for a price based on how you configure the group type. <strong>Requires MemberMouse to activate and use.</strong> 6 * Version: 2.3. 46 * Version: 2.3.5 7 7 * Author: Mintun Media 8 8 * Plugin URI: https://www.mintunmedia.com … … 20 20 21 21 define('MGROUP_TESTING', false); 22 23 global $wpdb; 24 $useLegacyDB = get_option("mm-option-use-legacy-db", null); // checking for custom option that's set in MM ^3.0. Allowing for logic to set the appropriate DB prefix 25 define('MGROUPS_PREFIX', $useLegacyDB === null || $useLegacyDB == 1 ? '' : $wpdb->prefix); 22 26 23 27 /** -
groups-for-membermouse/trunk/includes/change_group_cost.php
r2856767 r3087273 22 22 23 23 $costVal = 0; 24 $productSql = "SELECT lp.product_id AS product_id,p.id AS id,p.name AS name FROM mm_membership_level_products AS lp LEFT JOINmm_products AS p ON lp.product_id = p.id WHERE lp.membership_id ='".$levelId."' ORDER BY p.name ASC";24 $productSql = "SELECT lp.product_id AS product_id,p.id AS id,p.name AS name FROM ". MGROUPS_PREFIX ."mm_membership_level_products AS lp LEFT JOIN ". MGROUPS_PREFIX ."mm_products AS p ON lp.product_id = p.id WHERE lp.membership_id ='".$levelId."' ORDER BY p.name ASC"; 25 25 $productResults = $wpdb -> get_results($productSql); 26 26 echo '<td>'; -
groups-for-membermouse/trunk/includes/class.shortcodes.php
r2857907 r3087273 149 149 <?php if ($status_type != 'inactive') { 150 150 echo $edit_group_name_link; 151 151 152 152 if ($signup_link_control != 'hide') { 153 153 echo $signup_link_content; … … 159 159 </div> 160 160 161 <!-- TODO create a JS action that refreshes the page & changes the query param for 'search'. -->161 <!-- TODO create a JS action that refreshes the page & changes the query param for 'search'. --> 162 162 <div class="search-input-container"> 163 163 <input type="text" id="members-search-input<? echo '-'.$count ?>" placeholder="Search Members by Email or Name" aria-placeholder="Search Members by Email or Name" value="<?php if($count == $countID) { echo $search; } ?>"> … … 176 176 $userResult = $wpdb->get_row($userSql); 177 177 $registered = $userResult->user_registered; 178 $memSql = "SELECT * FROM mm_user_data WHERE wp_user_id = '" . $gMemRes->member_id . "'";178 $memSql = "SELECT * FROM ". MGROUPS_PREFIX ."mm_user_data WHERE wp_user_id = '" . $gMemRes->member_id . "'"; 179 179 $memResult = $wpdb->get_row($memSql); 180 180 $firstName = $memResult->first_name; … … 183 183 $phone = empty($memResult->phone) ? "—" : $memResult->phone; 184 184 $membershipId = $memResult->membership_level_id; 185 $levelSql = "SELECT name FROM mm_membership_levels WHERE id = '" . $membershipId . "'";185 $levelSql = "SELECT name FROM ". MGROUPS_PREFIX ."mm_membership_levels WHERE id = '" . $membershipId . "'"; 186 186 $levelResult = $wpdb->get_row($levelSql); 187 187 $redirecturl = ""; … … 255 255 <div class="member-count"> 256 256 <p> 257 <? echo ($status_type == 'inactive') ? 'Deactivated Members: ' : 'Members: ';258 echo sizeof($filteredData);259 if($status_type != 'inactive') { echo '/'. $group_size; } ?>257 <? echo ($status_type == 'inactive') ? 'Deactivated Members: ' : 'Members: '; 258 echo sizeof($filteredData); 259 if($status_type != 'inactive') { echo '/'. $group_size; } ?> 260 260 </p> 261 261 </div> … … 487 487 $userResult = $wpdb->get_row($userSql); 488 488 $registered = $userResult->user_registered; 489 $memSql = "SELECT * FROM mm_user_data WHERE wp_user_id = '" . $gMemRes->member_id . "'";489 $memSql = "SELECT * FROM ". MGROUPS_PREFIX ."mm_user_data WHERE wp_user_id = '" . $gMemRes->member_id . "'"; 490 490 $memResult = $wpdb->get_row($memSql); 491 491 $firstName = $memResult->first_name; -
groups-for-membermouse/trunk/includes/config.php
r2856767 r3087273 98 98 <tbody> 99 99 <?php foreach($results as $res): 100 $leadermemSql = "SELECT name FROM mm_membership_levels WHERE id = '".$res -> leader_memlevel."'";100 $leadermemSql = "SELECT name FROM ". MGROUPS_PREFIX ."mm_membership_levels WHERE id = '".$res -> leader_memlevel."'"; 101 101 $leadermemResult = $wpdb -> get_row($leadermemSql); 102 102 $leaderCost = ""; 103 103 if(!empty($res -> group_leader_cost)): 104 $leaderSql = "SELECT name FROM mm_products WHERE id = '".$res -> group_leader_cost."'";104 $leaderSql = "SELECT name FROM ". MGROUPS_PREFIX ."mm_products WHERE id = '".$res -> group_leader_cost."'"; 105 105 $leaderResult = $wpdb -> get_row($leaderSql); 106 106 $leaderCost = $leaderResult -> name; 107 107 endif; 108 108 109 $membermemSql = "SELECT name FROM mm_membership_levels WHERE id = '".$res -> member_memlevel."'";109 $membermemSql = "SELECT name FROM ". MGROUPS_PREFIX ."mm_membership_levels WHERE id = '".$res -> member_memlevel."'"; 110 110 $membermemResult = $wpdb -> get_row($membermemSql); 111 111 $memberCost = ""; 112 112 if(!empty($res -> group_member_cost)): 113 $memberSql = "SELECT name FROM mm_products WHERE id = '".$res -> group_member_cost."'";113 $memberSql = "SELECT name FROM ". MGROUPS_PREFIX ."mm_products WHERE id = '".$res -> group_member_cost."'"; 114 114 $memberResult = $wpdb -> get_row($memberSql); 115 115 $memberCost = $memberResult -> name; … … 153 153 <h3>Notices</h3> 154 154 <table class="widefat" id="mm-data-grid"> 155 <thead>155 <thead> 156 156 <tr> 157 157 <th>Name</th> -
groups-for-membermouse/trunk/includes/create_group.php
r2856767 r3087273 33 33 endif; 34 34 endif; 35 $leaderSql = "SELECT lp.product_id AS product_id,p.id AS id,p.name AS name FROM mm_membership_level_products AS lp LEFT JOINmm_products AS p ON lp.product_id = p.id WHERE lp.membership_id ='".$leader_memlevel."' ORDER BY p.name ASC";35 $leaderSql = "SELECT lp.product_id AS product_id,p.id AS id,p.name AS name FROM ". MGROUPS_PREFIX ."mm_membership_level_products AS lp LEFT JOIN ". MGROUPS_PREFIX ."mm_products AS p ON lp.product_id = p.id WHERE lp.membership_id ='".$leader_memlevel."' ORDER BY p.name ASC"; 36 36 $leaderResults = $wpdb -> get_results($leaderSql); 37 37 38 $memberSql = "SELECT lp.product_id AS product_id,p.id AS id,p.name AS name FROM mm_membership_level_products AS lp LEFT JOINmm_products AS p ON lp.product_id = p.id WHERE lp.membership_id ='".$member_memlevel."' ORDER BY p.name ASC";38 $memberSql = "SELECT lp.product_id AS product_id,p.id AS id,p.name AS name FROM ". MGROUPS_PREFIX ."mm_membership_level_products AS lp LEFT JOIN ". MGROUPS_PREFIX ."mm_products AS p ON lp.product_id = p.id WHERE lp.membership_id ='".$member_memlevel."' ORDER BY p.name ASC"; 39 39 $memberResults = $wpdb -> get_results($memberSql); 40 40 ?> … … 77 77 <i class="fa fa-circle-o-notch fa-spin fa-2x" aria-hidden="true"></i> 78 78 </div> 79 80 79 </div> 81 80 <div class="groupError" id="leadermemlevelErr"></div> -
groups-for-membermouse/trunk/includes/manage_groups.php
r2856767 r3087273 126 126 $userResult = $wpdb->get_row($userSql); 127 127 $registered = $userResult->user_registered; 128 $memSql = "SELECT * FROM mm_user_data WHERE wp_user_id = '" . $gMemRes->member_id . "'";128 $memSql = "SELECT * FROM ". MGROUPS_PREFIX ."mm_user_data WHERE wp_user_id = '" . $gMemRes->member_id . "'"; 129 129 $memResult = $wpdb->get_row($memSql); 130 130 $firstName = $memResult->first_name; … … 134 134 $statusId = $memResult->status; 135 135 $membershipId = $memResult->membership_level_id; 136 $levelSql = "SELECT name FROM mm_membership_levels WHERE id = '" . $membershipId . "'";136 $levelSql = "SELECT name FROM ". MGROUPS_PREFIX ."mm_membership_levels WHERE id = '" . $membershipId . "'"; 137 137 $levelResult = $wpdb->get_row($levelSql); 138 138 $membershipName = $levelResult->name; -
groups-for-membermouse/trunk/includes/manage_groups_admin.php
r2856767 r3087273 157 157 $userResult = $wpdb->get_row($userSql); 158 158 $registered = $userResult->user_registered; 159 $memSql = "SELECT * FROM mm_user_data WHERE wp_user_id = '" . $gMemRes->member_id . "'";159 $memSql = "SELECT * FROM ". MGROUPS_PREFIX ."mm_user_data WHERE wp_user_id = '" . $gMemRes->member_id . "'"; 160 160 $memResult = $wpdb->get_row($memSql); 161 161 $firstName = $memResult->first_name; … … 163 163 $email = $userResult->user_email; 164 164 $membershipId = $memResult->membership_level_id; 165 $levelSql = "SELECT name FROM mm_membership_levels WHERE id = '" . $membershipId . "'";165 $levelSql = "SELECT name FROM ". MGROUPS_PREFIX ."mm_membership_levels WHERE id = '" . $membershipId . "'"; 166 166 $levelResult = $wpdb->get_row($levelSql); 167 167 $membershipName = $levelResult->name; -
groups-for-membermouse/trunk/readme.txt
r2867087 r3087273 3 3 Tags: membermouse, member management, membership site, groups, mm groups, groups for membermouse, membermouse groups 4 4 Requires at least: 4.8 5 Tested up to: 5.95 Tested up to: 6.5.3 6 6 Requires PHP: 5.6 7 7 Stable tag: trunk … … 70 70 == Changelog == 71 71 72 2.3.5 73 - BUG FIX: There was a compatibility bug when using Membermouse 3.0 and up due to their database changes. This bug has been fixed and backwards compatibility and support has been added to prevent issues if running a membermouse version prior to 3.0 and up. 74 72 75 2.3.2 73 76 - BUG FIX: Fixed a PHP8 compatibility issue causing issues when creating a group leader
Note: See TracChangeset
for help on using the changeset viewer.