N°2847 - Refactor Web Pages classes - add deprecated files for extensions compatibility

2026-02-13 07:24:13 +01:00 · 2020-09-10 11:35:21 +02:00
parent 63f8ec594c
commit 580e8ffa08
30 changed files with 106 additions and 51 deletions
--- a/application/ajaxwebpage.class.inc.php
+++ b/application/ajaxwebpage.class.inc.php
@@ -1,22 +1,14 @@
 <?php
 /**
- * Copyright (C) 2013-2020 Combodo SARL
- *
- * This file is part of iTop.
- *
- * iTop is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * iTop is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
+ * @copyright   Copyright (C) 2010-2020 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ * @deprecated  removed in 2.9.0 - moved to sources/application/WebPage/AjaxPage.php
 */

+/**
+ * Class ajax_page
+ * @deprecated removed in 2.9.0 - moved to AjaxPage
+ */
 class ajax_page extends AjaxPage
 {

--- a/application/capturewebpage.class.inc.php
+++ b/application/capturewebpage.class.inc.php
@@ -0,0 +1,7 @@
+<?php
+/**
+ * @copyright   Copyright (C) 2010-2020 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ * @deprecated  removed in 2.9.0 - moved to sources/application/WebPage/CaptureWebPage.php
+ */
+ 
--- a/application/clipage.class.inc.php
+++ b/application/clipage.class.inc.php
@@ -0,0 +1,7 @@
+<?php
+/**
+ * @copyright   Copyright (C) 2010-2020 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ * @deprecated  removed in 2.9.0 - moved to sources/application/WebPage/CLIPage.php
+ */
+ 
--- a/application/csvpage.class.inc.php
+++ b/application/csvpage.class.inc.php
@@ -0,0 +1,7 @@
+<?php
+/**
+ * @copyright   Copyright (C) 2010-2020 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ * @deprecated  removed in 2.9.0 - moved to sources/application/WebPage/CSVPage.php
+ */
+ 
--- a/application/errorpage.class.inc.php
+++ b/application/errorpage.class.inc.php
@@ -0,0 +1,7 @@
+<?php
+/**
+ * @copyright   Copyright (C) 2010-2020 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ * @deprecated  removed in 2.9.0 - moved to sources/application/WebPage/ErrorPage.php
+ */
+ 
--- a/application/itopwebpage.class.inc.php
+++ b/application/itopwebpage.class.inc.php
@@ -0,0 +1,7 @@
+<?php
+/**
+ * @copyright   Copyright (C) 2010-2020 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ * @deprecated  removed in 2.9.0 - moved to sources/application/WebPage/iTopWebPage.php
+ */
+ 
--- a/application/itopwizardwebpage.class.inc.php
+++ b/application/itopwizardwebpage.class.inc.php
@@ -0,0 +1,7 @@
+<?php
+/**
+ * @copyright   Copyright (C) 2010-2020 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ * @deprecated  removed in 2.9.0 - moved to sources/application/WebPage/iTopWizardWebPage.php
+ */
+ 
--- a/application/nicewebpage.class.inc.php
+++ b/application/nicewebpage.class.inc.php
@@ -2,6 +2,6 @@
 /**
 * @copyright   Copyright (C) 2010-2020 Combodo SARL
 * @license     http://opensource.org/licenses/AGPL-3.0
+ * @deprecated  removed in 2.9.0 - moved to sources/application/WebPage/NiceWebPage.php
 */
 
-// For toolkit
--- a/application/pdfpage.class.inc.php
+++ b/application/pdfpage.class.inc.php
@@ -0,0 +1,7 @@
+<?php
+/**
+ * @copyright   Copyright (C) 2010-2020 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ * @deprecated  removed in 2.9.0 - moved to sources/application/WebPage/PDFPage.php
+ */
+ 
--- a/application/webpage.class.inc.php
+++ b/application/webpage.class.inc.php
@@ -0,0 +1,7 @@
+<?php
+/**
+ * @copyright   Copyright (C) 2010-2020 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ * @deprecated  removed in 2.9.0 - moved to sources/application/WebPage/WebPage.php
+ */
+ 
--- a/application/xmlpage.class.inc.php
+++ b/application/xmlpage.class.inc.php
@@ -0,0 +1,7 @@
+<?php
+/**
+ * @copyright   Copyright (C) 2010-2020 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ * @deprecated  removed in 2.9.0 - moved to sources/application/WebPage/XMLPage.php
+ */
+ 
--- a/lib/composer/autoload_classmap.php
+++ b/lib/composer/autoload_classmap.php
@@ -17,7 +17,7 @@ return array(
    'ActionChecker' => $baseDir . '/core/userrights.class.inc.php',
    'ActionEmail' => $baseDir . '/core/action.class.inc.php',
    'ActionNotification' => $baseDir . '/core/action.class.inc.php',
-    'AjaxPage' => $baseDir . '/application/WebPage/AjaxPage.php',
+    'AjaxPage' => $baseDir . '/sources/application/WebPage/AjaxPage.php',
    'ApplicationContext' => $baseDir . '/application/applicationcontext.class.inc.php',
    'ApplicationException' => $baseDir . '/application/application.inc.php',
    'ApplicationMenu' => $baseDir . '/application/menunode.class.inc.php',
@@ -98,8 +98,8 @@ return array(
    'BulkExportMissingParameterException' => $baseDir . '/core/bulkexport.class.inc.php',
    'BulkExportResult' => $baseDir . '/core/bulkexport.class.inc.php',
    'BulkExportResultGC' => $baseDir . '/core/bulkexport.class.inc.php',
-    'CLILikeWebPage' => $baseDir . '/application/WebPage/CLILikeWebPage.php',
-    'CLIPage' => $baseDir . '/application/WebPage/CLIPage.php',
+    'CLILikeWebPage' => $baseDir . '/sources/application/WebPage/CLILikeWebPage.php',
+    'CLIPage' => $baseDir . '/sources/application/WebPage/CLIPage.php',
    'CMDBChange' => $baseDir . '/core/cmdbchange.class.inc.php',
    'CMDBChangeOp' => $baseDir . '/core/cmdbchangeop.class.inc.php',
    'CMDBChangeOpCreate' => $baseDir . '/core/cmdbchangeop.class.inc.php',
@@ -124,10 +124,10 @@ return array(
    'CMDBObjectSet' => $baseDir . '/core/cmdbobject.class.inc.php',
    'CMDBSource' => $baseDir . '/core/cmdbsource.class.inc.php',
    'CSVBulkExport' => $baseDir . '/core/csvbulkexport.class.inc.php',
-    'CSVPage' => $baseDir . '/application/WebPage/CSVPage.php',
+    'CSVPage' => $baseDir . '/sources/application/WebPage/CSVPage.php',
    'CSVParser' => $baseDir . '/core/csvparser.class.inc.php',
    'CSVParserException' => $baseDir . '/core/csvparser.class.inc.php',
-    'CaptureWebPage' => $baseDir . '/application/WebPage/CaptureWebPage.php',
+    'CaptureWebPage' => $baseDir . '/sources/application/WebPage/CaptureWebPage.php',
    'CellChangeSpec' => $baseDir . '/core/bulkchange.class.inc.php',
    'CellStatus_Ambiguous' => $baseDir . '/core/bulkchange.class.inc.php',
    'CellStatus_Issue' => $baseDir . '/core/bulkchange.class.inc.php',
@@ -332,7 +332,7 @@ return array(
    'DivisionByZeroError' => $vendorDir . '/symfony/polyfill-php70/Resources/stubs/DivisionByZeroError.php',
    'EMail' => $baseDir . '/core/email.class.inc.php',
    'Error' => $vendorDir . '/symfony/polyfill-php70/Resources/stubs/Error.php',
-    'ErrorPage' => $baseDir . '/application/WebPage/ErrorPage.php',
+    'ErrorPage' => $baseDir . '/sources/application/WebPage/ErrorPage.php',
    'Event' => $baseDir . '/core/event.class.inc.php',
    'EventIssue' => $baseDir . '/core/event.class.inc.php',
    'EventLoginUsage' => $baseDir . '/core/event.class.inc.php',
@@ -414,7 +414,7 @@ return array(
    'NestedQueryOqlExpression' => $baseDir . '/core/oql/oqlquery.class.inc.php',
    'NewObjectMenuNode' => $baseDir . '/application/menunode.class.inc.php',
    'NewsroomProviderBase' => $baseDir . '/application/newsroomprovider.class.inc.php',
-    'NiceWebPage' => $baseDir . '/application/WebPage/NiceWebPage.php',
+    'NiceWebPage' => $baseDir . '/sources/application/WebPage/NiceWebPage.php',
    'NotYetEvaluatedExpression' => $baseDir . '/core/oql/expression.class.inc.php',
    'OQLActualClassTreeResolver' => $baseDir . '/core/oqlactualclasstreeresolver.class.inc.php',
    'OQLClassNode' => $baseDir . '/core/oqlclassnode.class.inc.php',
@@ -447,7 +447,7 @@ return array(
    'OqlUnionQuery' => $baseDir . '/core/oql/oqlquery.class.inc.php',
    'PDF417' => $vendorDir . '/combodo/tcpdf/include/barcodes/pdf417.php',
    'PDFBulkExport' => $baseDir . '/core/pdfbulkexport.class.inc.php',
-    'PDFPage' => $baseDir . '/application/WebPage/PDFPage.php',
+    'PDFPage' => $baseDir . '/sources/application/WebPage/PDFPage.php',
    'PEAR' => $vendorDir . '/pear/pear-core-minimal/src/PEAR.php',
    'PEAR_Error' => $vendorDir . '/pear/pear-core-minimal/src/PEAR.php',
    'PEAR_ErrorStack' => $vendorDir . '/pear/pear-core-minimal/src/PEAR/ErrorStack.php',
@@ -473,7 +473,7 @@ return array(
    'PHP_ParserGenerator_State' => $baseDir . '/core/oql/build/PHP/ParserGenerator/State.php',
    'PHP_ParserGenerator_StateNode' => $baseDir . '/core/oql/build/PHP/ParserGenerator/State.php',
    'PHP_ParserGenerator_Symbol' => $baseDir . '/core/oql/build/PHP/ParserGenerator/Symbol.php',
-    'Page' => $baseDir . '/application/WebPage/Page.php',
+    'Page' => $baseDir . '/sources/application/WebPage/Page.php',
    'ParseError' => $vendorDir . '/symfony/polyfill-php70/Resources/stubs/ParseError.php',
    'ParseyyStackEntry' => $baseDir . '/core/oql/build/PHP/Lempar.php',
    'ParseyyToken' => $baseDir . '/core/oql/build/PHP/Lempar.php',
@@ -1797,7 +1797,7 @@ return array(
    'TCPDF_IMPORT' => $vendorDir . '/combodo/tcpdf/tcpdf_import.php',
    'TCPDF_PARSER' => $vendorDir . '/combodo/tcpdf/tcpdf_parser.php',
    'TCPDF_STATIC' => $vendorDir . '/combodo/tcpdf/include/tcpdf_static.php',
-    'TabManager' => $baseDir . '/application/WebPage/TabManager.php',
+    'TabManager' => $baseDir . '/sources/application/WebPage/TabManager.php',
    'TabularBulkExport' => $baseDir . '/core/tabularbulkexport.class.inc.php',
    'TagSetFieldData' => $baseDir . '/core/tagsetfield.class.inc.php',
    'TemplateMenuNode' => $baseDir . '/application/menunode.class.inc.php',
@@ -2187,7 +2187,7 @@ return array(
    'Twig_Util_DeprecationCollector' => $vendorDir . '/twig/twig/lib/Twig/Util/DeprecationCollector.php',
    'Twig_Util_TemplateDirIterator' => $vendorDir . '/twig/twig/lib/Twig/Util/TemplateDirIterator.php',
    'TypeError' => $vendorDir . '/symfony/polyfill-php70/Resources/stubs/TypeError.php',
-    'UIBlockManager' => $baseDir . '/application/WebPage/UIBlockManager.php',
+    'UIBlockManager' => $baseDir . '/sources/application/WebPage/UIBlockManager.php',
    'UIExtKeyWidget' => $baseDir . '/application/ui.extkeywidget.class.inc.php',
    'UIHTMLEditorWidget' => $baseDir . '/application/ui.htmleditorwidget.class.inc.php',
    'UILinksWidget' => $baseDir . '/application/ui.linkswidget.class.inc.php',
@@ -2213,13 +2213,13 @@ return array(
    'ValueSetRange' => $baseDir . '/core/valuesetdef.class.inc.php',
    'VariableExpression' => $baseDir . '/core/oql/expression.class.inc.php',
    'VariableOqlExpression' => $baseDir . '/core/oql/oqlquery.class.inc.php',
-    'WebPage' => $baseDir . '/application/WebPage/WebPage.php',
+    'WebPage' => $baseDir . '/sources/application/WebPage/WebPage.php',
    'WebPageMenuNode' => $baseDir . '/application/menunode.class.inc.php',
    'WeeklyRotatingLogFileNameBuilder' => $baseDir . '/core/log.class.inc.php',
    'WizardHelper' => $baseDir . '/application/wizardhelper.class.inc.php',
    'XLSXWriter' => $baseDir . '/application/xlsxwriter.class.php',
    'XMLBulkExport' => $baseDir . '/core/xmlbulkexport.class.inc.php',
-    'XMLPage' => $baseDir . '/application/WebPage/XMLPage.php',
+    'XMLPage' => $baseDir . '/sources/application/WebPage/XMLPage.php',
    'ajax_page' => $baseDir . '/application/ajaxwebpage.class.inc.php',
    'apcFile' => $baseDir . '/core/apc-emulation.php',
    'appUserPreferences' => $baseDir . '/application/user.preferences.class.inc.php',
@@ -2250,15 +2250,15 @@ return array(
    'iRestServiceProvider' => $baseDir . '/application/applicationextension.inc.php',
    'iScheduledProcess' => $baseDir . '/core/backgroundprocess.inc.php',
    'iSelfRegister' => $baseDir . '/core/userrights.class.inc.php',
-    'iTabbedPage' => $baseDir . '/application/WebPage/iTabbedPage.php',
+    'iTabbedPage' => $baseDir . '/sources/application/WebPage/iTabbedPage.php',
    'iTopConfigParser' => $baseDir . '/core/iTopConfigParser.php',
    'iTopMutex' => $baseDir . '/core/mutex.class.inc.php',
    'iTopOwnershipLock' => $baseDir . '/core/ownershiplock.class.inc.php',
    'iTopOwnershipToken' => $baseDir . '/core/ownershiplock.class.inc.php',
-    'iTopPDF' => $baseDir . '/application/WebPage/iTopPDF.php',
+    'iTopPDF' => $baseDir . '/sources/application/WebPage/iTopPDF.php',
    'iTopStandardURLMaker' => $baseDir . '/application/applicationcontext.class.inc.php',
-    'iTopWebPage' => $baseDir . '/application/WebPage/iTopWebPage.php',
-    'iTopWizardWebPage' => $baseDir . '/application/WebPage/iTopWizardWebPage.php',
+    'iTopWebPage' => $baseDir . '/sources/application/WebPage/iTopWebPage.php',
+    'iTopWizardWebPage' => $baseDir . '/sources/application/WebPage/iTopWizardWebPage.php',
    'iWorkingTimeComputer' => $baseDir . '/core/computing.inc.php',
    'lnkTriggerAction' => $baseDir . '/core/trigger.class.inc.php',
    'ormCaseLog' => $baseDir . '/core/ormcaselog.class.inc.php',
--- a/lib/composer/autoload_static.php
+++ b/lib/composer/autoload_static.php
@@ -247,7 +247,7 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b
        'ActionChecker' => __DIR__ . '/../..' . '/core/userrights.class.inc.php',
        'ActionEmail' => __DIR__ . '/../..' . '/core/action.class.inc.php',
        'ActionNotification' => __DIR__ . '/../..' . '/core/action.class.inc.php',
-        'AjaxPage' => __DIR__ . '/../..' . '/application/WebPage/AjaxPage.php',
+        'AjaxPage' => __DIR__ . '/../..' . '/sources/application/WebPage/AjaxPage.php',
        'ApplicationContext' => __DIR__ . '/../..' . '/application/applicationcontext.class.inc.php',
        'ApplicationException' => __DIR__ . '/../..' . '/application/application.inc.php',
        'ApplicationMenu' => __DIR__ . '/../..' . '/application/menunode.class.inc.php',
@@ -328,8 +328,8 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b
        'BulkExportMissingParameterException' => __DIR__ . '/../..' . '/core/bulkexport.class.inc.php',
        'BulkExportResult' => __DIR__ . '/../..' . '/core/bulkexport.class.inc.php',
        'BulkExportResultGC' => __DIR__ . '/../..' . '/core/bulkexport.class.inc.php',
-        'CLILikeWebPage' => __DIR__ . '/../..' . '/application/WebPage/CLILikeWebPage.php',
-        'CLIPage' => __DIR__ . '/../..' . '/application/WebPage/CLIPage.php',
+        'CLILikeWebPage' => __DIR__ . '/../..' . '/sources/application/WebPage/CLILikeWebPage.php',
+        'CLIPage' => __DIR__ . '/../..' . '/sources/application/WebPage/CLIPage.php',
        'CMDBChange' => __DIR__ . '/../..' . '/core/cmdbchange.class.inc.php',
        'CMDBChangeOp' => __DIR__ . '/../..' . '/core/cmdbchangeop.class.inc.php',
        'CMDBChangeOpCreate' => __DIR__ . '/../..' . '/core/cmdbchangeop.class.inc.php',
@@ -354,10 +354,10 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b
        'CMDBObjectSet' => __DIR__ . '/../..' . '/core/cmdbobject.class.inc.php',
        'CMDBSource' => __DIR__ . '/../..' . '/core/cmdbsource.class.inc.php',
        'CSVBulkExport' => __DIR__ . '/../..' . '/core/csvbulkexport.class.inc.php',
-        'CSVPage' => __DIR__ . '/../..' . '/application/WebPage/CSVPage.php',
+        'CSVPage' => __DIR__ . '/../..' . '/sources/application/WebPage/CSVPage.php',
        'CSVParser' => __DIR__ . '/../..' . '/core/csvparser.class.inc.php',
        'CSVParserException' => __DIR__ . '/../..' . '/core/csvparser.class.inc.php',
-        'CaptureWebPage' => __DIR__ . '/../..' . '/application/WebPage/CaptureWebPage.php',
+        'CaptureWebPage' => __DIR__ . '/../..' . '/sources/application/WebPage/CaptureWebPage.php',
        'CellChangeSpec' => __DIR__ . '/../..' . '/core/bulkchange.class.inc.php',
        'CellStatus_Ambiguous' => __DIR__ . '/../..' . '/core/bulkchange.class.inc.php',
        'CellStatus_Issue' => __DIR__ . '/../..' . '/core/bulkchange.class.inc.php',
@@ -562,7 +562,7 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b
        'DivisionByZeroError' => __DIR__ . '/..' . '/symfony/polyfill-php70/Resources/stubs/DivisionByZeroError.php',
        'EMail' => __DIR__ . '/../..' . '/core/email.class.inc.php',
        'Error' => __DIR__ . '/..' . '/symfony/polyfill-php70/Resources/stubs/Error.php',
-        'ErrorPage' => __DIR__ . '/../..' . '/application/WebPage/ErrorPage.php',
+        'ErrorPage' => __DIR__ . '/../..' . '/sources/application/WebPage/ErrorPage.php',
        'Event' => __DIR__ . '/../..' . '/core/event.class.inc.php',
        'EventIssue' => __DIR__ . '/../..' . '/core/event.class.inc.php',
        'EventLoginUsage' => __DIR__ . '/../..' . '/core/event.class.inc.php',
@@ -644,7 +644,7 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b
        'NestedQueryOqlExpression' => __DIR__ . '/../..' . '/core/oql/oqlquery.class.inc.php',
        'NewObjectMenuNode' => __DIR__ . '/../..' . '/application/menunode.class.inc.php',
        'NewsroomProviderBase' => __DIR__ . '/../..' . '/application/newsroomprovider.class.inc.php',
-        'NiceWebPage' => __DIR__ . '/../..' . '/application/WebPage/NiceWebPage.php',
+        'NiceWebPage' => __DIR__ . '/../..' . '/sources/application/WebPage/NiceWebPage.php',
        'NotYetEvaluatedExpression' => __DIR__ . '/../..' . '/core/oql/expression.class.inc.php',
        'OQLActualClassTreeResolver' => __DIR__ . '/../..' . '/core/oqlactualclasstreeresolver.class.inc.php',
        'OQLClassNode' => __DIR__ . '/../..' . '/core/oqlclassnode.class.inc.php',
@@ -677,7 +677,7 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b
        'OqlUnionQuery' => __DIR__ . '/../..' . '/core/oql/oqlquery.class.inc.php',
        'PDF417' => __DIR__ . '/..' . '/combodo/tcpdf/include/barcodes/pdf417.php',
        'PDFBulkExport' => __DIR__ . '/../..' . '/core/pdfbulkexport.class.inc.php',
-        'PDFPage' => __DIR__ . '/../..' . '/application/WebPage/PDFPage.php',
+        'PDFPage' => __DIR__ . '/../..' . '/sources/application/WebPage/PDFPage.php',
        'PEAR' => __DIR__ . '/..' . '/pear/pear-core-minimal/src/PEAR.php',
        'PEAR_Error' => __DIR__ . '/..' . '/pear/pear-core-minimal/src/PEAR.php',
        'PEAR_ErrorStack' => __DIR__ . '/..' . '/pear/pear-core-minimal/src/PEAR/ErrorStack.php',
@@ -703,7 +703,7 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b
        'PHP_ParserGenerator_State' => __DIR__ . '/../..' . '/core/oql/build/PHP/ParserGenerator/State.php',
        'PHP_ParserGenerator_StateNode' => __DIR__ . '/../..' . '/core/oql/build/PHP/ParserGenerator/State.php',
        'PHP_ParserGenerator_Symbol' => __DIR__ . '/../..' . '/core/oql/build/PHP/ParserGenerator/Symbol.php',
-        'Page' => __DIR__ . '/../..' . '/application/WebPage/Page.php',
+        'Page' => __DIR__ . '/../..' . '/sources/application/WebPage/Page.php',
        'ParseError' => __DIR__ . '/..' . '/symfony/polyfill-php70/Resources/stubs/ParseError.php',
        'ParseyyStackEntry' => __DIR__ . '/../..' . '/core/oql/build/PHP/Lempar.php',
        'ParseyyToken' => __DIR__ . '/../..' . '/core/oql/build/PHP/Lempar.php',
@@ -2027,7 +2027,7 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b
        'TCPDF_IMPORT' => __DIR__ . '/..' . '/combodo/tcpdf/tcpdf_import.php',
        'TCPDF_PARSER' => __DIR__ . '/..' . '/combodo/tcpdf/tcpdf_parser.php',
        'TCPDF_STATIC' => __DIR__ . '/..' . '/combodo/tcpdf/include/tcpdf_static.php',
-        'TabManager' => __DIR__ . '/../..' . '/application/WebPage/TabManager.php',
+        'TabManager' => __DIR__ . '/../..' . '/sources/application/WebPage/TabManager.php',
        'TabularBulkExport' => __DIR__ . '/../..' . '/core/tabularbulkexport.class.inc.php',
        'TagSetFieldData' => __DIR__ . '/../..' . '/core/tagsetfield.class.inc.php',
        'TemplateMenuNode' => __DIR__ . '/../..' . '/application/menunode.class.inc.php',
@@ -2417,7 +2417,7 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b
        'Twig_Util_DeprecationCollector' => __DIR__ . '/..' . '/twig/twig/lib/Twig/Util/DeprecationCollector.php',
        'Twig_Util_TemplateDirIterator' => __DIR__ . '/..' . '/twig/twig/lib/Twig/Util/TemplateDirIterator.php',
        'TypeError' => __DIR__ . '/..' . '/symfony/polyfill-php70/Resources/stubs/TypeError.php',
-        'UIBlockManager' => __DIR__ . '/../..' . '/application/WebPage/UIBlockManager.php',
+        'UIBlockManager' => __DIR__ . '/../..' . '/sources/application/WebPage/UIBlockManager.php',
        'UIExtKeyWidget' => __DIR__ . '/../..' . '/application/ui.extkeywidget.class.inc.php',
        'UIHTMLEditorWidget' => __DIR__ . '/../..' . '/application/ui.htmleditorwidget.class.inc.php',
        'UILinksWidget' => __DIR__ . '/../..' . '/application/ui.linkswidget.class.inc.php',
@@ -2443,13 +2443,13 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b
        'ValueSetRange' => __DIR__ . '/../..' . '/core/valuesetdef.class.inc.php',
        'VariableExpression' => __DIR__ . '/../..' . '/core/oql/expression.class.inc.php',
        'VariableOqlExpression' => __DIR__ . '/../..' . '/core/oql/oqlquery.class.inc.php',
-        'WebPage' => __DIR__ . '/../..' . '/application/WebPage/WebPage.php',
+        'WebPage' => __DIR__ . '/../..' . '/sources/application/WebPage/WebPage.php',
        'WebPageMenuNode' => __DIR__ . '/../..' . '/application/menunode.class.inc.php',
        'WeeklyRotatingLogFileNameBuilder' => __DIR__ . '/../..' . '/core/log.class.inc.php',
        'WizardHelper' => __DIR__ . '/../..' . '/application/wizardhelper.class.inc.php',
        'XLSXWriter' => __DIR__ . '/../..' . '/application/xlsxwriter.class.php',
        'XMLBulkExport' => __DIR__ . '/../..' . '/core/xmlbulkexport.class.inc.php',
-        'XMLPage' => __DIR__ . '/../..' . '/application/WebPage/XMLPage.php',
+        'XMLPage' => __DIR__ . '/../..' . '/sources/application/WebPage/XMLPage.php',
        'ajax_page' => __DIR__ . '/../..' . '/application/ajaxwebpage.class.inc.php',
        'apcFile' => __DIR__ . '/../..' . '/core/apc-emulation.php',
        'appUserPreferences' => __DIR__ . '/../..' . '/application/user.preferences.class.inc.php',
@@ -2480,15 +2480,15 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b
        'iRestServiceProvider' => __DIR__ . '/../..' . '/application/applicationextension.inc.php',
        'iScheduledProcess' => __DIR__ . '/../..' . '/core/backgroundprocess.inc.php',
        'iSelfRegister' => __DIR__ . '/../..' . '/core/userrights.class.inc.php',
-        'iTabbedPage' => __DIR__ . '/../..' . '/application/WebPage/iTabbedPage.php',
+        'iTabbedPage' => __DIR__ . '/../..' . '/sources/application/WebPage/iTabbedPage.php',
        'iTopConfigParser' => __DIR__ . '/../..' . '/core/iTopConfigParser.php',
        'iTopMutex' => __DIR__ . '/../..' . '/core/mutex.class.inc.php',
        'iTopOwnershipLock' => __DIR__ . '/../..' . '/core/ownershiplock.class.inc.php',
        'iTopOwnershipToken' => __DIR__ . '/../..' . '/core/ownershiplock.class.inc.php',
-        'iTopPDF' => __DIR__ . '/../..' . '/application/WebPage/iTopPDF.php',
+        'iTopPDF' => __DIR__ . '/../..' . '/sources/application/WebPage/iTopPDF.php',
        'iTopStandardURLMaker' => __DIR__ . '/../..' . '/application/applicationcontext.class.inc.php',
-        'iTopWebPage' => __DIR__ . '/../..' . '/application/WebPage/iTopWebPage.php',
-        'iTopWizardWebPage' => __DIR__ . '/../..' . '/application/WebPage/iTopWizardWebPage.php',
+        'iTopWebPage' => __DIR__ . '/../..' . '/sources/application/WebPage/iTopWebPage.php',
+        'iTopWizardWebPage' => __DIR__ . '/../..' . '/sources/application/WebPage/iTopWizardWebPage.php',
        'iWorkingTimeComputer' => __DIR__ . '/../..' . '/core/computing.inc.php',
        'lnkTriggerAction' => __DIR__ . '/../..' . '/core/trigger.class.inc.php',
        'ormCaseLog' => __DIR__ . '/../..' . '/core/ormcaselog.class.inc.php',
--- a/sources/application/WebPage/AjaxPage.php
+++ b/sources/application/WebPage/AjaxPage.php
--- a/sources/application/WebPage/CLILikeWebPage.php
+++ b/sources/application/WebPage/CLILikeWebPage.php
--- a/sources/application/WebPage/CLIPage.php
+++ b/sources/application/WebPage/CLIPage.php
--- a/sources/application/WebPage/CSVPage.php
+++ b/sources/application/WebPage/CSVPage.php
--- a/sources/application/WebPage/CaptureWebPage.php
+++ b/sources/application/WebPage/CaptureWebPage.php
--- a/sources/application/WebPage/ErrorPage.php
+++ b/sources/application/WebPage/ErrorPage.php
--- a/sources/application/WebPage/NiceWebPage.php
+++ b/sources/application/WebPage/NiceWebPage.php
--- a/sources/application/WebPage/PDFPage.php
+++ b/sources/application/WebPage/PDFPage.php
--- a/sources/application/WebPage/Page.php
+++ b/sources/application/WebPage/Page.php
--- a/sources/application/WebPage/TabManager.php
+++ b/sources/application/WebPage/TabManager.php
--- a/sources/application/WebPage/UIBlockManager.php
+++ b/sources/application/WebPage/UIBlockManager.php
--- a/sources/application/WebPage/WebPage.php
+++ b/sources/application/WebPage/WebPage.php
--- a/sources/application/WebPage/XMLPage.php
+++ b/sources/application/WebPage/XMLPage.php
--- a/sources/application/WebPage/iTabbedPage.php
+++ b/sources/application/WebPage/iTabbedPage.php
--- a/sources/application/WebPage/iTopPDF.php
+++ b/sources/application/WebPage/iTopPDF.php
--- a/sources/application/WebPage/iTopWebPage.php
+++ b/sources/application/WebPage/iTopWebPage.php
@@ -1248,7 +1248,7 @@ EOF
 		{
 			$sHtml .= "<div class=\"explain-printable not-printable\">";
 			$sHtml .= '<p>'.Dict::Format('UI:ExplainPrintable',
-					'<img src="../../images/eye-open-555.png" style="vertical-align:middle">').'</p>';
+					'<img src="../../../images/eye-open-555.png" style="vertical-align:middle">').'</p>';
 			$sHtml .= "<div id=\"hiddeable_chapters\"></div>";
 			$sHtml .= '<button onclick="window.print()">'.htmlentities(Dict::S('UI:Button:GoPrint'), ENT_QUOTES,
 					self::PAGES_CHARSET).'</button>';
--- a/sources/application/WebPage/iTopWizardWebPage.php
+++ b/sources/application/WebPage/iTopWizardWebPage.php