diff --git a/core/config.class.inc.php b/core/config.class.inc.php index 662f8539b..3e9dcd7d2 100644 --- a/core/config.class.inc.php +++ b/core/config.class.inc.php @@ -940,15 +940,6 @@ class Config 'source_of_value' => '', 'show_in_conf_sample' => false, ), - 'portal_tickets' => array( - 'type' => 'string', - 'description' => 'CSV list of classes supported in the portal', - // examples... not used - 'default' => 'UserRequest', - 'value' => 'UserRequest', - 'source_of_value' => '', - 'show_in_conf_sample' => true, - ), 'portal_dispatch_urls' => array( 'type' => 'array', 'description' => 'Associative array of sPortalId => Home page URL (relatively to the application root)', diff --git a/datamodels/2.x/itop-welcome-itil/main.itop-welcome-itil.php b/datamodels/2.x/itop-welcome-itil/main.itop-welcome-itil.php deleted file mode 100755 index 84889d5b7..000000000 --- a/datamodels/2.x/itop-welcome-itil/main.itop-welcome-itil.php +++ /dev/null @@ -1,61 +0,0 @@ - - -// Add the standard menus (done in XML) -/* - * +--------------------+ - * | Welcome | - * +--------------------+ - * Welcome To iTop - * +--------------------+ - * | Tools | - * +--------------------+ - * CSV Import - * +--------------------+ - * | Admin Tools | - * +--------------------+ - * User Accounts - * Profiles - * Notifications - * Run Queries - * Export - * Data Model - * Universal Search - */ - -/** - * Direct end-users to the standard Portal application - */ -class MyPortalURLMaker implements iDBObjectURLMaker -{ - public static function MakeObjectURL($sClass, $iId) - { - if (strpos(MetaModel::GetConfig()->Get('portal_tickets'), $sClass) !== false) - { - $sAbsoluteUrl = utils::GetAbsoluteUrlAppRoot(); - $sUrl = "{$sAbsoluteUrl}portal/index.php?operation=details&class=$sClass&id=$iId"; - } - else - { - $sUrl = ''; - } - return $sUrl; - } -} - -?> diff --git a/datamodels/2.x/itop-welcome-itil/module.itop-welcome-itil.php b/datamodels/2.x/itop-welcome-itil/module.itop-welcome-itil.php index d60ffc000..cfdfaac9a 100755 --- a/datamodels/2.x/itop-welcome-itil/module.itop-welcome-itil.php +++ b/datamodels/2.x/itop-welcome-itil/module.itop-welcome-itil.php @@ -21,7 +21,6 @@ SetupWebPage::AddModule( // Components // 'datamodel' => array( - 'main.itop-welcome-itil.php', 'model.itop-welcome-itil.php', ), 'webservice' => array(