WordPress.org
Get WordPress

Plugin Directory

Changeset 2597111


Ignore:
Timestamp:
09/11/2021 01:37:10 AM (5 years ago)
Author:
mintunmedia
Message:

pushing version 2.0.7

Location:
groups-for-membermouse
Files:
47 added
6 edited

Legend:

Unmodified
Added
Removed

  • groups-for-membermouse/trunk/groups-for-membermouse.php

    r2579524 r2597111  
    44 * Plugin Name: Groups for MemberMouse
    55 * 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.0.6
     6 * Version: 2.0.7
    77 * Author: Mintun Media
    88 * Plugin URI:  https://www.mintunmedia.com
    … …  
    674674                    // Group Leader. Custom Field contains Group Type ID
    675675
     676                    $type = 'group-leader';
     677
    676678                    $templateSql        = "SELECT id,group_size,name FROM " . $wpdb->prefix . "group_items WHERE id = '" . $cf . "'";
    677679                    $templateResult = $wpdb->get_row($templateSql);
    … …  
    687689                } else {
    688690                    // Group Member. Custom Field contains group ID (g##)
     691
     692                    $type = 'group-member';
    689693
    690694                    /**
    … …  
    741745                    }
    742746                }
     747
     748                /**
     749                 * ACTION - Group Member Added to Group
     750                 * @param $data Member Data sent by MemberMouse
     751                 * @param $type group-leader or group-member
     752                 */
     753                do_action('MemberMouseGroupMemberAdded', $data, $type);
    743754            }
    744755        }
    … …  
    925936            if (isset($_GET[$group_query]) && $_GET[$group_query] !== '') {
    926937                $group_id = $_GET[$group_query];
     938
     939                // Exit. This is for creating a group.
     940                if (strpos($group_id, 'g') === false) {
     941                    return;
     942                }
    927943                $group_id = substr($group_id, 1);
    928944
    … …  
    951967    $MemberMouseGroupAddon = new MemberMouseGroupAddon();
    952968endif;
    953 ?>

  • groups-for-membermouse/trunk/includes/add_group.php

    r2033577 r2597111  
    11<?php
    22
    3 if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
     3if (!defined('ABSPATH')) exit; // Exit if accessed directly
    44
    55global $wpdb;
    66
    77$data = sanitize_post($_POST);
    8 if(count($data) > 0):
    9     foreach($data as $key => $value):
     8if (count($data) > 0) :
     9    foreach ($data as $key => $value) :
    1010        $$key = $value;
    1111    endforeach;
    … …  
    1313    $errs = false;
    1414
    15     if(empty($name)):
     15    if (empty($name)) :
    1616        $error["name"]  = 'Please enter the Name.';
    1717        $errs           = true;
    1818    endif;
    1919
    20     if(empty($leader_memlevel)):
     20    if (empty($leader_memlevel)) :
    2121        $error["leader_memlevel"]   = 'Please select the Group Leader Associated Access.';
    2222        $errs                       = true;
    2323    endif;
    2424
    25     if(($lCost == 1) && empty($leader_cost)):
     25    if (($lCost == 1) && empty($leader_cost)) :
    2626        $error["leader_cost"]   = 'Please select the Group Leader Associated Cost.';
    2727        $errs                   = true;
    2828    endif;
    2929
    30     if(empty($member_memlevel)):
     30    if (empty($member_memlevel)) :
    3131        $error["member_memlevel"]   = 'Please select the Group Member Associated Access.';
    3232        $errs                       = true;
    3333    endif;
    3434
    35     if(($mCost == 1) && empty($member_cost)):
     35    if (($mCost == 1) && empty($member_cost)) :
    3636        $error["member_cost"]   = 'Please select the Group Member Associated Cost.';
    3737        $errs                   = true;
    3838    endif;
    3939
    40     if(empty($group_size)):
     40    if (empty($group_size)) :
    4141        $error["group_size"]    = 'Please enter the Group Size.';
    4242        $errs                   = true;
    4343    endif;
    4444
    45     if($errs == true):
     45    if ($errs == true) :
    4646        $return = json_encode($error);
    47     else:
    48         if(!empty($groupId)):
    49             $sql    = "UPDATE ".$wpdb -> prefix."group_items SET name = '".$name."', leader_memlevel = '".$leader_memlevel."',  member_memlevel = '".$member_memlevel."', group_leader_cost = '".$leader_cost."', group_member_cost = '".$member_cost."', group_size = '".$group_size."', modifiedDate = now() WHERE id = '".$groupId."'";
    50         else:
    51             $sql    = "INSERT INTO ".$wpdb -> prefix."group_items (id,name,leader_memlevel,member_memlevel,group_leader_cost,group_member_cost,group_size,createdDate,modifiedDate)VALUES('','".$name."','".$leader_memlevel."','".$member_memlevel."','".$leader_cost."','".$member_cost."','".$group_size."',now(),now())";
     47    else :
     48        if (!empty($groupId)) :
     49            $sql    = "UPDATE " . $wpdb->prefix . "group_items SET name = '" . $name . "', leader_memlevel = '" . $leader_memlevel . "',  member_memlevel = '" . $member_memlevel . "', group_leader_cost = '" . $leader_cost . "', group_member_cost = '" . $member_cost . "', group_size = '" . $group_size . "', modifiedDate = now() WHERE id = '" . $groupId . "'";
     50        else :
     51            $sql    = "INSERT INTO " . $wpdb->prefix . "group_items (id,name,leader_memlevel,member_memlevel,group_leader_cost,group_member_cost,group_size,createdDate,modifiedDate)VALUES('','" . $name . "','" . $leader_memlevel . "','" . $member_memlevel . "','" . $leader_cost . "','" . $member_cost . "','" . $group_size . "',now(),now())";
    5252        endif;
    53         $query  = $wpdb -> query($sql);
    54         if($query):
    55             $return = json_encode(array("success"=> "yes"));
    56         else:
    57             $return = json_encode(array("success"=> "no"));
     53        $query  = $wpdb->query($sql);
     54        if ($query) :
     55            $return = json_encode(array("success" => "yes"));
     56        else :
     57            $return = json_encode(array("success" => "no"));
    5858        endif;
    5959    endif;
    6060    echo $return;
    6161endif;
    62 ?>

  • groups-for-membermouse/trunk/includes/add_group_user.php

    r2033577 r2597111  
    11<?php
    22
    3 if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
     3if (!defined('ABSPATH')) exit; // Exit if accessed directly
    44
    55global $wpdb;
    66
    77$data = sanitize_post($_POST);
    8 if(count($data) > 0):
    9     foreach($data as $key => $value):
     8if (count($data) > 0) :
     9    foreach ($data as $key => $value) :
    1010        $$key = $value;
    1111    endforeach;
    1212
    13     $groupSql   = "INSERT INTO ".$wpdb -> prefix."group_sets_members (id,group_id,member_id,createdDate,modifiedDate)VALUES('','".$group_id."','".$member_id."',now(),now())";
    14     $groupQuery = $wpdb -> query($groupSql);
    15     if($groupQuery):
     13    $groupSql   = "INSERT INTO " . $wpdb->prefix . "group_sets_members (id,group_id,member_id,createdDate,modifiedDate)VALUES('','" . $group_id . "','" . $member_id . "',now(),now())";
     14    $groupQuery = $wpdb->query($groupSql);
     15    if ($groupQuery) :
    1616        $msg["success"] = "yes";
    17     else:
     17    else :
    1818        $msg["success"] = "no";
    1919    endif;
    … …  
    2121    echo $return;
    2222endif;
    23 ?>
     23
     24/**
     25 * HOOK - Group User Added COMPLETE
     26 * @param $data array
     27 * @param $success bool
     28 */
     29do_action('groups_add_group_user_complete', $data, $msg['success']);

  • groups-for-membermouse/trunk/includes/create_group_leader.php

    r2033577 r2597111  
    11<?php
    22
    3 if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
     3if (!defined('ABSPATH')) exit; // Exit if accessed directly
    44
    55global $wpdb;
    66
    77$data = sanitize_post($_POST);
    8 if(count($data) > 0):
    9     foreach($data as $key => $value):
     8if (count($data) > 0) :
     9    foreach ($data as $key => $value) :
    1010        $$key = $value;
    1111    endforeach;
    … …  
    1313    $errs = false;
    1414    $msg  = array();
    15     if(empty($group)):
     15    if (empty($group)) :
    1616        $msg["group"] = "Please select the Group type.";
    1717        $errs = true;
    1818    endif;
    1919
    20     if(empty($user)):
     20    if (empty($user)) :
    2121        $msg["user"] = "Please enter the Group Leader.";
    2222        $errs = true;
    23     else:
    24         $userSql    = "SELECT ID FROM ".$wpdb -> prefix."users WHERE user_email = '".$user."' OR user_login = '".$user."'";
    25         $userResult = $wpdb -> get_row($userSql);
    26         if(count($userResult) > 0):
    27             $user_id        = $userResult -> ID;
     23    else :
     24        $userSql    = "SELECT ID FROM " . $wpdb->prefix . "users WHERE user_email = '" . $user . "' OR user_login = '" . $user . "'";
     25        $userResult = $wpdb->get_row($userSql);
     26        if (count($userResult) > 0) :
     27            $user_id        = $userResult->ID;
    2828            $user_data      = get_userdata($user_id);
    29             $user_roles     = $user_data-> roles;
    30             if(in_array("administrator", $user_roles)):
     29            $user_roles     = $user_data->roles;
     30            if (in_array("administrator", $user_roles)) :
    3131                $msg["user"] = 'This user already has an administrator role.';
    3232                $errs        = true;
    33             else:
    34                 $groupSql       = "SELECT group_name FROM ".$wpdb -> prefix."group_sets WHERE group_leader = '".$user_id."'";
    35                 $groupResult    = $wpdb -> get_row($groupSql);
    36                 if(count($groupResult) > 0):
    37                     if(!empty($groupResult -> group_name)):
    38                         $group_name = $groupResult -> group_name;
    39                     else:
     33            else :
     34                $groupSql       = "SELECT group_name FROM " . $wpdb->prefix . "group_sets WHERE group_leader = '" . $user_id . "'";
     35                $groupResult    = $wpdb->get_row($groupSql);
     36                if (count($groupResult) > 0) :
     37                    if (!empty($groupResult->group_name)) :
     38                        $group_name = $groupResult->group_name;
     39                    else :
    4040                        $group_name = 'Group';
    4141                    endif;
    42                     $msg["user"] = 'This member is already the Group Leader of '.$group_name.'.';
     42                    $msg["user"] = 'This member is already the Group Leader of ' . $group_name . '.';
    4343                    $errs = true;
    44                 else:
    45                     $checkMemSql    = "SELECT gm.group_id,g.group_name FROM ".$wpdb -> prefix."group_sets_members AS gm LEFT JOIN ".$wpdb -> prefix."group_sets AS g ON gm.group_id = g.id WHERE gm.member_id = '".$user_id."'";
    46                     $checkMemResult = $wpdb -> get_row($checkMemSql);
    47                     if(count($checkMemResult) > 0):
    48                         if(!empty($checkMemResult -> group_name)):
    49                             $gName = $checkMemResult -> group_name;
    50                         else:
     44                else :
     45                    $checkMemSql    = "SELECT gm.group_id,g.group_name FROM " . $wpdb->prefix . "group_sets_members AS gm LEFT JOIN " . $wpdb->prefix . "group_sets AS g ON gm.group_id = g.id WHERE gm.member_id = '" . $user_id . "'";
     46                    $checkMemResult = $wpdb->get_row($checkMemSql);
     47                    if (count($checkMemResult) > 0) :
     48                        if (!empty($checkMemResult->group_name)) :
     49                            $gName = $checkMemResult->group_name;
     50                        else :
    5151                            $gName = "Group";
    5252                        endif;
    53                         $msg["user"] = "<font class=\"red-text\">This member is already registered to Group '".$gName."'.</font>";
     53                        $msg["user"] = "<font class=\"red-text\">This member is already registered to Group '" . $gName . "'.</font>";
    5454                        $errs = true;
    5555                    endif;
    5656                endif;
    5757            endif;
    58         else:
     58        else :
    5959            $msg["user"] = 'This member doesn\'t exist.';
    6060            $errs = true;
    … …  
    6262    endif;
    6363
    64     if($errs == false):
    65         $gNameSql       = "SELECT group_size FROM ".$wpdb -> prefix."group_items WHERE id = '".$group."'";
    66         $gNameResult    = $wpdb -> get_row($gNameSql);
    67         $group_size     = $gNameResult -> group_size;
    68         $sql    = "INSERT INTO ".$wpdb -> prefix."group_sets(id,group_template_id,group_name,group_size,group_leader,group_status,createdDate,modifiedDate)VALUES('','".$group."','".$group_name."','".$group_size."','".$user_id."','1',now(),now())";
    69         $query  = $wpdb -> query($sql);
    70         if($query):
     64    if ($errs == false) :
     65        $gNameSql       = "SELECT group_size FROM " . $wpdb->prefix . "group_items WHERE id = '" . $group . "'";
     66        $gNameResult    = $wpdb->get_row($gNameSql);
     67        $group_size     = $gNameResult->group_size;
     68        $sql    = "INSERT INTO " . $wpdb->prefix . "group_sets(id,group_template_id,group_name,group_size,group_leader,group_status,createdDate,modifiedDate)VALUES('','" . $group . "','" . $group_name . "','" . $group_size . "','" . $user_id . "','1',now(),now())";
     69        $query  = $wpdb->query($sql);
     70        if ($query) :
    7171            $updateUser     = wp_update_user(array('ID' => $user_id, 'role' => 'Group Leader'));
    7272            $msg["success"] = 'yes';
    73         else:
     73        else :
    7474            $msg["success"] = 'no';
    7575        endif;
    … …  
    7979    echo $return;
    8080endif;
    81 ?>
     81
     82/**
     83 * HOOK - Create Group COMPLETE
     84 * @param $data array
     85 * @param $success bool
     86 */
     87do_action('groups_create_group_complete', $data, $msg['success']);

  • groups-for-membermouse/trunk/js/checkout.js

    r2579530 r2597111  
    99  }
    1010
    11   console.log("URL has Groups error in it.");
    12 
    1311  Swal.fire({
    1412    'text': 'The Group you are attempting to join is no longer active. By signing up, you will not be added to a group.'

  • groups-for-membermouse/trunk/readme.txt

    r2579524 r2597111  
    33Tags: membermouse, member management, membership site, groups, mm groups, groups for membermouse, membermouse groups
    44Requires at least: 4.8
    5 Tested up to: 5.8
     5Tested up to: 5.8.1
    66Requires PHP: 5.6
    77Stable tag: trunk
    … …  
    7070
    7171== Changelog ==
     722.0.7 Improve group signup functionality if group is cancelled. Add Developer hooks to group creation process and add member process.
     73
    72742.0.6 Added support for members being able to sign up for a cancelled group and given full access. Now redirects to default checkout and shows a popup error. If somehow someone gets through, there's extra support to cancel their membership in the site based on the group's status being cancelled.
    7375
Note: See TracChangeset for help on using the changeset viewer.