Changeset 2896252

Timestamp:

04/09/2023 03:08:02 PM (3 years ago)

Author:

sourcefound

Message:

Version 6.4

Location:

memberfindme-login-connector

Files:

• tags/6.4 (added)
• tags/6.4/memberfindmelogin.php (added)
• tags/6.4/readme.txt (added)
• trunk/memberfindmelogin.php (modified) (6 diffs)
• trunk/readme.txt (modified) (2 diffs)

memberfindme-login-connector/trunk/memberfindmelogin.php

@@ -4 +4 @@
 Plugin URI: https://membershipworks.com
 Description: Provides single sign-on to WordPress for MembershipWorks membership system
-Version: 6.3
+Version: 6.4
 Author: MembershipWorks
 Author URI: https://membershipworks.com
@@ -10 +10 @@
 */
 
-/*  Copyright 2013-2022  SOURCEFOUND INC.  (email : [email protected])
+/*  Copyright 2013-2023  SOURCEFOUND INC.  (email : [email protected])
 
     This program is free software; you can redistribute it and/or modify
@@ -179 +179 @@
     $act=isset($_REQUEST['action'])?$_REQUEST['action']:'login';
     $msg=false;
-    $id=empty($_POST['log'])?false:username_exists(sanitize_user($_POST['log']));
-    if ($id!==false&&get_user_meta($id,'SF_ID',true))
-        $id=false;
-    if ($act!='sf_login'&&$id!==false)
-        return; // do standard WP login
-    if (!empty($_POST['log'])&&strpos($_POST['log'],'@')&&!empty($_POST['pwd'])&&($set=get_option('sf_set'))&&!empty($set['org'])&&defined('SF_WPL')) {
-        $eml=trim(strtolower($_POST['log']));
-        $pwd=trim(strtolower($_POST['pwd']));
+    if (!defined('SF_WPL')||defined('SF_WPL_LOGIN')||empty($_POST['log'])||!strpos($_POST['log'],'@')||empty($_POST['pwd'])) {
+        // do nothing
+    } else if (($id=username_exists(sanitize_user($_POST['log'])))&&!get_user_meta($id,'SF_ID',true)) {
+        // do standard WP login
+    } else if (($set=get_option('sf_set'))&&!empty($set['org'])) {
+        define('SF_WPL_LOGIN',true);
+        $user_login=$_POST['log'];
+        $user_password=$_POST['pwd'];
         for($try=0;$try<3;$try++) {
-            $rsp=wp_remote_post((empty($set['ssl'])||$set['ssl']!='2'?'https':'http').'://api.membershipworks.com/v1/usr',array('method'=>'POST','headers'=>array('from'=>isset($_SERVER['HTTP_X_FORWARDED_FOR'])?$_SERVER['HTTP_X_FORWARDED_FOR']:$_SERVER['REMOTE_ADDR']),'user-agent'=>$_SERVER['HTTP_USER_AGENT'],'body'=>array('org'=>$set['org'],'eml'=>$eml,'pwd'=>$pwd)));
+            $rsp=wp_remote_post((empty($set['ssl'])||$set['ssl']!='2'?'https':'http').'://api.membershipworks.com/v1/usr',array('method'=>'POST','headers'=>array('from'=>isset($_SERVER['HTTP_X_FORWARDED_FOR'])?$_SERVER['HTTP_X_FORWARDED_FOR']:$_SERVER['REMOTE_ADDR']),'user-agent'=>$_SERVER['HTTP_USER_AGENT'],'body'=>array('org'=>$set['org'],'eml'=>$user_login,'pwd'=>$user_password)));
             if (is_wp_error($rsp)) usleep(100000); else break;
         }
@@ -205 +205 @@
             add_filter('send_password_change_email','__return_false');
             if (is_null($id)||$id===false) {
-                $id=wp_create_user($rsp['uid'],$pwd,$eml);
+                $id=wp_create_user($rsp['uid'],$user_password,$user_login);
                 if (is_wp_error($id)&&$id->get_error_code()=='existing_user_email')
-                    $id=wp_create_user($rsp['uid'],$pwd);
+                    $id=wp_create_user($rsp['uid'],$user_password);
                 $doc['show_admin_bar_front']='false';
             } else {
-                wp_update_user(array('ID'=>$id,'user_email'=>$eml)); // update email separately
-                wp_set_password($pwd,$id); // update password separately
+                wp_update_user(array('ID'=>$id,'user_email'=>$user_login)); // update email separately
+                wp_set_password($user_password,$id); // update password separately
             }
             if (!is_null($id)&&$id!==false&&!is_wp_error($id)) {
@@ -219 +219 @@
                 setcookie('SFSF',rawurlencode($rsp['SF']),time()+8640000,'/');
                 if ($act=='sf_login') {
-                    $user=wp_signon(array('user_login'=>$rsp['uid'],'user_password'=>$pwd,'remember'=>true),force_ssl_admin()||!empty($_SERVER['HTTPS'])?true:false);
+                    $user=wp_signon(array('user_login'=>$rsp['uid'],'user_password'=>$user_password,'remember'=>true),force_ssl_admin()||!empty($_SERVER['HTTPS'])?true:false);
                     $msg=is_wp_error($user)?('Could not synchronize login '.$user->get_error_message()):'OK';
                 } else {
                     $_POST['log']=$rsp['uid'];
-                    $_POST['pwd']=$pwd;
+                    $_POST['pwd']=$user_password;
                 }
             } else if ($act=='sf_login') {
@@ -241 +241 @@
 }
 add_action('login_form_login','sf_login');
+
+function sf_authenticate(&$user_login,&$user_password) {
+    if (!defined('SF_WPL')||defined('SF_WPL_LOGIN')||empty($user_login)||!strpos($user_login,'@')||empty($user_password)) {
+        // do nothing
+    } else if (($id=username_exists(sanitize_user($user_login)))&&!get_user_meta($id,'SF_ID',true)) {
+        // do standard WP login
+    } else if (($set=get_option('sf_set'))&&!empty($set['org'])) {
+        define('SF_WPL_LOGIN',true);
+        for($try=0;$try<3;$try++) {
+            $rsp=wp_remote_post((empty($set['ssl'])||$set['ssl']!='2'?'https':'http').'://api.membershipworks.com/v1/usr',array('method'=>'POST','headers'=>array('from'=>isset($_SERVER['HTTP_X_FORWARDED_FOR'])?$_SERVER['HTTP_X_FORWARDED_FOR']:$_SERVER['REMOTE_ADDR']),'user-agent'=>$_SERVER['HTTP_USER_AGENT'],'body'=>array('org'=>$set['org'],'eml'=>$user_login,'pwd'=>$user_password)));
+            if (is_wp_error($rsp)) usleep(100000); else break;
+        }
+        if (!is_wp_error($rsp)&&($rsp=json_decode($rsp['body'],true))&&!empty($rsp['uid'])) {
+            $nam=empty($rsp['nam'])?(empty($rsp['ctc'])?(empty($rsp['biz'])?'':$rsp['biz']):$rsp['ctc']):$rsp['nam'];
+            $doc=array('nickname'=>$nam,'user_nicename'=>$nam,'display_name'=>$nam);
+            if (isset($rsp['url'])) $doc['user_url']=$rsp['url'];
+            $id=username_exists($rsp['uid']);
+            if (is_null($id)||$id===false) {
+                $id=wp_create_user($rsp['uid'],$user_password,$user_login);
+                if (is_wp_error($id)&&$id->get_error_code()=='existing_user_email')
+                    $id=wp_create_user($rsp['uid'],$user_password);
+                $doc['show_admin_bar_front']='false';
+            } else {
+                wp_update_user(array('ID'=>$id,'user_email'=>$user_login)); // update email separately
+                wp_set_password($user_password,$id); // update password separately
+            }
+            if (!is_null($id)&&$id!==false&&!is_wp_error($id)) {
+                $doc['ID']=$id;
+                wp_update_user($doc); // update names separately
+                update_user_meta($id,'SF_ID',$rsp['uid']);
+                setcookie('SFSF',rawurlencode($rsp['SF']),time()+8640000,'/');
+                $user_login=$rsp['uid'];
+            }
+        }
+    }
+}
+add_action('wp_authenticate','sf_authenticate',1,2);
 
 function sf_logout() {

memberfindme-login-connector/trunk/readme.txt

@@ -4 +4 @@
 Tags: membershipworks, memberfindme, membership management, membership, member login, billing, member access, member content
 Requires at least: 4.0
-Tested up to: 6.1.1
-Stable tag: 6.3
+Tested up to: 6.2
+Stable tag: 6.4
 License: GPL2
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -169 +169 @@
 = 6.3 =
 * Fixes issue where user sees session expired message after signing out via widget
+
+= 6.4 =
+* Provides compatibility with WooCommerce login form