WordPress.org
Get WordPress

Plugin Directory

Changeset 1664069


Ignore:
Timestamp:
05/24/2017 03:09:07 PM (9 years ago)
Author:
Moridrin
Message:

3.1.2

Location:
ssv-users/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • ssv-users/trunk/custom-post-type/registration-fields.php

    r1660274 r1664069  
    11<?php
     2
    23namespace mp_ssv_users;
     4
    35use mp_ssv_general\Form;
    46use mp_ssv_general\Message;
    … …  
    2628    $form->setValues($_POST);
    2729    $messages = $form->isValid();
     30    if ($messages === true) {
     31        $messages = array();
     32    }
    2833
    2934    $username        = $form->getValue('username');
    … …  
    4348    }
    4449    if (!empty($requiredFieldsMessages)) {
    45         $messages = is_array($messages) ?: array();
    4650        $messages = array_merge($messages, $requiredFieldsMessages);
    4751    }
    4852
    49     if ($messages === true) {
     53    if (!empty($message) && empty($requiredFieldsMessages) && current_user_can('admin_edit_users')) {
     54        $user         = User::register($username, $password, $email);
     55        $form->user   = $user;
     56        $saveMessages = $form->save();
     57        do_action(SSV_General::HOOK_USERS_SAVE_MEMBER, $form->user);
     58        $messages = array_merge($messages, $saveMessages);
     59        if (empty($saveMessages)) {
     60            $messages[] = new Message('Profile Forcibly Saved (As Board member).');
     61        } else {
     62            $messages[] = new Message('Profile Partially Saved (As Board member).');
     63        }
     64    } elseif (empty($messages)) {
    5065        global $post;
    5166        $pageRole = get_post_meta($post->ID, 'page_role', true);
    52         $user       = User::register($username, $password, $email);
     67        $user     = User::register($username, $password, $email);
    5368        if ($pageRole != -1) {
    5469            $user->set_role($pageRole);
    … …  
    5974        if (get_option(SSV_Users::OPTION_NEW_MEMBER_ADMIN_EMAIL, true) && !empty(get_option(SSV_Users::OPTION_MEMBER_ADMINS))) {
    6075            $userAdmins = get_option(SSV_Users::OPTION_MEMBER_ADMINS);
    61             $to = array();
     76            $to         = array();
    6277            foreach ($userAdmins as $userAdmin) {
    6378                $to[] = User::getByID($userAdmin)->user_email;
    6479            }
    65             $subject   = 'New User registration';
    66             $message   = '<p>Hello Members Admin,</p><br/>';
     80            $subject = 'New User registration';
     81            $message = '<p>Hello Members Admin,</p><br/>';
    6782            $message .= '<p>A new user has registered for ' . get_bloginfo() . ':</p>';
    6883            $message .= $form->getEmail();
    … …  
    7388        if (get_option(SSV_Users::OPTION_NEW_MEMBER_REGISTRANT_EMAIL, true)) {
    7489            $userAdmins = get_option(SSV_Users::OPTION_MEMBER_ADMINS);
    75             $to = array();
     90            $to         = array();
    7691            foreach ($userAdmins as $userAdmin) {
    7792                $to[] = User::getByID($userAdmin)->user_email;
    7893            }
    79             $subject   = 'Registration Successful';
    80             $message   = '<p>Hello Members Admin,</p><br/>';
     94            $subject = 'Registration Successful';
     95            $message = '<p>Hello Members Admin,</p><br/>';
    8196            $message .= '<p>Your registration for ' . get_bloginfo() . ' was successful.</p>';
    8297            $message .= '<p>You have registered with the following fields:</p>';
    … …  
    90105    if (empty($messages)) {
    91106        $messages[] = new Message('Registration Successful.');
    92     } elseif (!empty($requiredFieldsMessages) && current_user_can('admin_edit_users')) {
    93         $user         = User::register($username, $password, $email);
    94         $form->user   = $user;
    95         $saveMessages = $form->save();
    96         do_action(SSV_General::HOOK_USERS_SAVE_MEMBER, $form->user);
    97         $messages = array_merge($messages, $saveMessages);
    98         if (empty($saveMessages)) {
    99             $messages[] = new Message('Profile Forcibly Saved (As Board member).');
    100         } else {
    101             $messages[] = new Message('Profile Partially Saved (As Board member).');
    102         }
    103107    }
    104108    return $messages;

  • ssv-users/trunk/general/js/mp-ssv-input-field-selector.js

    r1660274 r1664069  
    989989    removeField(document.getElementById(fieldID + "_default_value_td"));
    990990    removeField(document.getElementById(fieldID + "_default_checked_td"));
     991    removeField(document.getElementById(fieldID + "_date_range_td"));
    991992    removeField(document.getElementById(fieldID + "_placeholder_td"));
    992993    removeField(document.getElementById(fieldID + "_class_td"));
    … …  
    10321033    removeField(document.getElementById(fieldID + "_default_value_td"));
    10331034    removeField(document.getElementById(fieldID + "_default_checked_td"));
     1035    removeField(document.getElementById(fieldID + "_date_range_td"));
    10341036    removeField(document.getElementById(fieldID + "_placeholder_td"));
    10351037    removeField(document.getElementById(fieldID + "_class_td"));
    … …  
    10761078}
    10771079function createMultiSelect(fieldID, fieldNameExtension, options, selected) {
    1078     console.log(selected);
    10791080    if (selected === null) {
    10801081        selected = [];
Note: See TracChangeset for help on using the changeset viewer.