Merge branch 'master' of https://github.com/unaio/una

modules/base/connect/classes/BxBaseModConnectModule.php

@@ -211,7 +211,7 @@ class BxBaseModConnectModule extends BxBaseModGeneralModule
                 $iProfileId = $iAccountProfileId;
             }
 
-            $oAccount = BxDolAccount::getInstance();
+            $oAccount = BxDolAccount::getInstance($iAccountId);
             if ($oAccount)
                 $oAccount->updateEmailConfirmed($this->_oConfig->isAlwaysConfirmEmail);
 

modules/boonex/azure_connect/classes/BxAzrConModule.php

@@ -149,7 +149,7 @@ class BxAzrConModule extends BxBaseModConnectModule
         $aProfileFields['fullname'] = !empty($aProfileInfo['givenName']) ? $aProfileInfo['givenName'] : $aProfileFields['name'];
         $aProfileFields['last_name'] = !empty($aProfileInfo['surname']) ? ' ' . $aProfileInfo['surname'] : '';
         $aProfileFields['email'] = isset($aProfileInfo['mail']) ? $aProfileInfo['mail'] : $aProfileInfo['userPrincipalName'];
-        $aProfileFields['picture'] = false; // isset($aProfileInfo['picture']) ? $aProfileInfo['picture'] : '';
+        $aProfileFields['picture'] = ''; // isset($aProfileInfo['picture']) ? $aProfileInfo['picture'] : '';
         $aProfileFields['allow_view_to'] = getParam('bx_azrcon_privacy');
 
         return $aProfileFields;

modules/boonex/azure_connect/install/sql/enable.sql

@@ -36,7 +36,7 @@ INSERT INTO `sys_options` (`name`, `value`, `category_id`, `caption`, `type`, `c
 ('bx_azrcon_client_id', '', @iCategId, '_bx_azrcon_option_client_id', 'digit', '', '', 22, ''),
 ('bx_azrcon_secret', '', @iCategId, '_bx_azrcon_option_secret', 'digit', '', '', 24, ''),
 ('bx_azrcon_redirect_page', 'index', @iCategId, '_sys_connect_option_redirect', 'select', '', '', 40, 'join,settings,dashboard,index'),
-('bx_azrcon_module', 'bx_persons', @iCategId, '_sys_connect_option_module', 'select', '', '', 50, 'a:2:{s:6:"module";s:12:"bx_azrcon";s:6:"method";s:20:"get_profiles_modules";}'),
+('bx_azrcon_module', 'bx_persons', @iCategId, '_sys_connect_option_module', 'select', '', '', 50, 'a:2:{s:6:"module";s:9:"bx_azrcon";s:6:"method";s:20:"get_profiles_modules";}'),
 ('bx_azrcon_privacy', '3', @iCategId, '_sys_connect_option_privacy', 'select', '', '', 54, 'a:2:{s:6:"module";s:12:"bx_azrcon";s:6:"method";s:18:"get_privacy_groups";}'),
 ('bx_azrcon_confirm_email', 'on', @iCategId, '_sys_connect_option_confirm_email', 'checkbox', '', '', 70, ''),
 ('bx_azrcon_approve', '', @iCategId, '_sys_connect_option_approve', 'checkbox', '', '', 80, '');