From ebab4f8f96a08a81fa37a5191bb940f8b6f8e468 Mon Sep 17 00:00:00 2001 From: odain Date: Fri, 18 Aug 2023 10:53:03 +0200 Subject: [PATCH] =?UTF-8?q?fix=20merge=20of=20N=C2=B05324=20power=20portal?= =?UTF-8?q?=20branch?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../userrightsprofile.class.inc.php | 3 +- .../userrightsprofile.db.class.inc.php | 63 +++++++++---------- .../userrightsprojection.class.inc.php | 61 +++++++++--------- core/datamodel.core.xml | 1 - lib/composer/autoload_classmap.php | 5 ++ lib/composer/autoload_static.php | 6 +- lib/composer/installed.php | 4 +- 7 files changed, 74 insertions(+), 69 deletions(-) diff --git a/addons/userrights/userrightsprofile.class.inc.php b/addons/userrights/userrightsprofile.class.inc.php index b35793ac2..63a9a0a26 100644 --- a/addons/userrights/userrightsprofile.class.inc.php +++ b/addons/userrights/userrightsprofile.class.inc.php @@ -220,7 +220,6 @@ class URP_UserProfile extends UserRightsBaseClassGUI { $aParams = array ( - "is_link" => true, //since 3.1 N°5324 "category" => "addon/userrights,grant_by_profile,filter", "key_type" => "autoincrement", "name_attcode" => array("userlogin", "profile"), @@ -229,7 +228,7 @@ class URP_UserProfile extends UserRightsBaseClassGUI "db_table" => "priv_urp_userprofile", "db_key_field" => "id", "db_finalclass_field" => "", - "is_link" => true, /** @since 3.1.0 N°6482 */ + "is_link" => true, /** @since 3.1.0 N°6482 N°5324 */ 'uniqueness_rules' => array( 'no_duplicate' => array( 'attributes' => array( diff --git a/addons/userrights/userrightsprofile.db.class.inc.php b/addons/userrights/userrightsprofile.db.class.inc.php index 714fa6ca0..ce7a13ee2 100644 --- a/addons/userrights/userrightsprofile.db.class.inc.php +++ b/addons/userrights/userrightsprofile.db.class.inc.php @@ -23,7 +23,7 @@ define('PORTAL_PROFILE_NAME', 'Portal user'); class UserRightsBaseClassGUI extends cmdbAbstractObject { // Whenever something changes, reload the privileges - + protected function AfterInsert() { UserRights::FlushPrivileges(); @@ -43,7 +43,7 @@ class UserRightsBaseClassGUI extends cmdbAbstractObject class UserRightsBaseClass extends DBObject { // Whenever something changes, reload the privileges - + protected function AfterInsert() { UserRights::FlushPrivileges(); @@ -100,7 +100,7 @@ class URP_Profiles extends UserRightsBaseClassGUI $this->m_bCheckReservedNames = false; } - + protected static $m_aActions = array( UR_ACTION_READ => 'Read', UR_ACTION_MODIFY => 'Modify', @@ -113,7 +113,7 @@ class URP_Profiles extends UserRightsBaseClassGUI protected static $m_aCacheActionGrants = null; protected static $m_aCacheStimulusGrants = null; protected static $m_aCacheProfiles = null; - + public static function DoCreateProfile($sName, $sDescription, $bReservedName = false) { if (is_null(self::$m_aCacheProfiles)) @@ -125,7 +125,7 @@ class URP_Profiles extends UserRightsBaseClassGUI { self::$m_aCacheProfiles[$oProfile->Get('name')] = $oProfile->GetKey(); } - } + } $sCacheKey = $sName; if (isset(self::$m_aCacheProfiles[$sCacheKey])) @@ -137,17 +137,17 @@ class URP_Profiles extends UserRightsBaseClassGUI $oNewObj->Set('description', $sDescription); if ($bReservedName) { - $oNewObj->DisableCheckOnReservedNames(); + $oNewObj->DisableCheckOnReservedNames(); } $iId = $oNewObj->DBInsertNoReload(); - self::$m_aCacheProfiles[$sCacheKey] = $iId; + self::$m_aCacheProfiles[$sCacheKey] = $iId; return $iId; } - + public static function DoCreateActionGrant($iProfile, $iAction, $sClass, $bPermission = true) { $sAction = self::$m_aActions[$iAction]; - + if (is_null(self::$m_aCacheActionGrants)) { self::$m_aCacheActionGrants = array(); @@ -157,7 +157,7 @@ class URP_Profiles extends UserRightsBaseClassGUI { self::$m_aCacheActionGrants[$oGrant->Get('profileid').'-'.$oGrant->Get('action').'-'.$oGrant->Get('class')] = $oGrant->GetKey(); } - } + } $sCacheKey = "$iProfile-$sAction-$sClass"; if (isset(self::$m_aCacheActionGrants[$sCacheKey])) @@ -171,10 +171,10 @@ class URP_Profiles extends UserRightsBaseClassGUI $oNewObj->Set('class', $sClass); $oNewObj->Set('action', $sAction); $iId = $oNewObj->DBInsertNoReload(); - self::$m_aCacheActionGrants[$sCacheKey] = $iId; + self::$m_aCacheActionGrants[$sCacheKey] = $iId; return $iId; } - + public static function DoCreateStimulusGrant($iProfile, $sStimulusCode, $sClass) { if (is_null(self::$m_aCacheStimulusGrants)) @@ -186,7 +186,7 @@ class URP_Profiles extends UserRightsBaseClassGUI { self::$m_aCacheStimulusGrants[$oGrant->Get('profileid').'-'.$oGrant->Get('stimulus').'-'.$oGrant->Get('class')] = $oGrant->GetKey(); } - } + } $sCacheKey = "$iProfile-$sStimulusCode-$sClass"; if (isset(self::$m_aCacheStimulusGrants[$sCacheKey])) @@ -199,13 +199,13 @@ class URP_Profiles extends UserRightsBaseClassGUI $oNewObj->Set('class', $sClass); $oNewObj->Set('stimulus', $sStimulusCode); $iId = $oNewObj->DBInsertNoReload(); - self::$m_aCacheStimulusGrants[$sCacheKey] = $iId; + self::$m_aCacheStimulusGrants[$sCacheKey] = $iId; return $iId; } - + /* * Create the built-in Administrator profile with its reserved name - */ + */ public static function DoCreateAdminProfile() { self::DoCreateProfile(ADMIN_PROFILE_NAME, 'Has the rights on everything (bypassing any control)', true /* reserved name */); @@ -213,7 +213,7 @@ class URP_Profiles extends UserRightsBaseClassGUI /* * Overload the standard behavior to preserve reserved names - */ + */ public function DoCheckToWrite() { parent::DoCheckToWrite(); @@ -255,7 +255,7 @@ class URP_Profiles extends UserRightsBaseClassGUI return ''.Dict::S('UI:UserManagement:ActionAllowed:No').''; } } - + function DoShowGrantSumary($oPage) { if ($this->GetRawName() == "Administrator") @@ -267,7 +267,7 @@ class URP_Profiles extends UserRightsBaseClassGUI // Note: for sure, we assume that the instance is derived from UserRightsProfile $oUserRights = UserRights::GetModuleInstance(); - + $aDisplayData = array(); foreach (MetaModel::GetClasses('bizmodel') as $sClass) { @@ -284,7 +284,7 @@ class URP_Profiles extends UserRightsBaseClassGUI } } $sStimuli = implode(', ', $aStimuli); - + $aDisplayData[] = array( 'class' => MetaModel::GetName($sClass), 'read' => $this->GetGrantAsHtml($oUserRights, $sClass, 'Read'), @@ -296,7 +296,7 @@ class URP_Profiles extends UserRightsBaseClassGUI 'stimuli' => $sStimuli, ); } - + $aDisplayConfig = array(); $aDisplayConfig['class'] = array('label' => Dict::S('UI:UserManagement:Class'), 'description' => Dict::S('UI:UserManagement:Class+')); $aDisplayConfig['read'] = array('label' => Dict::S('UI:UserManagement:Action:Read'), 'description' => Dict::S('UI:UserManagement:Action:Read+')); @@ -326,7 +326,6 @@ class URP_UserProfile extends UserRightsBaseClassGUI { $aParams = array ( - "is_link" => true, //since 3.1 N°5324 "category" => "addon/userrights", "key_type" => "autoincrement", "name_attcode" => array("userlogin", "profile"), @@ -335,7 +334,7 @@ class URP_UserProfile extends UserRightsBaseClassGUI "db_table" => "priv_urp_userprofile", "db_key_field" => "id", "db_finalclass_field" => "", - "is_link" => true, /** @since 3.1.0 N°6482 */ + "is_link" => true, /** @since 3.1.0 N°6482 N°5324 */ ); MetaModel::Init_Params($aParams); //MetaModel::Init_InheritAttributes(); @@ -612,7 +611,7 @@ class UserRightsProfile extends UserRightsAddOnAPI $oSearch->AllowAllData(); $oCondition = new BinaryExpression(new FieldExpression('userid'), '=', new VariableExpression('userid')); $oSearch->AddConditionExpression($oCondition); - + $oUserOrgSet = new DBObjectSet($oSearch, array(), array('userid' => $iUser)); while ($oUserOrg = $oUserOrgSet->Fetch()) { @@ -634,7 +633,7 @@ class UserRightsProfile extends UserRightsAddOnAPI $oSearch->AllowAllData(); $oCondition = new BinaryExpression(new FieldExpression('userid'), '=', new VariableExpression('userid')); $oSearch->AddConditionExpression($oCondition); - + $this->m_aUserProfiles[$iUser] = array(); $oUserProfileSet = new DBObjectSet($oSearch, array(), array('userid' => $iUser)); while ($oUserProfile = $oUserProfileSet->Fetch()) @@ -649,7 +648,7 @@ class UserRightsProfile extends UserRightsAddOnAPI public function ResetCache() { // Loaded by Load cache - $this->m_aProfiles = null; + $this->m_aProfiles = null; $this->m_aUserProfiles = array(); $this->m_aUserOrgs = array(); @@ -659,7 +658,7 @@ class UserRightsProfile extends UserRightsAddOnAPI // Loaded on demand (time consuming as compared to the others) $this->m_aClassActionGrants = null; $this->m_aClassStimulusGrants = null; - + $this->m_aObjectActionGrants = array(); } @@ -695,10 +694,10 @@ class UserRightsProfile extends UserRightsAddOnAPI } $oProfileSet = new DBObjectSet(DBObjectSearch::FromOQL_AllData("SELECT URP_Profiles")); - $this->m_aProfiles = array(); + $this->m_aProfiles = array(); while ($oProfile = $oProfileSet->Fetch()) { - $this->m_aProfiles[$oProfile->GetKey()] = $oProfile; + $this->m_aProfiles[$oProfile->GetKey()] = $oProfile; } $this->m_aClassStimulusGrants = array(); @@ -872,7 +871,7 @@ exit; $this->m_aObjectActionGrants[$iUser][$sClass][$iActionCode] = $aRes; return $aRes; } - + public function IsActionAllowed($oUser, $sClass, $iActionCode, $oInstanceSet = null) { $this->LoadCache(); @@ -1010,8 +1009,8 @@ exit; /** * Find out which attribute is corresponding the the dimension 'owner org' - * returns null if no such attribute has been found (no filtering should occur) - */ + * returns null if no such attribute has been found (no filtering should occur) + */ public static function GetOwnerOrganizationAttCode($sClass) { $sAttCode = null; diff --git a/addons/userrights/userrightsprojection.class.inc.php b/addons/userrights/userrightsprojection.class.inc.php index cc26b1467..e2bf86e0e 100644 --- a/addons/userrights/userrightsprojection.class.inc.php +++ b/addons/userrights/userrightsprojection.class.inc.php @@ -22,9 +22,9 @@ define('ADMIN_PROFILE_ID', 1); class UserRightsBaseClass extends cmdbAbstractObject { // Whenever something changes, reload the privileges - + // Whenever something changes, reload the privileges - + protected function AfterInsert() { UserRights::FlushPrivileges(); @@ -78,7 +78,7 @@ class URP_Profiles extends UserRightsBaseClass function GetGrantAsHtml($oUserRights, $sClass, $sAction) { $oGrant = $oUserRights->GetClassActionGrant($this->GetKey(), $sClass, $sAction); - if (is_object($oGrant) && ($oGrant->Get('permission') == 'yes')) + if (is_object($oGrant) && ($oGrant->Get('permission') == 'yes')) { return ''.Dict::S('UI:UserManagement:ActionAllowed:Yes').''; } @@ -87,7 +87,7 @@ class URP_Profiles extends UserRightsBaseClass return ''.Dict::S('UI:UserManagement:ActionAllowed:No').''; } } - + function DoShowGrantSumary($oPage) { if ($this->GetRawName() == "Administrator") @@ -99,7 +99,7 @@ class URP_Profiles extends UserRightsBaseClass // Note: for sure, we assume that the instance is derived from UserRightsProjection $oUserRights = UserRights::GetModuleInstance(); - + $aDisplayData = array(); foreach (MetaModel::GetClasses('bizmodel') as $sClass) { @@ -116,7 +116,7 @@ class URP_Profiles extends UserRightsBaseClass } } $sStimuli = implode(', ', $aStimuli); - + $aDisplayData[] = array( 'class' => MetaModel::GetName($sClass), 'read' => $this->GetGrantAsHtml($oUserRights, $sClass, 'Read'), @@ -128,7 +128,7 @@ class URP_Profiles extends UserRightsBaseClass 'stimuli' => $sStimuli, ); } - + $aDisplayConfig = array(); $aDisplayConfig['class'] = array('label' => Dict::S('UI:UserManagement:Class'), 'description' => Dict::S('UI:UserManagement:Class+')); $aDisplayConfig['read'] = array('label' => Dict::S('UI:UserManagement:Action:Read'), 'description' => Dict::S('UI:UserManagement:Action:Read+')); @@ -269,7 +269,6 @@ class URP_UserProfile extends UserRightsBaseClass { $aParams = array ( - "is_link" => true, //since 3.1 N°5324 "category" => "addon/userrights", "key_type" => "autoincrement", "name_attcode" => array("userlogin", "profile"), @@ -278,7 +277,7 @@ class URP_UserProfile extends UserRightsBaseClass "db_table" => "priv_urp_userprofile", "db_key_field" => "id", "db_finalclass_field" => "", - "is_link" => true, /** @since 3.1.0 N°6482 */ + "is_link" => true, /** @since 3.1.0 N°6482 N°5324 */ ); MetaModel::Init_Params($aParams); //MetaModel::Init_InheritAttributes(); @@ -357,7 +356,7 @@ class URP_ProfileProjection extends UserRightsBaseClass { $aRes = array($oUser->Get($sColumn)); } - + } elseif (($sExpr == '') || ($sExpr == '')) { @@ -428,14 +427,14 @@ class URP_ClassProjection extends UserRightsBaseClass { $aRes = array($oObject->Get($sColumn)); } - + } elseif (($sExpr == '') || ($sExpr == '')) { $aRes = null; } elseif (strtolower(substr($sExpr, 0, 6)) == 'select') - { + { $sColumn = $this->Get('attribute'); // SELECT... $oValueSetDef = new ValueSetObjects($sExpr, $sColumn, array(), true /*allow all data*/); @@ -586,14 +585,14 @@ class UserRightsProjection extends UserRightsAddOnAPI $oContact->Set('org_id', $iOrgId); $oContact->Set('email', 'my.email@foo.org'); $iContactId = $oContact->DBInsertNoReload(); - + $oUser = new UserLocal(); $oUser->Set('login', $sAdminUser); $oUser->Set('password', $sAdminPwd); $oUser->Set('contactid', $iContactId); $oUser->Set('language', $sLanguage); // Language was chosen during the installation $iUserId = $oUser->DBInsertNoReload(); - + // Add this user to the very specific 'admin' profile $oUserProfile = new URP_UserProfile(); $oUserProfile->Set('userid', $iUserId); @@ -644,24 +643,24 @@ class UserRightsProjection extends UserRightsAddOnAPI // Could be loaded in a shared memory (?) $oDimensionSet = new DBObjectSet(DBObjectSearch::FromOQL_AllData("SELECT URP_Dimensions")); - $this->m_aDimensions = array(); + $this->m_aDimensions = array(); while ($oDimension = $oDimensionSet->Fetch()) { - $this->m_aDimensions[$oDimension->GetKey()] = $oDimension; + $this->m_aDimensions[$oDimension->GetKey()] = $oDimension; } - + $oClassProjSet = new DBObjectSet(DBObjectSearch::FromOQL_AllData("SELECT URP_ClassProjection")); - $this->m_aClassProjs = array(); + $this->m_aClassProjs = array(); while ($oClassProj = $oClassProjSet->Fetch()) { - $this->m_aClassProjs[$oClassProj->Get('class')][$oClassProj->Get('dimensionid')] = $oClassProj; + $this->m_aClassProjs[$oClassProj->Get('class')][$oClassProj->Get('dimensionid')] = $oClassProj; } $oProfileSet = new DBObjectSet(DBObjectSearch::FromOQL_AllData("SELECT URP_Profiles")); - $this->m_aProfiles = array(); + $this->m_aProfiles = array(); while ($oProfile = $oProfileSet->Fetch()) { - $this->m_aProfiles[$oProfile->GetKey()] = $oProfile; + $this->m_aProfiles[$oProfile->GetKey()] = $oProfile; } $oUserProfileSet = new DBObjectSet(DBObjectSearch::FromOQL_AllData("SELECT URP_UserProfile")); @@ -677,10 +676,10 @@ class UserRightsProjection extends UserRightsAddOnAPI } $oProProSet = new DBObjectSet(DBObjectSearch::FromOQL_AllData("SELECT URP_ProfileProjection")); - $this->m_aProPros = array(); + $this->m_aProPros = array(); while ($oProPro = $oProProSet->Fetch()) { - $this->m_aProPros[$oProPro->Get('profileid')][$oProPro->Get('dimensionid')] = $oProPro; + $this->m_aProPros[$oProPro->Get('profileid')][$oProPro->Get('dimensionid')] = $oProPro; } /* @@ -708,7 +707,7 @@ exit; // Authorize any for this dimension, then no additional criteria is required continue; } - + // 1 - Get class projection info // $oExpression = null; @@ -732,13 +731,13 @@ exit; } elseif (strtolower(substr($sExpr, 0, 6)) == 'select') { - throw new CoreException('Sorry, projections by the mean of OQL are not supported currently, please specify an attribute instead', array('class' => $sClass, 'expression' => $sExpr)); + throw new CoreException('Sorry, projections by the mean of OQL are not supported currently, please specify an attribute instead', array('class' => $sClass, 'expression' => $sExpr)); } else { // Constant value(s) // unsupported - throw new CoreException('Sorry, constant projections are not supported currently, please specify an attribute instead', array('class' => $sClass, 'expression' => $sExpr)); + throw new CoreException('Sorry, constant projections are not supported currently, please specify an attribute instead', array('class' => $sClass, 'expression' => $sExpr)); // $aRes = explode(';', trim($sExpr)); } @@ -867,7 +866,7 @@ exit; $this->m_aObjectActionGrants[$oUser->GetKey()][$sClass][$iObjectRef][$iActionCode] = $aRes; return $aRes; } - + public function IsActionAllowed($oUser, $sClass, $iActionCode, $oInstanceSet = null) { if (is_null($oInstanceSet)) @@ -935,7 +934,7 @@ exit; } else { - $iInstancePermission = UR_ALLOWED_NO; + $iInstancePermission = UR_ALLOWED_NO; } if (isset($iGlobalPermission)) @@ -1141,7 +1140,7 @@ exit; } protected $m_aMatchingProfiles = array(); // cache of the matching profiles for a given user/object - + protected function GetMatchingProfiles($oUser, $sClass, /*DBObject*/ $oObject = null) { $iUser = $oUser->GetKey(); @@ -1187,7 +1186,7 @@ exit; @$aProfileRes[$iProfile] += 1; } } - + $aRes = array(); $iDimCount = count($this->m_aDimensions); foreach ($aProfileRes as $iProfile => $iMatches) @@ -1201,7 +1200,7 @@ exit; // store into the cache $this->m_aMatchingProfiles[$iUser][$sClass][$iObjectRef] = $aRes; - return $aRes; + return $aRes; } public function FlushPrivileges() diff --git a/core/datamodel.core.xml b/core/datamodel.core.xml index 6703f758c..d15ca731b 100644 --- a/core/datamodel.core.xml +++ b/core/datamodel.core.xml @@ -57,7 +57,6 @@ cmdbAbstractObject - 1 addon/userrights,grant_by_profile 1 diff --git a/lib/composer/autoload_classmap.php b/lib/composer/autoload_classmap.php index 9dbefd874..21fd3d7f0 100644 --- a/lib/composer/autoload_classmap.php +++ b/lib/composer/autoload_classmap.php @@ -14,6 +14,7 @@ return array( 'AbstractPortalUIExtension' => $baseDir . '/application/applicationextension.inc.php', 'AbstractPreferencesExtension' => $baseDir . '/application/applicationextension.inc.php', 'AbstractWeeklyScheduledProcess' => $baseDir . '/core/backgroundprocess.inc.php', + 'AbstractWelcomePopup' => $baseDir . '/application/applicationextension.inc.php', 'Action' => $baseDir . '/core/action.class.inc.php', 'ActionChecker' => $baseDir . '/core/userrights.class.inc.php', 'ActionEmail' => $baseDir . '/core/action.class.inc.php', @@ -362,6 +363,8 @@ return array( 'Combodo\\iTop\\Application\\UI\\Links\\Set\\BlockLinkSetDisplayAsProperty' => $baseDir . '/sources/Application/UI/Links/Set/BlockLinksSetDisplayAsProperty.php', 'Combodo\\iTop\\Application\\UI\\Links\\Set\\LinkSetUIBlockFactory' => $baseDir . '/sources/Application/UI/Links/Set/LinksSetUIBlockFactory.php', 'Combodo\\iTop\\Application\\UI\\Preferences\\BlockShortcuts\\BlockShortcuts' => $baseDir . '/sources/Application/UI/Preferences/BlockShortcuts/BlockShortcuts.php', + 'Combodo\\iTop\\Application\\UI\\Printable\\BlockPrintHeader\\BlockPrintHeader' => $baseDir . '/sources/Application/UI/Printable/BlockPrintHeader/BlockPrintHeader.php', + 'Combodo\\iTop\\Application\\WelcomePopup\\DefaultWelcomePopup' => $baseDir . '/sources/Application/WelcomePopup/DefaultWelcomePopup.php', 'Combodo\\iTop\\Application\\WelcomePopup\\WelcomePopupService' => $baseDir . '/sources/Application/WelcomePopup/WelcomePopupService.php', 'Combodo\\iTop\\Composer\\iTopComposer' => $baseDir . '/sources/Composer/iTopComposer.php', 'Combodo\\iTop\\Controller\\AbstractController' => $baseDir . '/sources/Controller/AbstractController.php', @@ -372,6 +375,7 @@ return array( 'Combodo\\iTop\\Controller\\OAuth\\OAuthLandingController' => $baseDir . '/sources/Controller/OAuth/OAuthLandingController.php', 'Combodo\\iTop\\Controller\\PreferencesController' => $baseDir . '/sources/Controller/PreferencesController.php', 'Combodo\\iTop\\Controller\\TemporaryObjects\\TemporaryObjectController' => $baseDir . '/sources/Controller/TemporaryObjects/TemporaryObjectController.php', + 'Combodo\\iTop\\Controller\\WelcomePopupController' => $baseDir . '/sources/Controller/WelcomePopupController.php', 'Combodo\\iTop\\Controller\\iController' => $baseDir . '/sources/Controller/iController.php', 'Combodo\\iTop\\Core\\Authentication\\Client\\OAuth\\IOAuthClientProvider' => $baseDir . '/sources/Core/Authentication/Client/OAuth/IOAuthClientProvider.php', 'Combodo\\iTop\\Core\\Authentication\\Client\\OAuth\\OAuthClientProviderAbstract' => $baseDir . '/sources/Core/Authentication/Client/OAuth/OAuthClientProviderAbstract.php', @@ -2982,6 +2986,7 @@ return array( 'iTopWebPage' => $baseDir . '/sources/Application/WebPage/iTopWebPage.php', 'iTopWizardWebPage' => $baseDir . '/sources/Application/WebPage/iTopWizardWebPage.php', 'iTopXmlException' => $baseDir . '/application/exceptions/iTopXmlException.php', + 'iWelcomePopup' => $baseDir . '/application/applicationextension.inc.php', 'iWorkingTimeComputer' => $baseDir . '/core/computing.inc.php', 'lnkAuditCategoryToAuditDomain' => $baseDir . '/application/audit.domain.class.inc.php', 'lnkTriggerAction' => $baseDir . '/core/trigger.class.inc.php', diff --git a/lib/composer/autoload_static.php b/lib/composer/autoload_static.php index 9ed08828e..03c76eb4c 100644 --- a/lib/composer/autoload_static.php +++ b/lib/composer/autoload_static.php @@ -378,6 +378,7 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f 'AbstractPortalUIExtension' => __DIR__ . '/../..' . '/application/applicationextension.inc.php', 'AbstractPreferencesExtension' => __DIR__ . '/../..' . '/application/applicationextension.inc.php', 'AbstractWeeklyScheduledProcess' => __DIR__ . '/../..' . '/core/backgroundprocess.inc.php', + 'AbstractWelcomePopup' => __DIR__ . '/../..' . '/application/applicationextension.inc.php', 'Action' => __DIR__ . '/../..' . '/core/action.class.inc.php', 'ActionChecker' => __DIR__ . '/../..' . '/core/userrights.class.inc.php', 'ActionEmail' => __DIR__ . '/../..' . '/core/action.class.inc.php', @@ -727,7 +728,8 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f 'Combodo\\iTop\\Application\\UI\\Links\\Set\\LinkSetUIBlockFactory' => __DIR__ . '/../..' . '/sources/Application/UI/Links/Set/LinksSetUIBlockFactory.php', 'Combodo\\iTop\\Application\\UI\\Preferences\\BlockShortcuts\\BlockShortcuts' => __DIR__ . '/../..' . '/sources/Application/UI/Preferences/BlockShortcuts/BlockShortcuts.php', 'Combodo\\iTop\\Application\\UI\\Printable\\BlockPrintHeader\\BlockPrintHeader' => __DIR__ . '/../..' . '/sources/Application/UI/Printable/BlockPrintHeader/BlockPrintHeader.php', - 'Combodo\\iTop\\Application\\WelcomePopup\\WelcomePopupService' => __DIR__ . '/../..' . '/sources/Application/WelcomePopup/WelcomePopupService.php', + 'Combodo\\iTop\\Application\\WelcomePopup\\DefaultWelcomePopup' => __DIR__ . '/../..' . '/sources/Application/WelcomePopup/DefaultWelcomePopup.php', + 'Combodo\\iTop\\Application\\WelcomePopup\\WelcomePopupService' => __DIR__ . '/../..' . '/sources/Application/WelcomePopup/WelcomePopupService.php', 'Combodo\\iTop\\Composer\\iTopComposer' => __DIR__ . '/../..' . '/sources/Composer/iTopComposer.php', 'Combodo\\iTop\\Controller\\AbstractController' => __DIR__ . '/../..' . '/sources/Controller/AbstractController.php', 'Combodo\\iTop\\Controller\\AjaxRenderController' => __DIR__ . '/../..' . '/sources/Controller/AjaxRenderController.php', @@ -737,6 +739,7 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f 'Combodo\\iTop\\Controller\\OAuth\\OAuthLandingController' => __DIR__ . '/../..' . '/sources/Controller/OAuth/OAuthLandingController.php', 'Combodo\\iTop\\Controller\\PreferencesController' => __DIR__ . '/../..' . '/sources/Controller/PreferencesController.php', 'Combodo\\iTop\\Controller\\TemporaryObjects\\TemporaryObjectController' => __DIR__ . '/../..' . '/sources/Controller/TemporaryObjects/TemporaryObjectController.php', + 'Combodo\\iTop\\Controller\\WelcomePopupController' => __DIR__ . '/../..' . '/sources/Controller/WelcomePopupController.php', 'Combodo\\iTop\\Controller\\iController' => __DIR__ . '/../..' . '/sources/Controller/iController.php', 'Combodo\\iTop\\Core\\Authentication\\Client\\OAuth\\IOAuthClientProvider' => __DIR__ . '/../..' . '/sources/Core/Authentication/Client/OAuth/IOAuthClientProvider.php', 'Combodo\\iTop\\Core\\Authentication\\Client\\OAuth\\OAuthClientProviderAbstract' => __DIR__ . '/../..' . '/sources/Core/Authentication/Client/OAuth/OAuthClientProviderAbstract.php', @@ -3347,6 +3350,7 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f 'iTopWebPage' => __DIR__ . '/../..' . '/sources/Application/WebPage/iTopWebPage.php', 'iTopWizardWebPage' => __DIR__ . '/../..' . '/sources/Application/WebPage/iTopWizardWebPage.php', 'iTopXmlException' => __DIR__ . '/../..' . '/application/exceptions/iTopXmlException.php', + 'iWelcomePopup' => __DIR__ . '/../..' . '/application/applicationextension.inc.php', 'iWorkingTimeComputer' => __DIR__ . '/../..' . '/core/computing.inc.php', 'lnkAuditCategoryToAuditDomain' => __DIR__ . '/../..' . '/application/audit.domain.class.inc.php', 'lnkTriggerAction' => __DIR__ . '/../..' . '/core/trigger.class.inc.php', diff --git a/lib/composer/installed.php b/lib/composer/installed.php index 5f032ca9e..38c38520e 100644 --- a/lib/composer/installed.php +++ b/lib/composer/installed.php @@ -5,7 +5,7 @@ 'type' => 'project', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), - 'reference' => 'dbf3393c9729a20f0bf389d343507238d61fef56', + 'reference' => '204a6d8e51619cd669c6d9d7722edaa36d1c3394', 'name' => 'combodo/itop', 'dev' => true, ), @@ -25,7 +25,7 @@ 'type' => 'project', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), - 'reference' => 'dbf3393c9729a20f0bf389d343507238d61fef56', + 'reference' => '204a6d8e51619cd669c6d9d7722edaa36d1c3394', 'dev_requirement' => false, ), 'combodo/tcpdf' => array(