Changeset 2648097
- Timestamp:
- 12/22/2021 11:08:16 PM (4 years ago)
- Location:
- groups-for-membermouse
- Files:
-
- 50 added
- 3 edited
-
tags/2.1.1 (added)
-
tags/2.1.1/css (added)
-
tags/2.1.1/css/admin.css (added)
-
tags/2.1.1/css/groups-leader-dashboard.css (added)
-
tags/2.1.1/groups-for-membermouse.php (added)
-
tags/2.1.1/images (added)
-
tags/2.1.1/images/close.png (added)
-
tags/2.1.1/images/group_title_bg.png (added)
-
tags/2.1.1/images/loading.gif (added)
-
tags/2.1.1/images/pbar-animated.gif (added)
-
tags/2.1.1/includes (added)
-
tags/2.1.1/includes/activate_group.php (added)
-
tags/2.1.1/includes/add_group.php (added)
-
tags/2.1.1/includes/add_group_user.php (added)
-
tags/2.1.1/includes/cancel_group.php (added)
-
tags/2.1.1/includes/change_group_cost.php (added)
-
tags/2.1.1/includes/check_user.php (added)
-
tags/2.1.1/includes/check_username.php (added)
-
tags/2.1.1/includes/class.shortcodes.php (added)
-
tags/2.1.1/includes/config.php (added)
-
tags/2.1.1/includes/create_group.php (added)
-
tags/2.1.1/includes/create_group_leader.php (added)
-
tags/2.1.1/includes/delete_group.php (added)
-
tags/2.1.1/includes/delete_group_data.php (added)
-
tags/2.1.1/includes/delete_group_member.php (added)
-
tags/2.1.1/includes/docs.php (added)
-
tags/2.1.1/includes/edit_group.php (added)
-
tags/2.1.1/includes/edit_group_name.php (added)
-
tags/2.1.1/includes/group_leader_form.php (added)
-
tags/2.1.1/includes/import.php (added)
-
tags/2.1.1/includes/manage.php (added)
-
tags/2.1.1/includes/manage_groups.php (added)
-
tags/2.1.1/includes/manage_groups_admin.php (added)
-
tags/2.1.1/includes/purchase_link.php (added)
-
tags/2.1.1/includes/show_help_window.php (added)
-
tags/2.1.1/includes/show_purchase_link.php (added)
-
tags/2.1.1/includes/tabs.php (added)
-
tags/2.1.1/includes/templates (added)
-
tags/2.1.1/includes/templates/mm_group_template.csv (added)
-
tags/2.1.1/includes/update_group.php (added)
-
tags/2.1.1/includes/update_group_name.php (added)
-
tags/2.1.1/index.php (added)
-
tags/2.1.1/js (added)
-
tags/2.1.1/js/admin.js (added)
-
tags/2.1.1/js/checkout.js (added)
-
tags/2.1.1/js/groups-leader-dashboard.js (added)
-
tags/2.1.1/js/mm-group-import_wizard.js (added)
-
tags/2.1.1/readme.txt (added)
-
tags/2.1.1/templates (added)
-
tags/2.1.1/templates/mm_groups_import_template.csv (added)
-
trunk/groups-for-membermouse.php (modified) (10 diffs)
-
trunk/includes/create_group_leader.php (modified) (1 diff)
-
trunk/readme.txt (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
groups-for-membermouse/trunk/groups-for-membermouse.php
r2642052 r2648097 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.1. 06 * Version: 2.1.1 7 7 * Author: Mintun Media 8 8 * Plugin URI: https://www.mintunmedia.com … … 112 112 $this->load_classes(); 113 113 114 115 116 114 //add_action('admin_notices', array(&$this, 'MemberMouseGroupAdminNotice')); 117 115 //add_action('admin_init', array(&$this, 'MemberMouseGroupAdminNoticeIgnore')); … … 228 226 ); 229 227 230 if (in_array( 'Group Leader', $user->roles) && in_array($action, $group_leader_actions)) {228 if (in_array(self::get_group_leader_role(), $user->roles) && in_array($action, $group_leader_actions)) { 231 229 return check_ajax_referer('wp_rest', FALSE, FALSE); 232 230 } … … 327 325 global $wpdb, $current_user; 328 326 329 if (is_user_logged_in() && in_array( 'Group Leader', $current_user->roles)) {327 if (is_user_logged_in() && in_array(self::get_group_leader_role(), $current_user->roles)) { 330 328 $leaderSql = "SELECT id,group_template_id,group_name FROM " . $wpdb->prefix . "group_sets WHERE group_leader = '" . $current_user->ID . "'"; 331 329 $leaderResult = $wpdb->get_row($leaderSql); … … 410 408 $grant = true; 411 409 foreach ($GLOBALS['wp_roles']->role_objects as $role => $name) : 412 // if($role == "Group Leader"):413 410 if (!$name->has_cap($custom_cap)) : 414 411 $name->add_cap($custom_cap, $grant); 415 412 endif; 416 // endif;417 413 endforeach; 418 414 } … … 421 417 $custom_cap = "membermouse_group_capability"; 422 418 foreach ($GLOBALS['wp_roles']->role_objects as $role => $name) : 423 // if($role == "Group Leader"):424 419 if (!$name->has_cap($custom_cap)) : 425 420 $name->remove_cap($custom_cap); 426 421 endif; 427 // endif;428 422 endforeach; 429 423 } … … 544 538 } 545 539 540 /** 541 * Add MemberMouse Groups Role on Install. 542 * 543 * @return void 544 */ 546 545 public function MemberMouseGroupAddRoll() { 547 $role = "Group Leader"; 548 $display_name = "Group Leader"; 549 $capabilities = array("read" => true, "membermouse_group_capability" => true); 550 add_role($role, $display_name, $capabilities); 551 } 552 553 public function MemberMouseGroupRemoveRoll() { 554 remove_role("Group Leader"); 546 self::get_group_leader_role(); 555 547 } 556 548 … … 730 722 $sql = "INSERT INTO " . $wpdb->prefix . "group_sets (id,group_template_id,group_name,group_size,group_leader,group_status,createdDate,modifiedDate)VALUES('','" . $template_id . "','" . $groupName . "','" . $groupSize . "','" . $memberId . "','1',now(),now())"; 731 723 $wpdb->query($sql); 732 wp_update_user(array('ID' => $memberId, 'role' => 'Group Leader'));724 wp_update_user(array('ID' => $memberId, 'role' => self::get_group_leader_role())); 733 725 } 734 726 } else { … … 926 918 $sql = "INSERT INTO {$wpdb->prefix}group_sets (id,group_template_id,group_name,group_size,group_leader,group_status,createdDate,modifiedDate)VALUES('','" . $template_id . "','" . $groupName . "','" . $groupSize . "','" . $memberId . "','1',now(),now())"; 927 919 $query = $wpdb->query($sql); 928 $updateUser = wp_update_user(array('ID' => $memberId, 'role' => 'Group Leader'));920 $updateUser = wp_update_user(array('ID' => $memberId, 'role' => self::get_group_leader_role())); 929 921 } 930 922 } … … 1053 1045 } 1054 1046 } 1047 1048 /** 1049 * Get Group Leader Role 1050 * - Default = Group Leader 1051 * - Ability to set group leader role via filter 1052 * 1053 * @return void 1054 */ 1055 public static function get_group_leader_role() { 1056 $role_slug = apply_filters('groupsmm_group_leader_role_slug', 'Group Leader'); 1057 1058 if (!wp_roles()->is_role($role_slug)) { 1059 $display_name = apply_filters('groupsmm_group_leader_role_name', 'Group Leader'); 1060 $capabilities = array("read" => true, "membermouse_group_capability" => true); 1061 add_role($role_slug, $display_name, $capabilities); 1062 } 1063 return $role_slug; 1064 } 1055 1065 } // End Class 1056 1066 } // End if class exists -
groups-for-membermouse/trunk/includes/create_group_leader.php
r2616147 r2648097 69 69 $query = $wpdb->query($sql); 70 70 if ($query) : 71 $updateUser = wp_update_user(array('ID' => $user_id, 'role' => 'Group Leader'));71 $updateUser = wp_update_user(array('ID' => $user_id, 'role' => MemberMouseGroupAddon::get_group_leader_role())); 72 72 $msg["success"] = 'yes'; 73 73 else : -
groups-for-membermouse/trunk/readme.txt
r2642052 r2648097 63 63 64 64 == Changelog == 65 2.1.1 Added filter to change group leader role and group leader name: `add_filter('groupsmm_group_leader_role_slug')`, `add_filter('groupsmm_group_leader_role_name')` 66 65 67 2.1.0 Bug fixes and logs cleanup 66 68
Note: See TracChangeset
for help on using the changeset viewer.