+ * sha1;subject
+ * a6aa183e2;:bookmark: Prepare 2.7.5
+ *
+ */
+
+
+if (count($argv) === 1) {
+ echo '⚠ You must pass the base tag/sha1 as parameter';
+ exit(1);
+}
+$sBaseReference = $argv[1];
+
+
+//--- Get log
+$sGitLogCommand = 'git log --decorate --pretty="%h;%s" --date-order --no-merges '.$sBaseReference.'..HEAD';
+$sGitLogRaw = shell_exec($sGitLogCommand);
+
+
+//--- Analyze log
+$aGitLogLines = preg_split('/\n/', trim($sGitLogRaw));;
+$aLogLinesWithBugRef = [];
+$aLogLineNoBug = [];
+foreach ($aGitLogLines as $sLogLine) {
+ $sBugRef = preg_match('/[nN]°(\d{3,4})/', $sLogLine, $aLineBugRef);
+ if (($sBugRef === false) || empty($aLineBugRef)) {
+ $aLogLineNoBug[] = $sLogLine;
+ continue;
+ }
+
+ $iBugId = $aLineBugRef[1];
+ $sSha = substr($sLogLine, 0, 9);
+
+ if (array_key_exists($iBugId, $aLogLinesWithBugRef)) {
+ $aBugShaRefs = $aLogLinesWithBugRef[$iBugId];
+ $aBugShaRefs[] = $sSha;
+ $aLogLinesWithBugRef[$iBugId] = $aBugShaRefs;
+ } else {
+ $aLogLinesWithBugRef[$iBugId] = [$sSha];
+ }
+}
+$aBugsList = array_keys($aLogLinesWithBugRef);
+sort($aBugsList, SORT_NUMERIC);
+
+
+//-- Output results
+echo "# Bugs included\n";
+echo "Bug_ref;Bug_URL;sha1\n";
+foreach ($aBugsList as $sBugRef) {
+ $sShaRefs = implode('|', $aLogLinesWithBugRef[$sBugRef]);
+ echo "{$sBugRef};https://support.combodo.com/pages/UI.php?operation=details&class=Bug&id={$sBugRef};$sShaRefs\n";
+}
+echo "\n";
+echo "# Logs line without bug referenced\n";
+echo "sha1;subject\n";
+foreach ($aLogLineNoBug as $sLogLine) {
+ echo "$sLogLine\n";
+}
\ No newline at end of file
diff --git a/.make/release/update-versions.php b/.make/release/update-versions.php
index 0f1dcd24e..488131d4b 100644
--- a/.make/release/update-versions.php
+++ b/.make/release/update-versions.php
@@ -25,7 +25,6 @@ require_once (__DIR__.DIRECTORY_SEPARATOR.'update.classes.inc.php');
/** @var \FileVersionUpdater[] $aFilesUpdaters */
$aFilesUpdaters = array(
new iTopVersionFileUpdater(),
- new CssVariablesFileUpdater(),
new DatamodelsModulesFiles(),
);
diff --git a/.make/release/update.classes.inc.php b/.make/release/update.classes.inc.php
index 6e20ee0d7..d344455c0 100644
--- a/.make/release/update.classes.inc.php
+++ b/.make/release/update.classes.inc.php
@@ -89,26 +89,6 @@ class iTopVersionFileUpdater extends AbstractSingleFileVersionUpdater
}
}
-class CssVariablesFileUpdater extends AbstractSingleFileVersionUpdater
-{
- public function __construct()
- {
- parent::__construct('css/css-variables.scss');
- }
-
- /**
- * @inheritDoc
- */
- public function UpdateFileContent($sVersionLabel, $sFileContent, $sFileFullPath)
- {
- return preg_replace(
- '/(\$version: "v)[^"]*(";)/',
- '${1}'.$sVersionLabel.'${2}',
- $sFileContent
- );
- }
-}
-
abstract class AbstractGlobFileVersionUpdater extends FileVersionUpdater
{
protected $sGlobPattern;
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 646fbafdb..2d03f2bdb 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -42,7 +42,7 @@ If you want to use another license, you may [create an extension][wiki new ext].
When we first start with Git, we were using the [GitFlow](https://nvie.com/posts/a-successful-git-branching-model/) branch model. As
there was some confusions about branches to use for current developed release and previous maintained release, and also because we were
using just a very few of the GitFlow commands, we decided to add just a little modification to this branch model : since april 2020
- we don't have anymore a `master` branch.
+ we don't have a `master` branch anymore.
Here are the branches we use and their meaning :
@@ -52,23 +52,23 @@ Here are the branches we use and their meaning :
For example, if no version is currently prepared for shipping we could have:
-- `develop` containing future 2.8.0 version
+- `develop` containing future 3.0.0 version
- `support/2.7`: 2.7.x maintenance version
- `support/2.6`: 2.6.x maintenance version
- `support/2.5`: 2.5.x maintenance version
-In this example, when 2.8.0-beta is shipped that will become:
+In this example, when 3.0.0-beta is shipped that will become:
-- `develop`: future 2.9.0 version
-- `release/2.8.0`: 2.8.0-beta
+- `develop`: future 3.1.0 version
+- `release/3.0.0`: 3.0.0-beta
- `support/2.7`: 2.7.x maintenance version
- `support/2.6`: 2.6.x maintenance version
- `support/2.5`: 2.5.x maintenance version
-And when 2.8.0 final will be out:
+And when 3.0.0 final will be out:
-- `develop`: future 2.9.0 version
-- `support/2.8`: 2.8.x maintenance version (will host developments for 2.8.1)
+- `develop`: future 3.1.0 version
+- `support/3.0`: 3.0.x maintenance version (will host developments for 3.0.1)
- `support/2.7`: 2.7.x maintenance version
- `support/2.6`: 2.6.x maintenance version
- `support/2.5`: 2.5.x maintenance version
@@ -125,8 +125,7 @@ Our tests are located in the `test/` directory, containing a PHPUnit config file
* ⬆️ `:arrow_up:` when upgrading dependencies
* ⬇️ `:arrow_down:` when downgrading dependencies
* ♻️ `:recycle:` code refactoring
- * 💄 `:lipstick:` Updating the UI and style files.
-
+ * 💄 `:lipstick:` Updating the UI and style files.
## 👥 Pull request
@@ -137,3 +136,25 @@ When your code is working, please:
* create a pull request.
Detailed procedure to work on fork and create PR is available [in GitHub help pages](https://help.github.com/articles/creating-a-pull-request-from-a-fork/).
+
+You might check the ["Allow edits from maintainers" PR checkbox][allow_edits_checkbox] to ease review.
+
+[allow_edits_checkbox]: https://docs.github.com/en/github/collaborating-with-issues-and-pull-requests/working-with-forks/allowing-changes-to-a-pull-request-branch-created-from-a-fork#enabling-repository-maintainer-permissions-on-existing-pull-requests
+
+### 🙏 We are thankful
+
+We are thankful for all your contributions to the iTop universe! As a thank you gift, we will send stickers to every iTop (& extensions) contributors!
+
+Stickers' design might change from one year to another. For the first year we wanted to try a "craft beer label" look, see examples below:
+
+* Bug hunter: Fix a bug
+* Translator: Add/update translations
+* White hat: Find and/or fix a vulnerability
+* Contributor: Contribute by finding a bug, making an extension or any other way
+* Partner: For Combodo's official partners
+* Graduated: Follow a Combodo's iTop training
+* Ambassador: Outstanding community contributors
+* Beta tester: Test and give feedback on beta releases
+* Extension developer: Develop and publish an extension
+
+
diff --git a/Jenkinsfile b/Jenkinsfile
index 32c49f9b7..56f298717 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,73 +1,11 @@
-pipeline {
- agent any
- parameters {
- booleanParam(name: 'debugMode', defaultValue: 'false', description: 'Debug mode?')
- string(name: 'testFile', defaultValue: '', description: 'Provide test file to execute. Example: test/core/LogAPITest.php')
- booleanParam(name: 'coverture', defaultValue: 'false', description: 'Test coverture?')
- booleanParam(name: 'runNonRegOQLTests', defaultValue: 'false', description: 'Do You want to run legacy OQL regression tests?')
- }
- stages {
+def infra
- stage('init') {
- parallel {
- stage('debug') {
- steps {
- sh './.jenkins/bin/init/debug.sh'
- }
- }
- stage('append files to project') {
- steps {
- sh './.jenkins/bin/init/append_files.sh'
- }
- }
- stage('composer install') {
- steps {
- sh './.jenkins/bin/init/composer_install.sh'
- }
- }
- }
- }
+node(){
+ checkout scm
- stage('unattended_install') {
- parallel {
- stage('unattended_install default env') {
- steps {
- sh './.jenkins/bin/unattended_install/default_env.sh'
- }
- }
- }
- }
-
- stage('test') {
- parallel {
- stage('phpunit') {
- steps {
- sh './.jenkins/bin/tests/phpunit.sh ${debugMode} ${runNonRegOQLTests} "${coverture}" "${testFile}"'
- }
- }
- }
- }
-
- }
-
- post {
- always {
- archiveArtifacts allowEmptyArchive:true, excludes: '.gitkeep', artifacts: 'var/test/*.xml'
- junit 'var/test/phpunit-log.junit.xml'
- }
- failure {
- slackSend(channel: "#jenkins-itop", color: '#FF0000', message: "Ho no! Build failed! (${currentBuild.result}), Job '${env.JOB_NAME_UNESCAPED} [${env.BUILD_NUMBER}]' (${env.BUILD_URL})")
- }
- fixed {
- slackSend(channel: "#jenkins-itop", color: '#FFa500', message: "Yes! Build repaired! (${currentBuild.result}), Job '${env.JOB_NAME_UNESCAPED} [${env.BUILD_NUMBER}]' (${env.BUILD_URL})")
- }
- }
-
- environment {
- DEBUG_UNIT_TEST = '0'
- JOB_NAME_UNESCAPED = env.JOB_NAME.replaceAll("%2F", "/")
- }
- options {
- timeout(time: 20, unit: 'MINUTES')
- }
+ infra = load '/var/lib/jenkins/workspace/itop-test-infra_master/src/Infra.groovy'
}
+
+
+infra.call()
+
diff --git a/README.md b/README.md
index cfb243b02..b291bbc3d 100644
--- a/README.md
+++ b/README.md
@@ -72,50 +72,57 @@ iTop development is sponsored, led and supported by [Combodo][0].
## Contributors
-We would like to give a special thank you to the people from the community who contributed to this project, including:
+We would like to give a special thank you 🤗 to the people from the community who contributed to this project, including:
### Names
- - Alves, David
- - Beck, Pedro
- - Bilger, Jean-François
- - Bostoen, Jeffrey
- - Cardoso, Anderson
- - Cassaro, Bruno
- - Casteleyn, Thomas
- - Castro, Randall Badilla
- - Colantoni, Maria Laura
- - Couronné, Guy
- - Dvořák, Lukáš
- - Goethals, Stefan
- - Gumble, David
- - Hippler, Lars
- - Khamit, Shamil
- - Kincel, Martin
- - Konečný, Kamil
- - Kunin, Vladimir
- - Lassiter, Dennis
- - Lazcano, Federico
- - Lucas, Jonathan
- - Malik, Remie
- - Rosenke, Stephan
- - Seki, Shoji
- - Shilov, Vladimir
- - Tulio, Marco
- - Turrubiates, Miguel
+
+- Alves, David
+- Beck, Pedro
+- Bilger, Jean-François
+- Bostoen, Jeffrey (a.k.a @jbostoen)
+- Cardoso, Anderson
+- Cassaro, Bruno
+- Casteleyn, Thomas (a.k.a @Hipska)
+- Castro, Randall Badilla
+- Colantoni, Maria Laura
+- Couronné, Guy
+- Dvořák, Lukáš
+- Goethals, Stefan
+- Gumble, David
+- Kaltefleiter, Lars (a.k.a @larhip)
+- Khamit, Shamil
+- Kincel, Martin
+- Konečný, Kamil
+- Kunin, Vladimir
+- Lassiter, Dennis
+- Lazcano, Federico
+- Lucas, Jonathan
+- Malik, Remie
+- Mindêllo de Andrade, Lucas (a.k.a @rokam)
+- Raenker, Martin
+- Rosenke, Stephan
+- Seki, Shoji
+- Shilov, Vladimir
+- Stukalov, Ilya (a.k.a @ilya-stukalov)
+- Tulio, Marco
+- Turrubiates, Miguel
### Aliases
- - chifu1234
- - cprobst
- - Karkoff1212
- - larhip
- - Laura
- - Purple Grape
- - Schlobinux
- - theBigOne
- - ulmerspatz
+
+- chifu1234
+- cprobst
+- DudekArtur
+- Karkoff1212
+- Laura
+- Purple Grape
+- Schlobinux
+- theBigOne
+- ulmerspatz
### Companies
- - Hardis
- - ITOMIG
- - Pimkie
+
+- [Hardis](https://www.hardis-group.com/)
+- [ITOMIG](https://www.itomig.de/)
+- [Pimkie](https://www.pimkie.com/)
+- [Super-Visions](https://www.super-visions.com/)
diff --git a/SECURITY.md b/SECURITY.md
index 360d282f7..0c0cd411f 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -9,7 +9,7 @@ responsible disclosure and will make every effort to acknowledge your contributi
### iTop vulnerabilities
Please send a procedure to reproduce iTop vulnerabilities to [itop-security@combodo.com](mailto:itop-security@combodo.com).
-You can send us a standard "given / then / when" report, including iTop version, impacts, and maybe installed modules or data if they are
+You can send us a standard "given / when / then" report, including iTop version, impacts, and maybe installed modules or data if they are
needed to reproduce.
### Dependencies vulnerabilities
diff --git a/addons/userrights/userrightsmatrix.class.inc.php b/addons/userrights/userrightsmatrix.class.inc.php
index 4141cfffb..d80af3ed0 100644
--- a/addons/userrights/userrightsmatrix.class.inc.php
+++ b/addons/userrights/userrightsmatrix.class.inc.php
@@ -1,5 +1,5 @@
"addon/userrights,grant_by_profile",
+ "category" => "addon/userrights,grant_by_profile,filter",
"key_type" => "autoincrement",
"name_attcode" => "name",
"state_attcode" => "",
@@ -55,7 +42,6 @@ class URP_Profiles extends UserRightsBaseClassGUI
"db_table" => "priv_urp_profiles",
"db_key_field" => "id",
"db_finalclass_field" => "",
- "display_template" => "",
);
MetaModel::Init_Params($aParams);
//MetaModel::Init_InheritAttributes();
@@ -170,11 +156,9 @@ class URP_Profiles extends UserRightsBaseClassGUI
function DisplayBareRelations(WebPage $oPage, $bEditMode = false)
{
parent::DisplayBareRelations($oPage, $bEditMode);
- if (!$bEditMode)
- {
- $oPage->SetCurrentTab('UI:UserManagement:GrantMatrix');
- $this->DoShowGrantSumary($oPage);
- }
+
+ $oPage->SetCurrentTab('UI:UserManagement:GrantMatrix');
+ $this->DoShowGrantSumary($oPage);
}
public static function GetReadOnlyAttributes()
@@ -235,15 +219,14 @@ class URP_UserProfile extends UserRightsBaseClassGUI
{
$aParams = array
(
- "category" => "addon/userrights,grant_by_profile",
+ "category" => "addon/userrights,grant_by_profile,filter",
"key_type" => "autoincrement",
- "name_attcode" => "userid",
+ "name_attcode" => array("userlogin", "profile"),
"state_attcode" => "",
"reconc_keys" => array(),
"db_table" => "priv_urp_userprofile",
"db_key_field" => "id",
"db_finalclass_field" => "",
- "display_template" => "",
);
MetaModel::Init_Params($aParams);
//MetaModel::Init_InheritAttributes();
@@ -263,24 +246,56 @@ class URP_UserProfile extends UserRightsBaseClassGUI
MetaModel::Init_SetZListItems('advanced_search', array('userid', 'profileid')); // Criteria of the advanced search form
}
- public function GetName()
- {
- return Dict::Format('UI:UserManagement:LinkBetween_User_And_Profile', $this->Get('userlogin'), $this->Get('profile'));
- }
-
public function CheckToDelete(&$oDeletionPlan)
{
- if (MetaModel::GetConfig()->Get('demo_mode'))
- {
+ if (MetaModel::GetConfig()->Get('demo_mode')) {
// Users deletion is NOT allowed in demo mode
$oDeletionPlan->AddToDelete($this, null);
$oDeletionPlan->SetDeletionIssues($this, array('deletion not allowed in demo mode.'), true);
$oDeletionPlan->ComputeResults();
+
return false;
}
+ try {
+ $this->CheckIfProfileIsAllowed(UR_ACTION_DELETE);
+ }
+ catch (SecurityException $e) {
+ // Users deletion is NOT allowed
+ $oDeletionPlan->AddToDelete($this, null);
+ $oDeletionPlan->SetDeletionIssues($this, [$e->getMessage()], true);
+ $oDeletionPlan->ComputeResults();
+
+ return false;
+ }
+
return parent::CheckToDelete($oDeletionPlan);
}
+ public function DoCheckToDelete(&$oDeletionPlan)
+ {
+ if (MetaModel::GetConfig()->Get('demo_mode')) {
+ // Users deletion is NOT allowed in demo mode
+ $oDeletionPlan->AddToDelete($this, null);
+ $oDeletionPlan->SetDeletionIssues($this, array('deletion not allowed in demo mode.'), true);
+ $oDeletionPlan->ComputeResults();
+
+ return false;
+ }
+ try {
+ $this->CheckIfProfileIsAllowed(UR_ACTION_DELETE);
+ }
+ catch (SecurityException $e) {
+ // Users deletion is NOT allowed
+ $oDeletionPlan->AddToDelete($this, null);
+ $oDeletionPlan->SetDeletionIssues($this, [$e->getMessage()], true);
+ $oDeletionPlan->ComputeResults();
+
+ return false;
+ }
+
+ return parent::DoCheckToDelete($oDeletionPlan);
+ }
+
protected function OnInsert()
{
$this->CheckIfProfileIsAllowed(UR_ACTION_CREATE);
@@ -293,7 +308,6 @@ class URP_UserProfile extends UserRightsBaseClassGUI
protected function OnDelete()
{
- $this->CheckIfProfileIsAllowed(UR_ACTION_DELETE);
}
/**
@@ -343,13 +357,12 @@ class URP_UserOrg extends UserRightsBaseClassGUI
(
"category" => "addon/userrights,grant_by_profile",
"key_type" => "autoincrement",
- "name_attcode" => "userid",
+ "name_attcode" => array("userlogin", "allowed_org_name"),
"state_attcode" => "",
"reconc_keys" => array(),
"db_table" => "priv_urp_userorg",
"db_key_field" => "id",
"db_finalclass_field" => "",
- "display_template" => "",
);
MetaModel::Init_Params($aParams);
//MetaModel::Init_InheritAttributes();
@@ -369,12 +382,6 @@ class URP_UserOrg extends UserRightsBaseClassGUI
MetaModel::Init_SetZListItems('advanced_search', array('userid', 'allowed_org_id')); // Criteria of the advanced search form
}
- public function GetName()
- {
- return Dict::Format('UI:UserManagement:LinkBetween_User_And_Org', $this->Get('userlogin'), $this->Get('allowed_org_name'));
- }
-
-
protected function OnInsert()
{
$this->CheckIfOrgIsAllowed();
@@ -434,7 +441,7 @@ class UserRightsProfile extends UserRightsAddOnAPI
// Support drastic data model changes: no organization class (or not writable)!
if (MetaModel::IsValidClass('Organization') && !MetaModel::IsAbstract('Organization'))
{
- $oOrg = new Organization();
+ $oOrg = MetaModel::NewObject('Organization');
$oOrg->Set('name', 'My Company/Department');
$oOrg->Set('code', 'SOMECODE');
$iOrgId = $oOrg->DBInsertNoReload();
@@ -442,17 +449,13 @@ class UserRightsProfile extends UserRightsAddOnAPI
// Support drastic data model changes: no Person class (or not writable)!
if (MetaModel::IsValidClass('Person') && !MetaModel::IsAbstract('Person'))
{
- $oContact = new Person();
+ $oContact = MetaModel::NewObject('Person');
$oContact->Set('name', 'My last name');
$oContact->Set('first_name', 'My first name');
if (MetaModel::IsValidAttCode('Person', 'org_id'))
{
$oContact->Set('org_id', $iOrgId);
}
- if (MetaModel::IsValidAttCode('Person', 'phone'))
- {
- $oContact->Set('phone', '+00 000 000 000');
- }
$oContact->Set('email', 'my.email@foo.org');
$iContactId = $oContact->DBInsertNoReload();
}
@@ -561,7 +564,7 @@ class UserRightsProfile extends UserRightsAddOnAPI
/**
* @param $oUser User
- * @return array
+ * @return bool
*/
public function IsAdministrator($oUser)
{
@@ -571,16 +574,22 @@ class UserRightsProfile extends UserRightsAddOnAPI
/**
* @param $oUser User
- * @return array
+ * @return bool
*/
public function IsPortalUser($oUser)
{
// UserRights caches the list for us
return UserRights::HasProfile(PORTAL_PROFILE_NAME, $oUser);
}
+
/**
* @param $oUser User
- * @return bool
+ *
+ * @return array
+ * @throws \ArchivedObjectException
+ * @throws \CoreException
+ * @throws \CoreUnexpectedValue
+ * @throws \MySQLException
*/
public function ListProfiles($oUser)
{
@@ -601,30 +610,115 @@ class UserRightsProfile extends UserRightsAddOnAPI
{
$this->LoadCache();
- $aObjectPermissions = $this->GetUserActionGrant($oUser, $sClass, UR_ACTION_READ);
- if ($aObjectPermissions['permission'] == UR_ALLOWED_NO)
+ // Let us pass an administrator for bypassing the grant matrix check in order to test this method without the need to set up a complex profile
+ // In the nominal case Administrators never end up here (since they completely bypass GetSelectFilter)
+ if (!static::IsAdministrator($oUser) && (MetaModel::HasCategory($sClass, 'silo') || MetaModel::HasCategory($sClass, 'bizmodel')))
{
- return false;
+ // N°4354 - Categories 'silo' and 'bizmodel' do check the grant matrix. Whereas 'filter' always allows to read (but the result can be filtered)
+ $aObjectPermissions = $this->GetUserActionGrant($oUser, $sClass, UR_ACTION_READ);
+ if ($aObjectPermissions['permission'] == UR_ALLOWED_NO)
+ {
+ return false;
+ }
}
- // Determine how to position the objects of this class
- //
+ $oFilter = true;
+ $aConditions = array();
+
+ // Determine if this class is part of a silo and build the filter for it
$sAttCode = self::GetOwnerOrganizationAttCode($sClass);
- if (is_null($sAttCode))
+ if (!is_null($sAttCode))
{
- // No filtering for this object
- return true;
+ $aUserOrgs = $this->GetUserOrgs($oUser, $sClass);
+ if (count($aUserOrgs) > 0)
+ {
+ $oFilter = $this->MakeSelectFilter($sClass, $aUserOrgs, $aSettings, $sAttCode);
+ }
+ // else: No org means 'any org'
}
- // Position the user
- //
- $aUserOrgs = $this->GetUserOrgs($oUser, $sClass);
- if (count($aUserOrgs) == 0)
+ // else: No silo for this class
+
+ // Specific conditions to hide, for non-administrators, the Administrator Users, the Administrator Profile and related links
+ // Note: when logged as an administrator, GetSelectFilter is completely bypassed.
+ if ($this->AdministratorsAreHidden())
{
- // No org means 'any org'
- return true;
+ if ($sClass == 'URP_Profiles')
+ {
+ $oExpression = new FieldExpression('id', $sClass);
+ $oScalarExpr = new ScalarExpression(1);
+
+ $aConditions[] = new BinaryExpression($oExpression, '!=', $oScalarExpr);
+ }
+ else if (($sClass == 'URP_UserProfile') || ($sClass == 'User') || (is_subclass_of($sClass, 'User')))
+ {
+ $aAdministrators = $this->GetAdministrators();
+ if (count($aAdministrators) > 0)
+ {
+ $sAttCode = ($sClass == 'URP_UserProfile') ? 'userid' : 'id';
+ $oExpression = new FieldExpression($sAttCode, $sClass);
+ $oListExpr = ListExpression::FromScalars($aAdministrators);
+ $aConditions[] = new BinaryExpression($oExpression, 'NOT IN', $oListExpr);
+ }
+ }
}
- return $this->MakeSelectFilter($sClass, $aUserOrgs, $aSettings, $sAttCode);
+ // Handling of the added conditions
+ if (count($aConditions) > 0)
+ {
+ if($oFilter === true)
+ {
+ // No 'silo' filter, let's build a clean one
+ $oFilter = new DBObjectSearch($sClass);
+ }
+
+ // Add the conditions to the filter
+ foreach($aConditions as $oCondition)
+ {
+ $oFilter->AddConditionExpression($oCondition);
+ }
+ }
+
+ return $oFilter;
+ }
+
+ /**
+ * Retrieve (and memoize) the list of administrator accounts.
+ * Note that there should always be at least one administrator account
+ * @return number[]
+ */
+ private function GetAdministrators()
+ {
+ static $aAdministrators = null;
+
+ if ($aAdministrators === null)
+ {
+ // Find all administrators
+ $aAdministrators = array();
+ $oAdministratorsFilter = new DBObjectSearch('User');
+ $oLnkFilter = new DBObjectSearch('URP_UserProfile');
+ $oExpression = new FieldExpression('profileid', 'URP_UserProfile');
+ $oScalarExpr = new ScalarExpression(1);
+ $oCondition = new BinaryExpression($oExpression, '=', $oScalarExpr);
+ $oLnkFilter->AddConditionExpression($oCondition);
+ $oAdministratorsFilter->AddCondition_ReferencedBy($oLnkFilter, 'userid');
+ $oAdministratorsFilter->AllowAllData(true); // Mandatory to prevent infinite recursion !!
+ $oSet = new DBObjectSet($oAdministratorsFilter);
+ $oSet->OptimizeColumnLoad(array('User' => array('login')));
+ while($oUser = $oSet->Fetch())
+ {
+ $aAdministrators[] = $oUser->GetKey();
+ }
+ }
+ return $aAdministrators;
+ }
+
+ /**
+ * Whether or not to hide the 'Administrator' profile and the administrator accounts
+ * @return boolean
+ */
+ private function AdministratorsAreHidden()
+ {
+ return ((bool)MetaModel::GetConfig()->Get('security.hide_administrators'));
}
diff --git a/addons/userrights/userrightsprofile.db.class.inc.php b/addons/userrights/userrightsprofile.db.class.inc.php
index 2115f1b8d..ac5b2277b 100644
--- a/addons/userrights/userrightsprofile.db.class.inc.php
+++ b/addons/userrights/userrightsprofile.db.class.inc.php
@@ -1,6 +1,6 @@
"priv_urp_profiles",
"db_key_field" => "id",
"db_finalclass_field" => "",
- "display_template" => "",
);
MetaModel::Init_Params($aParams);
//MetaModel::Init_InheritAttributes();
@@ -312,11 +311,9 @@ class URP_Profiles extends UserRightsBaseClassGUI
function DisplayBareRelations(WebPage $oPage, $bEditMode = false)
{
parent::DisplayBareRelations($oPage, $bEditMode);
- if (!$bEditMode)
- {
- $oPage->SetCurrentTab('UI:UserManagement:GrantMatrix');
- $this->DoShowGrantSumary($oPage);
- }
+
+ $oPage->SetCurrentTab('UI:UserManagement:GrantMatrix');
+ $this->DoShowGrantSumary($oPage);
}
}
@@ -330,13 +327,12 @@ class URP_UserProfile extends UserRightsBaseClassGUI
(
"category" => "addon/userrights",
"key_type" => "autoincrement",
- "name_attcode" => "userid",
+ "name_attcode" => array("userlogin", "profile"),
"state_attcode" => "",
"reconc_keys" => array(),
"db_table" => "priv_urp_userprofile",
"db_key_field" => "id",
"db_finalclass_field" => "",
- "display_template" => "",
);
MetaModel::Init_Params($aParams);
//MetaModel::Init_InheritAttributes();
@@ -355,11 +351,6 @@ class URP_UserProfile extends UserRightsBaseClassGUI
MetaModel::Init_SetZListItems('standard_search', array('userid', 'profileid')); // Criteria of the std search form
MetaModel::Init_SetZListItems('advanced_search', array('userid', 'profileid')); // Criteria of the advanced search form
}
-
- public function GetName()
- {
- return Dict::Format('UI:UserManagement:LinkBetween_User_And_Profile', $this->Get('userlogin'), $this->Get('profile'));
- }
}
class URP_UserOrg extends UserRightsBaseClassGUI
@@ -370,13 +361,12 @@ class URP_UserOrg extends UserRightsBaseClassGUI
(
"category" => "addon/userrights",
"key_type" => "autoincrement",
- "name_attcode" => "userid",
+ "name_attcode" => array("userlogin", "allowed_org_name"),
"state_attcode" => "",
"reconc_keys" => array(),
"db_table" => "priv_urp_userorg",
"db_key_field" => "id",
"db_finalclass_field" => "",
- "display_template" => "",
);
MetaModel::Init_Params($aParams);
//MetaModel::Init_InheritAttributes();
@@ -395,11 +385,6 @@ class URP_UserOrg extends UserRightsBaseClassGUI
MetaModel::Init_SetZListItems('standard_search', array('userid', 'allowed_org_id')); // Criteria of the std search form
MetaModel::Init_SetZListItems('advanced_search', array('userid', 'allowed_org_id')); // Criteria of the advanced search form
}
-
- public function GetName()
- {
- return Dict::Format('UI:UserManagement:LinkBetween_User_And_Org', $this->Get('userlogin'), $this->Get('allowed_org_name'));
- }
}
@@ -417,7 +402,6 @@ class URP_ActionGrant extends UserRightsBaseClass
"db_table" => "priv_urp_grant_actions",
"db_key_field" => "id",
"db_finalclass_field" => "",
- "display_template" => "",
);
MetaModel::Init_Params($aParams);
//MetaModel::Init_InheritAttributes();
@@ -454,7 +438,6 @@ class URP_StimulusGrant extends UserRightsBaseClass
"db_table" => "priv_urp_grant_stimulus",
"db_key_field" => "id",
"db_finalclass_field" => "",
- "display_template" => "",
);
MetaModel::Init_Params($aParams);
//MetaModel::Init_InheritAttributes();
@@ -491,7 +474,6 @@ class URP_AttributeGrant extends UserRightsBaseClass
"db_table" => "priv_urp_grant_attributes",
"db_key_field" => "id",
"db_finalclass_field" => "",
- "display_template" => "",
);
MetaModel::Init_Params($aParams);
//MetaModel::Init_InheritAttributes();
@@ -535,7 +517,7 @@ class UserRightsProfile extends UserRightsAddOnAPI
// Support drastic data model changes: no organization class (or not writable)!
if (MetaModel::IsValidClass('Organization') && !MetaModel::IsAbstract('Organization'))
{
- $oOrg = new Organization();
+ $oOrg = MetaModel::NewObject('Organization');
$oOrg->Set('name', 'My Company/Department');
$oOrg->Set('code', 'SOMECODE');
$oOrg::SetCurrentChange($oChange);
@@ -544,17 +526,13 @@ class UserRightsProfile extends UserRightsAddOnAPI
// Support drastic data model changes: no Person class (or not writable)!
if (MetaModel::IsValidClass('Person') && !MetaModel::IsAbstract('Person'))
{
- $oContact = new Person();
+ $oContact = MetaModel::NewObject('Person');
$oContact->Set('name', 'My last name');
$oContact->Set('first_name', 'My first name');
if (MetaModel::IsValidAttCode('Person', 'org_id'))
{
$oContact->Set('org_id', $iOrgId);
}
- if (MetaModel::IsValidAttCode('Person', 'phone'))
- {
- $oContact->Set('phone', '+00 000 000 000');
- }
$oContact->Set('email', 'my.email@foo.org');
$oContact::SetCurrentChange($oChange);
$iContactId = $oContact->DBInsertNoReload();
@@ -711,7 +689,7 @@ class UserRightsProfile extends UserRightsAddOnAPI
public function LoadCache()
{
- if (!is_null($this->m_aProfiles)) return;
+ if (!is_null($this->m_aProfiles)) return false;
// Could be loaded in a shared memory (?)
$oKPI = new ExecutionKPI();
diff --git a/addons/userrights/userrightsprojection.class.inc.php b/addons/userrights/userrightsprojection.class.inc.php
index 081149398..61fb07fe6 100644
--- a/addons/userrights/userrightsprojection.class.inc.php
+++ b/addons/userrights/userrightsprojection.class.inc.php
@@ -1,6 +1,6 @@
"priv_urp_profiles",
"db_key_field" => "id",
"db_finalclass_field" => "",
- "display_template" => "",
);
MetaModel::Init_Params($aParams);
//MetaModel::Init_InheritAttributes();
@@ -144,11 +143,9 @@ class URP_Profiles extends UserRightsBaseClass
function DisplayBareRelations(WebPage $oPage, $bEditMode = false)
{
parent::DisplayBareRelations($oPage, $bEditMode);
- if (!$bEditMode)
- {
- $oPage->SetCurrentTab('UI:UserManagement:GrantMatrix');
- $this->DoShowGrantSumary($oPage);
- }
+
+ $oPage->SetCurrentTab('UI:UserManagement:GrantMatrix');
+ $this->DoShowGrantSumary($oPage);
}
}
@@ -167,7 +164,6 @@ class URP_Dimensions extends UserRightsBaseClass
"db_table" => "priv_urp_dimensions",
"db_key_field" => "id",
"db_finalclass_field" => "",
- "display_template" => "",
);
MetaModel::Init_Params($aParams);
//MetaModel::Init_InheritAttributes();
@@ -274,13 +270,12 @@ class URP_UserProfile extends UserRightsBaseClass
(
"category" => "addon/userrights",
"key_type" => "autoincrement",
- "name_attcode" => "userid",
+ "name_attcode" => array("userlogin", "profile"),
"state_attcode" => "",
"reconc_keys" => array(),
"db_table" => "priv_urp_userprofile",
"db_key_field" => "id",
"db_finalclass_field" => "",
- "display_template" => "",
);
MetaModel::Init_Params($aParams);
//MetaModel::Init_InheritAttributes();
@@ -299,11 +294,6 @@ class URP_UserProfile extends UserRightsBaseClass
MetaModel::Init_SetZListItems('standard_search', array('userid', 'profileid')); // Criteria of the std search form
MetaModel::Init_SetZListItems('advanced_search', array('userid', 'profileid')); // Criteria of the advanced search form
}
-
- public function GetName()
- {
- return Dict::Format('UI:UserManagement:LinkBetween_User_And_Profile', $this->Get('userlogin'), $this->Get('profile'));
- }
}
@@ -321,7 +311,6 @@ class URP_ProfileProjection extends UserRightsBaseClass
"db_table" => "priv_urp_profileprojection",
"db_key_field" => "id",
"db_finalclass_field" => "",
- "display_template" => "",
);
MetaModel::Init_Params($aParams);
//MetaModel::Init_InheritAttributes();
@@ -402,7 +391,6 @@ class URP_ClassProjection extends UserRightsBaseClass
"db_table" => "priv_urp_classprojection",
"db_key_field" => "id",
"db_finalclass_field" => "",
- "display_template" => "",
);
MetaModel::Init_Params($aParams);
//MetaModel::Init_InheritAttributes();
@@ -474,7 +462,6 @@ class URP_ActionGrant extends UserRightsBaseClass
"db_table" => "priv_urp_grant_actions",
"db_key_field" => "id",
"db_finalclass_field" => "",
- "display_template" => "",
);
MetaModel::Init_Params($aParams);
//MetaModel::Init_InheritAttributes();
@@ -511,7 +498,6 @@ class URP_StimulusGrant extends UserRightsBaseClass
"db_table" => "priv_urp_grant_stimulus",
"db_key_field" => "id",
"db_finalclass_field" => "",
- "display_template" => "",
);
MetaModel::Init_Params($aParams);
//MetaModel::Init_InheritAttributes();
@@ -548,7 +534,6 @@ class URP_AttributeGrant extends UserRightsBaseClass
"db_table" => "priv_urp_grant_attributes",
"db_key_field" => "id",
"db_finalclass_field" => "",
- "display_template" => "",
);
MetaModel::Init_Params($aParams);
//MetaModel::Init_InheritAttributes();
diff --git a/application/DBSearchHelper.php b/application/DBSearchHelper.php
new file mode 100644
index 000000000..1266d1976
--- /dev/null
+++ b/application/DBSearchHelper.php
@@ -0,0 +1,60 @@
+GetClass();
+ foreach ($oAppContext->GetNames() as $key) {
+ // Find the value of the object corresponding to each 'context' parameter
+ $aCallSpec = [$sClass, 'MapContextParam'];
+ $sAttCode = '';
+ if (is_callable($aCallSpec)) {
+ $sAttCode = call_user_func($aCallSpec, $key); // Returns null when there is no mapping for this parameter
+ }
+
+ if (MetaModel::IsValidAttCode($sClass, $sAttCode)) {
+ // Add Hierarchical condition if hierarchical key
+ $oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
+ if (isset($oAttDef) && ($oAttDef->IsExternalKey())) {
+ $iDefaultValue = intval($oAppContext->GetCurrentValue($key));
+ if ($iDefaultValue != 0) {
+ try {
+ /** @var AttributeExternalKey $oAttDef */
+ $sTargetClass = $oAttDef->GetTargetClass();
+ $sHierarchicalKeyCode = MetaModel::IsHierarchicalClass($sTargetClass);
+ if ($sHierarchicalKeyCode !== false) {
+ $oFilter = new DBObjectSearch($sTargetClass);
+ $oFilter->AddCondition('id', $iDefaultValue);
+ $oHKFilter = new DBObjectSearch($sTargetClass);
+ $oHKFilter->AddCondition_PointingTo($oFilter, $sHierarchicalKeyCode, TREE_OPERATOR_BELOW);
+ $oSearch->AddCondition_PointingTo($oHKFilter, $sAttCode);
+ }
+ }
+ catch (Exception $e) {
+ // If filtering fails just ignore it
+ }
+ }
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/application/Html2Text.php b/application/Html2Text.php
index 9cbe27ce1..6b3c898a6 100644
--- a/application/Html2Text.php
+++ b/application/Html2Text.php
@@ -30,8 +30,11 @@ function mb_str_replace($search, $replace, $subject, &$count = 0) {
$replacements = array_pad($replacements, count($searches), '');
foreach ($searches as $key => $search) {
$parts = mb_split(preg_quote($search), $subject);
- $count += count($parts) - 1;
- $subject = implode($replacements[$key], $parts);
+ if (is_array($parts))
+ {
+ $count += count($parts) - 1;
+ $subject = implode($replacements[$key], $parts);
+ }
}
} else {
// Call mb_str_replace for each subject in array, recursively
diff --git a/application/ajaxwebpage.class.inc.php b/application/ajaxwebpage.class.inc.php
index 82ddaf0d1..7f06e4fde 100644
--- a/application/ajaxwebpage.class.inc.php
+++ b/application/ajaxwebpage.class.inc.php
@@ -1,414 +1,20 @@
m_sReadyScript = "";
- //$this->add_header("Content-type: text/html; charset=utf-8");
- $this->add_header("Cache-control: no-cache");
- $this->m_oTabs = new TabManager();
- $this->sContentType = 'text/html';
- $this->sContentDisposition = 'inline';
- $this->m_sMenu = "";
-
- utils::InitArchiveMode();
- }
-
- /**
- * @inheritDoc
- * @throws \Exception
- */
- public function AddTabContainer($sTabContainer, $sPrefix = '')
- {
- $this->add($this->m_oTabs->AddTabContainer($sTabContainer, $sPrefix));
- }
-
- /**
- * @inheritDoc
- * @throws \Exception
- */
- public function AddToTab($sTabContainer, $sTabCode, $sHtml)
- {
- $this->add($this->m_oTabs->AddToTab($sTabContainer, $sTabCode, $sHtml));
- }
-
- /**
- * @inheritDoc
- */
- public function SetCurrentTabContainer($sTabContainer = '')
- {
- return $this->m_oTabs->SetCurrentTabContainer($sTabContainer);
- }
-
- /**
- * @inheritDoc
- */
- public function SetCurrentTab($sTabCode = '', $sTabTitle = null)
- {
- return $this->m_oTabs->SetCurrentTab($sTabCode, $sTabTitle);
- }
-
- /**
- * @inheritDoc
- * @throws \Exception
- */
- public function AddAjaxTab($sTabCode, $sUrl, $bCache = true, $sTabTitle = null)
- {
- $this->add($this->m_oTabs->AddAjaxTab($sTabCode, $sUrl, $bCache, $sTabTitle));
- }
-
- /**
- * @inheritDoc
- */
- public function GetCurrentTab()
- {
- return $this->m_oTabs->GetCurrentTab();
- }
-
- /**
- * @inheritDoc
- */
- public function RemoveTab($sTabCode, $sTabContainer = null)
- {
- $this->m_oTabs->RemoveTab($sTabCode, $sTabContainer);
- }
-
- /**
- * @inheritDoc
- */
- public function FindTab($sPattern, $sTabContainer = null)
- {
- return $this->m_oTabs->FindTab($sPattern, $sTabContainer);
- }
-
- /**
- * Make the given tab the active one, as if it were clicked
- * DOES NOT WORK: apparently in the *old* version of jquery
- * that we are using this is not supported... TO DO upgrade
- * the whole jquery bundle...
- */
- public function SelectTab($sTabContainer, $sTabCode)
- {
- $this->add_ready_script($this->m_oTabs->SelectTab($sTabContainer, $sTabCode));
- }
-
- /**
- * @param string $sHtml
- */
- public function AddToMenu($sHtml)
- {
- $this->m_sMenu .= $sHtml;
- }
-
- /**
- * @inheritDoc
- */
- public function output()
- {
- if (!empty($this->sContentType))
- {
- $this->add_header('Content-type: '.$this->sContentType);
- }
- if (!empty($this->sContentDisposition))
- {
- $this->add_header('Content-Disposition: '.$this->sContentDisposition.'; filename="'.$this->sContentFileName.'"');
- }
- foreach($this->a_headers as $s_header)
- {
- header($s_header);
- }
- if ($this->m_oTabs->TabsContainerCount() > 0)
- {
- $this->add_ready_script(
-<<