From 207929f2bad393354e4c1ad705f3977fd7e3fcb3 Mon Sep 17 00:00:00 2001 From: Stephen Abello Date: Wed, 7 Oct 2026 10:14:46 +0200 Subject: [PATCH] =?UTF-8?q?N=C2=B010148=20-=20Change=20the=20way=20Profile?= =?UTF-8?q?s=20are=20retrieved?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Controller/AuthentTokenAjaxController.php | 81 ------------------- 1 file changed, 81 deletions(-) diff --git a/src/Controller/AuthentTokenAjaxController.php b/src/Controller/AuthentTokenAjaxController.php index 84cf245..ecf0758 100644 --- a/src/Controller/AuthentTokenAjaxController.php +++ b/src/Controller/AuthentTokenAjaxController.php @@ -15,7 +15,6 @@ use Combodo\iTop\AuthentToken\Helper\TokenAuthLog; use Combodo\iTop\AuthentToken\Service\PersonalTokenService; use Combodo\iTop\Renderer\BlockRenderer; -use DBObject; use DBObjectSearch; use DBObjectSet; use Dict; @@ -287,86 +286,6 @@ private function FetchToken(\User $oUser, string $sTokenId): ?\DbObject return $oToken; } - private function GetEditLink(DBObject $oObject): ?string - { - $sClass = get_class($oObject); - if (\UserRights::IsActionAllowed($sClass, UR_ACTION_MODIFY, \DBObjectSet::FromObject($oObject)) != UR_ALLOWED_YES) { - return false; - } - - return sprintf( - "%spages/UI.php?operation=modify&class=%s&id=%s", - utils::GetAbsoluteUrlAppRoot(), - $sClass, - $oObject->GetKey() - ); - } - - public function ProvideHtmlUserInfo(\User $oUser, &$aParams): void - { - $aParams['user_link'] = $this->GetEditLink($oUser); - - $oProfileSet = $oUser->Get('profile_list'); - $aProfiles = []; - while (($oProfile = $oProfileSet->Fetch()) != null) { - $aProfiles[] = $oProfile->GetAsHTML('profile'); - } - $sProfileListHtml = implode('
', $aProfiles); - - $oAllowedOrgList = $oUser->Get('allowed_org_list'); - $aAllowedOrgs = []; - while (($oUserOrg = $oAllowedOrgList->Fetch()) != null) { - $aAllowedOrgs[] = $oUserOrg->GetAsHTML('allowed_org_name'); - } - $sAllowedOrgHtml = implode('
', $aAllowedOrgs); - - $aUserInfo = [ - 'login' => null, - 'profile_list' => $sProfileListHtml, - 'org_id' => null, - 'allowed_org_list' => $sAllowedOrgHtml, - ]; - - $this->ConvertToHtml($aParams, $aUserInfo, 'user', $oUser); - } - - public function ProvideHtmlContactInfo(\User $oUser, &$aParams): void - { - if (is_null($oUser)) { - return; - } - - $iPersonId = $oUser->Get('contactid'); - if (0 === $iPersonId) { - return; - } - - $oPerson = MetaModel::GetObject('Person', $iPersonId); - - $aParams['contact_link'] = $this->GetEditLink($oPerson); - $aContactInfo = [ - 'first_name' => null, - 'name' => null, - 'email' => null, - 'phone' => null, - 'location_name' => null, - ]; - - $aParams['contact']['picture'] = UserRights::GetUserPictureAbsUrl($oUser->Get('login'));//$oPerson->GetAsHTML('picture'); - $this->ConvertToHtml($aParams, $aContactInfo, 'contact', $oPerson); - } - - public function ConvertToHtml(&$aParams, $aData, $sKey, DBObject $oObject): void - { - foreach ($aData as $sAttCode => $sAttHtml) { - if ($sAttHtml) { - $aParams[$sKey][MetaModel::GetLabel(get_class($oObject), $sAttCode)] = $sAttHtml; - } else { - $aParams[$sKey][MetaModel::GetLabel(get_class($oObject), $sAttCode)] = $oObject->GetAsHTML($sAttCode); - } - } - } - private function GetFields() { return ["application", "scope", "expiration_date", "use_count", "last_use_date"];