Merge branch 'support/3.2' into develop

This commit is contained in:
odain
2025-11-07 20:33:14 +01:00
1837 changed files with 33034 additions and 34549 deletions

View File

@@ -1,16 +1,17 @@
<?php
/**
* Localized data
*
* @copyright Copyright (C) 2010-2024 Combodo SAS
* @license https://opensource.org/licenses/AGPL-3.0
*
*
*/
/**
* @author Benjamin Planque <benjamin.planque@combodo.com>
*
*/
Dict::Add('CS CZ', 'Czech', 'Čeština', array(
Dict::Add('CS CZ', 'Czech', 'Čeština', [
'portal:itop-portal' => 'Standardní portál',
'Page:DefaultTitle' => '%1$s - Uživatelský portál',
'Brick:Portal:UserProfile:Title' => 'Můj profil',
@@ -26,4 +27,4 @@ Dict::Add('CS CZ', 'Czech', 'Čeština', array(
'Brick:Portal:ListAllRequests:Tab' => 'Probíhající a uzavřené',
'Brick:Portal:SearchInAllRequests:Title' => 'Vyhledávání ve všech požadavcích',
'Brick:Portal:SearchInAllRequests:Title+' => '<p>Bez ohledu na jejich stav.</p>',
));
]);

View File

@@ -1,16 +1,17 @@
<?php
/**
* Localized data
*
* @copyright Copyright (C) 2010-2024 Combodo SAS
* @license https://opensource.org/licenses/AGPL-3.0
*
*
*/
/**
* @author Benjamin Planque <benjamin.planque@combodo.com>
*
*/
Dict::Add('DA DA', 'Danish', 'Dansk', array(
Dict::Add('DA DA', 'Danish', 'Dansk', [
'portal:itop-portal' => 'Standard portal~~',
'Page:DefaultTitle' => '%1$s - User portal~~',
'Brick:Portal:UserProfile:Title' => 'My profile~~',
@@ -26,4 +27,4 @@ Dict::Add('DA DA', 'Danish', 'Dansk', array(
'Brick:Portal:ListAllRequests:Tab' => 'On-going and closed~~',
'Brick:Portal:SearchInAllRequests:Title' => 'Search in all requests~~',
'Brick:Portal:SearchInAllRequests:Title+' => '<p>Regardless of their status.</p>~~',
));
]);

View File

@@ -1,16 +1,17 @@
<?php
/**
* Localized data
*
* @copyright Copyright (C) 2010-2024 Combodo SAS
* @license https://opensource.org/licenses/AGPL-3.0
*
*
*/
/**
* @author Benjamin Planque <benjamin.planque@combodo.com>
*
*/
Dict::Add('DE DE', 'German', 'Deutsch', array(
Dict::Add('DE DE', 'German', 'Deutsch', [
'portal:itop-portal' => 'Standard Portal',
'Page:DefaultTitle' => '%1$s - Benutzer Portal',
'Brick:Portal:UserProfile:Title' => 'Mein Profile',
@@ -26,4 +27,4 @@ Dict::Add('DE DE', 'German', 'Deutsch', array(
'Brick:Portal:ListAllRequests:Tab' => 'Laufend und abgeschlossen',
'Brick:Portal:SearchInAllRequests:Title' => 'In allen Anfragen suchen',
'Brick:Portal:SearchInAllRequests:Title+' => '<p>Unabhängig von ihrem Status.</p>',
));
]);

View File

@@ -1,4 +1,5 @@
<?php
// Copyright (C) 2010-2024 Combodo SAS
//
// This file is part of iTop.
@@ -29,7 +30,7 @@
//////////////////////////////////////////////////////////////////////
//
Dict::Add('EN US', 'English', 'English', array(
Dict::Add('EN US', 'English', 'English', [
'portal:itop-portal' => 'Standard portal', // This is the portal name that will be displayed in portal dispatcher (eg. URL in menus)
'Page:DefaultTitle' => '%1$s - User portal',
'Brick:Portal:UserProfile:Title' => 'My profile',
@@ -45,4 +46,4 @@ Dict::Add('EN US', 'English', 'English', array(
'Brick:Portal:ListAllRequests:Tab' => 'On-going and closed',
'Brick:Portal:SearchInAllRequests:Title' => 'Search in all requests',
'Brick:Portal:SearchInAllRequests:Title+' => '<p>Regardless of their status.</p>',
));
]);

View File

@@ -1,4 +1,5 @@
<?php
// Copyright (C) 2024 Combodo SAS
//
// This file is part of iTop.
@@ -29,7 +30,7 @@
//////////////////////////////////////////////////////////////////////
//
Dict::Add('EN GB', 'British English', 'British English', array(
Dict::Add('EN GB', 'British English', 'British English', [
'portal:itop-portal' => 'Standard portal',
'Page:DefaultTitle' => '%1$s - User portal',
'Brick:Portal:UserProfile:Title' => 'My profile',
@@ -45,4 +46,4 @@ Dict::Add('EN GB', 'British English', 'British English', array(
'Brick:Portal:ListAllRequests:Tab' => 'On-going and closed',
'Brick:Portal:SearchInAllRequests:Title' => 'Search in all requests',
'Brick:Portal:SearchInAllRequests:Title+' => '<p>Regardless of their status.</p>',
));
]);

View File

@@ -1,13 +1,14 @@
<?php
/**
* Spanish Localized data
*
* @copyright Copyright (C) 2010-2024 Combodo SAS
* @license https://opensource.org/licenses/AGPL-3.0
* @author Miguel Turrubiates <miguel_tf@yahoo.com>
* @notas Utilizar codificación UTF-8 para mostrar acentos y otros caracteres especiales
* @notas Utilizar codificación UTF-8 para mostrar acentos y otros caracteres especiales
*/
Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
Dict::Add('ES CR', 'Spanish', 'Español, Castellano', [
'portal:itop-portal' => 'Portal de Usuario',
'Page:DefaultTitle' => 'ITop - Portal de Usuario',
'Brick:Portal:UserProfile:Title' => 'Mi perfil',
@@ -23,4 +24,4 @@ Dict::Add('ES CR', 'Spanish', 'Español, Castellano', array(
'Brick:Portal:ListAllRequests:Tab' => 'En proceso y cerrados',
'Brick:Portal:SearchInAllRequests:Title' => 'Buscar en todos los requerimientos',
'Brick:Portal:SearchInAllRequests:Title+' => '<p>Sin importar su estatus.</p>',
));
]);

View File

@@ -1,16 +1,17 @@
<?php
/**
* Localized data
*
* @copyright Copyright (C) 2010-2024 Combodo SAS
* @license https://opensource.org/licenses/AGPL-3.0
*
*
*/
/**
* @author Benjamin Planque <benjamin.planque@combodo.com>
*
*/
Dict::Add('FR FR', 'French', 'Français', array(
Dict::Add('FR FR', 'French', 'Français', [
'portal:itop-portal' => 'Portail standard',
'Page:DefaultTitle' => '%1$s - Portail utilisateur',
'Brick:Portal:UserProfile:Title' => 'Mon profil',
@@ -26,4 +27,4 @@ Dict::Add('FR FR', 'French', 'Français', array(
'Brick:Portal:ListAllRequests:Tab' => 'En cours et fermées',
'Brick:Portal:SearchInAllRequests:Title' => 'Rechercher une demande',
'Brick:Portal:SearchInAllRequests:Title+' => '<p>Quelque soit son état</p>',
));
]);

View File

@@ -1,16 +1,17 @@
<?php
/**
* Localized data
*
* @copyright Copyright (C) 2010-2024 Combodo SAS
* @license https://opensource.org/licenses/AGPL-3.0
*
*
*/
/**
* @author Benjamin Planque <benjamin.planque@combodo.com>
*
*/
Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
Dict::Add('HU HU', 'Hungarian', 'Magyar', [
'portal:itop-portal' => 'Standard portál',
'Page:DefaultTitle' => '%1$s - Felhasználói portál',
'Brick:Portal:UserProfile:Title' => 'Saját profil',
@@ -26,4 +27,4 @@ Dict::Add('HU HU', 'Hungarian', 'Magyar', array(
'Brick:Portal:ListAllRequests:Tab' => 'On-going and closed~~',
'Brick:Portal:SearchInAllRequests:Title' => 'Search in all requests~~',
'Brick:Portal:SearchInAllRequests:Title+' => '<p>Regardless of their status.</p>~~',
));
]);

View File

@@ -1,16 +1,17 @@
<?php
/**
* Localized data
*
* @copyright Copyright (C) 2010-2024 Combodo SAS
* @license https://opensource.org/licenses/AGPL-3.0
*
*
*/
/**
* @author Benjamin Planque <benjamin.planque@combodo.com>
*
*/
Dict::Add('JA JP', 'Japanese', '日本語', array(
Dict::Add('JA JP', 'Japanese', '日本語', [
'portal:itop-portal' => 'Standard portal~~',
'Page:DefaultTitle' => '%1$s - User portal~~',
'Brick:Portal:UserProfile:Title' => 'My profile~~',
@@ -26,4 +27,4 @@ Dict::Add('JA JP', 'Japanese', '日本語', array(
'Brick:Portal:ListAllRequests:Tab' => 'On-going and closed~~',
'Brick:Portal:SearchInAllRequests:Title' => 'Search in all requests~~',
'Brick:Portal:SearchInAllRequests:Title+' => '<p>Regardless of their status.</p>~~',
));
]);

View File

@@ -1,16 +1,17 @@
<?php
/**
* Localized data
*
* @copyright Copyright (C) 2010-2024 Combodo SAS
* @license https://opensource.org/licenses/AGPL-3.0
*
*
*/
/**
* @author Benjamin Planque <benjamin.planque@combodo.com>
* @author Thomas Casteleyn <thomas.casteleyn@super-visions.com>
*/
Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
Dict::Add('NL NL', 'Dutch', 'Nederlands', [
'portal:itop-portal' => 'Standaard portaal',
'Page:DefaultTitle' => '%1$s - Gebruikersportaal',
'Brick:Portal:UserProfile:Title' => 'Mijn profiel',
@@ -26,4 +27,4 @@ Dict::Add('NL NL', 'Dutch', 'Nederlands', array(
'Brick:Portal:ListAllRequests:Tab' => 'Openstaand en gesloten',
'Brick:Portal:SearchInAllRequests:Title' => 'Zoek in alle verzoeken',
'Brick:Portal:SearchInAllRequests:Title+' => '<p>Ongeacht hun status.</p>',
));
]);

View File

@@ -1,16 +1,17 @@
<?php
/**
* Localized data
*
* @copyright Copyright (C) 2010-2024 Combodo SAS
* @license https://opensource.org/licenses/AGPL-3.0
*
*
*/
/**
* @author Benjamin Planque <benjamin.planque@combodo.com>
*
*/
Dict::Add('PL PL', 'Polish', 'Polski', array(
Dict::Add('PL PL', 'Polish', 'Polski', [
'portal:itop-portal' => 'Portal standardowy',
'Page:DefaultTitle' => '%1$s portal użytkownika',
'Brick:Portal:UserProfile:Title' => 'Mój profil',
@@ -26,4 +27,4 @@ Dict::Add('PL PL', 'Polish', 'Polski', array(
'Brick:Portal:ListAllRequests:Tab' => 'Otwarte i zamknięte',
'Brick:Portal:SearchInAllRequests:Title' => 'Szukaj we wszystkich wnioskach',
'Brick:Portal:SearchInAllRequests:Title+' => '<p>Niezależnie od ich statusu.</p>',
));
]);

View File

@@ -1,16 +1,17 @@
<?php
/**
* Localized data
*
* @copyright Copyright (C) 2010-2024 Combodo SAS
* @license https://opensource.org/licenses/AGPL-3.0
*
*
*/
/**
* @author Benjamin Planque <benjamin.planque@combodo.com>
*
*/
Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
Dict::Add('PT BR', 'Brazilian', 'Brazilian', [
'portal:itop-portal' => 'Portal do Usuário',
'Page:DefaultTitle' => ITOP_APPLICATION_SHORT.' - Portal do Usuário',
'Brick:Portal:UserProfile:Title' => 'Meu perfil',
@@ -26,4 +27,4 @@ Dict::Add('PT BR', 'Brazilian', 'Brazilian', array(
'Brick:Portal:ListAllRequests:Tab' => 'On-going and closed~~',
'Brick:Portal:SearchInAllRequests:Title' => 'Search in all requests~~',
'Brick:Portal:SearchInAllRequests:Title+' => '<p>Regardless of their status.</p>~~',
));
]);

View File

@@ -1,16 +1,17 @@
<?php
/**
* Localized data
*
* @copyright Copyright (C) 2010-2024 Combodo SAS
* @license https://opensource.org/licenses/AGPL-3.0
*
*
*/
/**
* @author Benjamin Planque <benjamin.planque@combodo.com>
*
*/
Dict::Add('RU RU', 'Russian', 'Русский', array(
Dict::Add('RU RU', 'Russian', 'Русский', [
'portal:itop-portal' => 'Пользовательский портал',
'Page:DefaultTitle' => '%1$s - Пользовательский портал',
'Brick:Portal:UserProfile:Title' => 'Мой профиль',
@@ -26,4 +27,4 @@ Dict::Add('RU RU', 'Russian', 'Русский', array(
'Brick:Portal:ListAllRequests:Tab' => 'On-going and closed~~',
'Brick:Portal:SearchInAllRequests:Title' => 'Search in all requests~~',
'Brick:Portal:SearchInAllRequests:Title+' => '<p>Regardless of their status.</p>~~',
));
]);

View File

@@ -1,16 +1,17 @@
<?php
/**
* Localized data
*
* @copyright Copyright (C) 2010-2024 Combodo SAS
* @license https://opensource.org/licenses/AGPL-3.0
*
*
*/
/**
* @author Benjamin Planque <benjamin.planque@combodo.com>
*
*/
Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
Dict::Add('SK SK', 'Slovak', 'Slovenčina', [
'portal:itop-portal' => 'Standard portal~~',
'Page:DefaultTitle' => '%1$s - User portal~~',
'Brick:Portal:UserProfile:Title' => 'My profile~~',
@@ -26,4 +27,4 @@ Dict::Add('SK SK', 'Slovak', 'Slovenčina', array(
'Brick:Portal:ListAllRequests:Tab' => 'On-going and closed~~',
'Brick:Portal:SearchInAllRequests:Title' => 'Search in all requests~~',
'Brick:Portal:SearchInAllRequests:Title+' => '<p>Regardless of their status.</p>~~',
));
]);

View File

@@ -1,16 +1,17 @@
<?php
/**
* Localized data
*
* @copyright Copyright (C) 2010-2024 Combodo SAS
* @license https://opensource.org/licenses/AGPL-3.0
*
*
*/
/**
* @author Benjamin Planque <benjamin.planque@combodo.com>
*
*/
Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
Dict::Add('TR TR', 'Turkish', 'Türkçe', [
'portal:itop-portal' => 'Standard portal~~',
'Page:DefaultTitle' => '%1$s - User portal~~',
'Brick:Portal:UserProfile:Title' => 'My profile~~',
@@ -26,4 +27,4 @@ Dict::Add('TR TR', 'Turkish', 'Türkçe', array(
'Brick:Portal:ListAllRequests:Tab' => 'On-going and closed~~',
'Brick:Portal:SearchInAllRequests:Title' => 'Search in all requests~~',
'Brick:Portal:SearchInAllRequests:Title+' => '<p>Regardless of their status.</p>~~',
));
]);

View File

@@ -1,4 +1,5 @@
<?php
// Copyright (C) 2010-2024 Combodo SAS
//
// This file is part of iTop.
@@ -27,7 +28,7 @@
// Classes in 'bizmodel'
//////////////////////////////////////////////////////////////////////
//
Dict::Add('ZH CN', 'Chinese', '简体中文', array(
Dict::Add('ZH CN', 'Chinese', '简体中文', [
'portal:itop-portal' => '标准门户', // This is the portal name that will be displayed in portal dispatcher (eg. URL in menus)
'Page:DefaultTitle' => '%1$s - 用户门户',
'Brick:Portal:UserProfile:Title' => '我的设置',
@@ -43,4 +44,4 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array(
'Brick:Portal:ListAllRequests:Tab' => 'On-going and closed~~',
'Brick:Portal:SearchInAllRequests:Title' => 'Search in all requests~~',
'Brick:Portal:SearchInAllRequests:Title+' => '<p>Regardless of their status.</p>~~',
));
]);

View File

@@ -38,19 +38,15 @@
);
// Load current environment
if (file_exists(__DIR__.'/../../approot.inc.php'))
{
if (file_exists(__DIR__.'/../../approot.inc.php')) {
require_once __DIR__.'/../../approot.inc.php'; // When in env-xxxx folder
}
else
{
} else {
require_once __DIR__.'/../../../approot.inc.php'; // When in datamodels/x.x folder
}
require_once APPROOT.'application/startup.inc.php';
// Protection against setup in the following configuration : ITIL Ticket with Enhanced Portal selected but neither UserRequest or Incident. Which would crash the portal.
if (!class_exists('UserRequest') && !class_exists('Incident'))
{
if (!class_exists('UserRequest') && !class_exists('Incident')) {
die('iTop has neither been installed with User Request nor Incident tickets. Please contact your administrator.');
}

View File

@@ -1,4 +1,5 @@
<?php
/**
* Copyright (C) 2013-2024 Combodo SAS
*
@@ -34,7 +35,7 @@ require_once APPROOT.'/lib/autoload.php';
class iTopPortalEditUrlMaker extends AbstractPortalUrlMaker
{
/** @var string PORTAL_ID */
const PORTAL_ID = 'itop-portal';
public const PORTAL_ID = 'itop-portal';
}
/**
@@ -61,4 +62,3 @@ DBObject::RegisterURLMakerClass('portal', 'iTopPortalEditUrlMaker');
DBObject::RegisterURLMakerClass('itop-portal', 'iTopPortalEditUrlMaker');
DBObject::RegisterURLMakerClass('itop-portal-edit', 'iTopPortalEditUrlMaker');
DBObject::RegisterURLMakerClass('itop-portal-view', 'iTopPortalViewUrlMaker');