Changeset 1963445

Timestamp:

10/26/2018 10:34:41 AM (7 years ago)

Author:

rublon

Message:

Changes for version 3.2.11

Location:

rublon/trunk/includes

Files:

• rublon2factor_cookies.php (modified) (1 diff)
• rublon2factor_helper.php (modified) (2 diffs)
• rublon2factor_hooks.php (modified) (1 diff)

rublon/trunk/includes/rublon2factor_cookies.php

@@ -330 +330 @@
 
         $user_id = RublonHelper::getUserId($user);
-        $settings = RublonHelper::getSettings();
+
+        if (RublonMultisiteHelper::isMultisite()) {
+            $settings = RublonMultisiteHelper::getNetworkSettings();
+        } else {
+            $settings = RublonHelper::getSettings();
+        }
         
         if (version_compare($plugin_version, '2.0.2', 'lt')) {

rublon/trunk/includes/rublon2factor_helper.php

@@ -1354 +1354 @@
                 add_filter('auth_cookie', array(__CLASS__, 'associateSessionWithDevice'), 10, 5);
                 RublonCookies::setLoggedInCookie($user, $remember);
-                RublonCookies::setAuthCookie($user, $remember);                         
+                RublonCookies::setAuthCookie($user, $remember);
                 do_action('wp_login', $user->user_login, $user);
 
@@ -1796 +1796 @@
                         $no_code = true;
                         break;
+                    case 'RC_NETWORK_USER_NOT_BELONGS_TO_BLOG': //Multisite error
+                        $errorMessage = __('<strong>ERROR:</strong> Network user doesn\'t belong to blog.', 'rublon');
+                        $no_code = true;
+                        break;
 
                     // --- Newsletter subscription exceptions --- //

rublon/trunk/includes/rublon2factor_hooks.php

@@ -89 +89 @@
 function rublon2factor_authenticate($user, $username, $password) {
 
-    $user = wp_authenticate_username_password($user, $username, $password);
-    
-    if (is_wp_error($user)) {       
-        return $user;
-    } else {
-        do_action('rublon_pre_authenticate', $user);
-        $user_id = RublonHelper::getUserId($user);      
-        if (is_user_member_of_blog($user_id) && RublonHelper::isSiteRegistered() && !RublonHelper::isXMLRPCEnabled()) {
-            RublonHelper::my_wp_logout();
-            $remember = !empty($_POST['rememberme']);
-            $authURL = RublonHelper::authenticateWithRublon($user, $remember);          
-            if (empty($authURL)) {
-                
-                if (RublonHelper::canShowBusinessEditionUpgradeBoxAfterLogin($user)) {
-                    RublonHelper::setMessage('BUSINESS_EDITION_UPGRADE_BOX', 'updated', 'RC');
-                }
-                
-                $levels = RublonRolesProtection::getProtectionTypesLevels();
-                if ($levels[RublonHelper::getUserProtectionType()] >= $levels[RublonHelper::PROTECTION_TYPE_MOBILE]) {
-                    $user_email = RublonHelper::getUserEmail($user);
-                    $obfuscated_email = RublonHelper::obfuscateEmail($user_email);
-                    RublonHelper::setMessage('ROLE_BLOCKED|' . base64_encode($obfuscated_email), 'error', 'LM');
-                    $return_page = RublonHelper::getReturnPage();
-                    wp_safe_redirect(wp_login_url($return_page));
-                    exit();
-                } else {
-                    RublonHelper::setMobileUserStatus($user, RublonHelper::NO);
-                    return $user;
-                }               
-            } else {                                                                
-                RublonHelper::setLoginToken($user);
-                wp_redirect($authURL);
-                exit();
-            }
-        } else {
-            return $user;
-        }
-    }
+    $user = wp_authenticate_username_password($user, $username, $password);
+
+    if (is_wp_error($user)) {
+        return $user;
+    } else {
+        do_action('rublon_pre_authenticate', $user);
+        $user_id = RublonHelper::getUserId($user);
+        if (!RublonHelper::isUserAuthenticated($user) || (is_user_member_of_blog($user_id) && RublonHelper::isSiteRegistered() && !RublonHelper::isXMLRPCEnabled()) ) {
+            RublonHelper::my_wp_logout();
+            $remember = !empty($_POST['rememberme']);
+            $authURL = RublonHelper::authenticateWithRublon($user, $remember);
+            if (empty($authURL)) {
+
+                if (RublonHelper::canShowBusinessEditionUpgradeBoxAfterLogin($user)) {
+                    RublonHelper::setMessage('BUSINESS_EDITION_UPGRADE_BOX', 'updated', 'RC');
+                }
+
+                $levels = RublonRolesProtection::getProtectionTypesLevels();
+                if ($levels[RublonHelper::getUserProtectionType()] >= $levels[RublonHelper::PROTECTION_TYPE_MOBILE]) {
+                    $user_email = RublonHelper::getUserEmail($user);
+                    $obfuscated_email = RublonHelper::obfuscateEmail($user_email);
+                    RublonHelper::setMessage('ROLE_BLOCKED|' . base64_encode($obfuscated_email), 'error', 'LM');
+                    $return_page = RublonHelper::getReturnPage();
+                    wp_safe_redirect(wp_login_url($return_page));
+                    exit();
+                } else {
+                    RublonHelper::setMobileUserStatus($user, RublonHelper::NO);
+                    return $user;
+                }
+            } else {
+                RublonHelper::setLoginToken($user);
+                wp_redirect($authURL);
+                exit();
+            }
+        } else {
+
+            if (!is_user_member_of_blog($user_id) && RublonMultisiteHelper::isMultisite()) {
+                RublonHelper::setMessage('NETWORK_USER_NOT_BELONGS_TO_BLOG', 'error', 'RC');
+                RublonHelper::my_wp_logout();
+                wp_safe_redirect(wp_login_url());
+                exit;
+            }
+
+            return $user;
+        }
+    }
 }