WordPress.org
Get WordPress

Plugin Directory

Changeset 1397737


Ignore:
Timestamp:
04/17/2016 12:53:52 PM (10 years ago)
Author:
newbiesup
Message:

v1.2

Location:
wp-ajax-login-and-register/trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • wp-ajax-login-and-register/trunk/README.txt

    r1378470 r1397737  
    44Tags: ajax login, ajax register, ajax, login form, frontend login, frontend register
    55Requires at least: 3.0.1
    6 Tested up to: 4.4
    7 Stable tag: 1.1
     6Tested up to: 4.5
     7Stable tag: 1.2
    88License: GPLv2 or later
    99License URI: http://www.gnu.org/licenses/gpl-2.0.html
    … …  
    3232== Changelog ==
    3333
     34= 1.2 =
     35* Change the link text to Logout if user is logged in.
     36* Now logout is also processed with ajax.
     37
    3438= 1.1 =
    3539* Fix the login form not showing when registration is disabled.

  • wp-ajax-login-and-register/trunk/includes/class-wp-ajax-login.php

    r1378454 r1397737  
    7070
    7171        $this->plugin_name = 'wp-ajax-login';
    72         $this->version = '1.0.0';
     72        $this->version = '1.2';
    7373
    7474        $this->load_dependencies();
    … …  
    179179        $this->loader->add_action( 'wp_ajax_nopriv_pt_register_member', $plugin_public, 'pt_register_member' );
    180180        $this->loader->add_action( 'wp_ajax_nopriv_pt_reset_password', $plugin_public, 'pt_reset_password' );
     181        $this->loader->add_action( 'wp_ajax_pt_logout', $plugin_public, 'pt_logout' );
    181182
    182183    }

  • wp-ajax-login-and-register/trunk/languages/en_US.po

    r1378470 r1397737  
    22msgstr ""
    33"Project-Id-Version: WP AJAX Login and Register\n"
    4 "POT-Creation-Date: 2016-03-25 12:02+0800\n"
    5 "PO-Revision-Date: 2016-03-25 12:02+0800\n"
     4"POT-Creation-Date: 2016-04-17 20:50+0800\n"
     5"PO-Revision-Date: 2016-04-17 20:50+0800\n"
    66"Last-Translator: \n"
    77"Language-Team: \n"
    … …  
    1010"Content-Type: text/plain; charset=UTF-8\n"
    1111"Content-Transfer-Encoding: 8bit\n"
    12 "X-Generator: Poedit 1.8.4\n"
     12"X-Generator: Poedit 1.7.6\n"
    1313"X-Poedit-Basepath: ../public\n"
    1414"Plural-Forms: nplurals=2; plural=(n != 1);\n"
    … …  
    1717
    1818#: class-wp-ajax-login-public.php:119 class-wp-ajax-login-public.php:148
    19 #: class-wp-ajax-login-public.php:191
     19#: class-wp-ajax-login-public.php:198
    2020msgid "Session token has expired, please reload the page and try again"
    2121msgstr ""
    2222
    2323#: class-wp-ajax-login-public.php:124 class-wp-ajax-login-public.php:154
    24 #: class-wp-ajax-login-public.php:196
     24#: class-wp-ajax-login-public.php:203
    2525msgid "Please fill all form fields"
    2626msgstr ""
    … …  
    3434msgstr ""
    3535
    36 #: class-wp-ajax-login-public.php:215
     36#: class-wp-ajax-login-public.php:185
     37msgid "Logout successful, reloading page..."
     38msgstr ""
     39
     40#: class-wp-ajax-login-public.php:222
    3741msgid "Password Reset. Please check your email."
    3842msgstr ""
    3943
    40 #: class-wp-ajax-login-public.php:229
     44#: class-wp-ajax-login-public.php:236
    4145msgid "Please enter a username or e-mail address."
    4246msgstr ""
    4347
    44 #: class-wp-ajax-login-public.php:233
     48#: class-wp-ajax-login-public.php:240
    4549msgid "There is no user registered with that email address."
    4650msgstr ""
    4751
    48 #: class-wp-ajax-login-public.php:245
     52#: class-wp-ajax-login-public.php:252
    4953msgid "Invalid username or e-mail."
    5054msgstr ""
    5155
    52 #: class-wp-ajax-login-public.php:257
     56#: class-wp-ajax-login-public.php:264
    5357msgid "Password reset is not allowed for this user"
    5458msgstr ""
    5559
    56 #: class-wp-ajax-login-public.php:275
     60#: class-wp-ajax-login-public.php:282
    5761msgid "Someone requested that the password be reset for the following account:"
    5862msgstr ""
    5963
    60 #: class-wp-ajax-login-public.php:277
     64#: class-wp-ajax-login-public.php:284
    6165#, php-format
    6266msgid "Username: %s"
    6367msgstr ""
    6468
    65 #: class-wp-ajax-login-public.php:278
     69#: class-wp-ajax-login-public.php:285
    6670msgid "If this was a mistake, just ignore this email and nothing will happen."
    6771msgstr ""
    6872
    69 #: class-wp-ajax-login-public.php:279
     73#: class-wp-ajax-login-public.php:286
    7074msgid "To reset your password, visit the following address:"
    7175msgstr ""
    7276
    73 #: class-wp-ajax-login-public.php:288
     77#: class-wp-ajax-login-public.php:295
    7478#, php-format
    7579msgid "[%s] Password Reset"
    7680msgstr ""
    7781
    78 #: class-wp-ajax-login-public.php:293
     82#: class-wp-ajax-login-public.php:300
    7983msgid ""
    8084"The e-mail could not be sent.<br />Possible reason: your host may have "
    … …  
    8286msgstr ""
    8387
    84 #: partials/wp-ajax-login-public-display.php:39
     88#: partials/wp-ajax-login-public-display.php:36
    8589#, php-format
    8690msgid "Join %s"
    8791msgstr ""
    8892
    89 #: partials/wp-ajax-login-public-display.php:45
    90 #: partials/wp-ajax-login-public-display.php:75
     93#: partials/wp-ajax-login-public-display.php:44
     94#: partials/wp-ajax-login-public-display.php:77
    9195msgid "Username"
    9296msgstr ""
    9397
    94 #: partials/wp-ajax-login-public-display.php:49
     98#: partials/wp-ajax-login-public-display.php:48
    9599msgid "Email"
    96100msgstr ""
    97101
    98 #: partials/wp-ajax-login-public-display.php:55
    99 #: partials/wp-ajax-login-public-display.php:84
    100 #: partials/wp-ajax-login-public-display.php:105
    101 #: partials/wp-ajax-login-public-display.php:113
     102#: partials/wp-ajax-login-public-display.php:54
     103#: partials/wp-ajax-login-public-display.php:86
     104#: partials/wp-ajax-login-public-display.php:107
     105#: partials/wp-ajax-login-public-display.php:115
    102106msgid "Loading..."
    103107msgstr ""
    104108
    105 #: partials/wp-ajax-login-public-display.php:55
     109#: partials/wp-ajax-login-public-display.php:54
    106110msgid "Sign up"
    107111msgstr ""
    108112
    109 #: partials/wp-ajax-login-public-display.php:63
     113#: partials/wp-ajax-login-public-display.php:62
    110114msgid "Registration is disabled."
    111115msgstr ""
    112116
    113 #: partials/wp-ajax-login-public-display.php:69
     117#: partials/wp-ajax-login-public-display.php:71
    114118#, php-format
    115119msgid "Login to %s"
    116120msgstr ""
    117121
    118 #: partials/wp-ajax-login-public-display.php:79
     122#: partials/wp-ajax-login-public-display.php:81
    119123msgid "Password"
    120124msgstr ""
    121125
    122 #: partials/wp-ajax-login-public-display.php:84
    123 #: partials/wp-ajax-login-public-display.php:118
     126#: partials/wp-ajax-login-public-display.php:86
     127#: partials/wp-ajax-login-public-display.php:120
    124128msgid "Login"
    125129msgstr ""
    126130
    127 #: partials/wp-ajax-login-public-display.php:84
     131#: partials/wp-ajax-login-public-display.php:86
    128132msgid "Lost Password?"
    129133msgstr ""
    130134
    131 #: partials/wp-ajax-login-public-display.php:94
     135#: partials/wp-ajax-login-public-display.php:96
    132136msgid "Reset Password"
    133137msgstr ""
    134138
    135 #: partials/wp-ajax-login-public-display.php:95
     139#: partials/wp-ajax-login-public-display.php:97
    136140msgid ""
    137141"Enter the username or e-mail you used in your profile. A password reset link "
    … …  
    139143msgstr ""
    140144
    141 #: partials/wp-ajax-login-public-display.php:100
     145#: partials/wp-ajax-login-public-display.php:102
    142146msgid "Username or E-mail"
    143147msgstr ""
    144148
    145 #: partials/wp-ajax-login-public-display.php:105
     149#: partials/wp-ajax-login-public-display.php:107
    146150msgid "Get new password"
    147151msgstr ""
    148152
    149 #: partials/wp-ajax-login-public-display.php:117
     153#: partials/wp-ajax-login-public-display.php:119
    150154msgid "Don't have an account?"
    151155msgstr ""
    152156
    153 #: partials/wp-ajax-login-public-display.php:117
     157#: partials/wp-ajax-login-public-display.php:119
    154158msgid "Sign Up"
    155159msgstr ""
    156160
    157 #: partials/wp-ajax-login-public-display.php:118
     161#: partials/wp-ajax-login-public-display.php:120
    158162msgid "Already have an account?"
    159163msgstr ""
    160164
    161 #: partials/wp-ajax-login-public-display.php:122
     165#: partials/wp-ajax-login-public-display.php:125
    162166#, php-format
    163 msgid "You have already logged in as %1$s. <a href=\"%2$s\">Logout?</a>"
     167msgid "You have already logged in as %1$s. <a href=\"#logout\">Logout?</a>"
    164168msgstr ""
    165169
    166 #: partials/wp-ajax-login-public-display.php:140
     170#: partials/wp-ajax-login-public-display.php:147
    167171msgid "Login/Register"
    168172msgstr ""
     173
     174#: partials/wp-ajax-login-public-display.php:149
     175msgid "Logout?"
     176msgstr ""

  • wp-ajax-login-and-register/trunk/public/class-wp-ajax-login-public.php

    r1378454 r1397737  
    180180    }
    181181
     182    // LOGIN
     183    public function pt_logout(){
     184        wp_logout();
     185        echo json_encode(array('error' => false, 'message'=> '<div class="alert alert-success">'.__('Logout successful, reloading page...', 'wp-ajax-login').'</div>'));
     186        die();
     187    }
     188
    182189    // RESET PASSWORD
    183190    function pt_reset_password(){

  • wp-ajax-login-and-register/trunk/public/js/wp-ajax-login-public.js

    r1378454 r1397737  
    101101    });
    102102
     103    // Logout
     104    $('[href="#logout"]').click(function(e){
     105
     106        e.preventDefault();
     107
     108        $.ajax({
     109            url: ptajax.ajaxurl,
     110            type: 'POST',
     111            dataType: 'json',
     112            data: {
     113                action: 'pt_logout',
     114            },
     115            success: function(data) {
     116
     117                if(data.error == false){
     118                    $('.pt-logout .pt-errors').html(data.message);
     119                    window.location.reload(true);
     120                }
     121            }
     122        });
     123
     124    });
     125
    103126
    104127    // Reset Password

  • wp-ajax-login-and-register/trunk/public/partials/wp-ajax-login-public-display.php

    r1378470 r1397737  
    3030                    <div class="modal-body">
    3131                        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
    32                         <?php
    3332
    34                             if( get_option('users_can_register') ){ ?>
     33                        <!-- Register form -->
     34                        <div class="pt-register">
     35                             
     36                            <h3><?php printf( __('Join %s', 'wp-ajax-login'), get_bloginfo('name') ); ?></h3>
     37                            <hr>
    3538
    36                                 <!-- Register form -->
    37                                 <div class="pt-register">
    38                              
    39                                     <h3><?php printf( __('Join %s', 'wp-ajax-login'), get_bloginfo('name') ); ?></h3>
    40                                     <hr>
     39                            <?php if( get_option('users_can_register') ){ ?>
    4140
    4241                                    <form id="pt_registration_form" action="<?php echo home_url( '/' ); ?>" method="POST">
    … …  
    5857                                    </form>
    5958                                    <div class="pt-errors"></div>
    60                                 </div>
    6159
    6260                            <?php } else {
    63                                 echo '<h3>'.__('Registration is disabled.', 'wp-ajax-login').'</h3>';
     61
     62                                echo '<div class="alert alert-warning">'.__('Registration is disabled.', 'wp-ajax-login').'</div>';
     63
    6464                            } ?>
     65
     66                            </div>
    6567
    6668                                <!-- Login form -->
    … …  
    120122                <?php } else { ?>
    121123                    <div class="modal-body">
    122                         <div class="alert alert-info"><?php $current_user = wp_get_current_user(); printf( __( 'You have already logged in as %1$s. <a href="%2$s">Logout?</a>', 'wp-ajax-login' ), $current_user->user_login, wp_logout_url( home_url() ) );?></div>
     124                        <div class="pt-logout">                         
     125                            <div class="alert alert-info"><?php $current_user = wp_get_current_user(); printf( __( 'You have already logged in as %1$s. <a href="#logout">Logout?</a>', 'wp-ajax-login' ), $current_user->user_login );?></div>
     126                            <div class="pt-errors"></div>
     127                        </div>
    123128                    </div>
    124129                <?php } ?>     
    … …  
    138143function pt_login_link_to_menu ( $items, $args ) {
    139144    if( $args->theme_location == apply_filters('login_menu_location', 'primary') ) {
    140         $items .= '<li class="menu-item login-link"><a href="#pt-login">'.__( 'Login/Register', 'wp-ajax-login' ).'</a></li>';
     145
     146        if ( ! is_user_logged_in() ) {
     147            $text = __( 'Login/Register', 'wp-ajax-login' );
     148        } else {
     149            $text = __( 'Logout?', 'wp-ajax-login' );
     150        }
     151            $items .= '<li class="menu-item login-link"><a href="#pt-login">'.$text.'</a></li>';
     152
    141153    }
    142154    return $items;
Note: See TracChangeset for help on using the changeset viewer.