Internal: Portal code cleanup

SVN:trunk[5265]
This commit is contained in:
Guillaume Lajarige
2018-01-16 16:25:31 +00:00
parent bb052f30d6
commit 896c6b79db
21 changed files with 219 additions and 239 deletions

View File

@@ -19,24 +19,21 @@
namespace Combodo\iTop\Portal\Controller;
use \Silex\Application;
use \Symfony\Component\HttpFoundation\Request;
use \Exception;
use \UserRights;
use \Dict;
use \MetaModel;
use \DBSearch;
use \DBObjectSearch;
use \DBObjectSet;
use \DBObject;
use \BinaryExpression;
use \FieldExpression;
use \VariableExpression;
use \Combodo\iTop\Portal\Helper\ApplicationHelper;
use \Combodo\iTop\Portal\Helper\SecurityHelper;
use \Combodo\iTop\Portal\Helper\ContextManipulatorHelper;
use \Combodo\iTop\Portal\Brick\AbstractBrick;
use \Combodo\iTop\Portal\Brick\BrowseBrick;
use Silex\Application;
use Symfony\Component\HttpFoundation\Request;
use UserRights;
use Dict;
use MetaModel;
use DBSearch;
use DBObjectSet;
use BinaryExpression;
use FieldExpression;
use VariableExpression;
use Combodo\iTop\Portal\Helper\ApplicationHelper;
use Combodo\iTop\Portal\Helper\SecurityHelper;
use Combodo\iTop\Portal\Helper\ContextManipulatorHelper;
use Combodo\iTop\Portal\Brick\AbstractBrick;
use Combodo\iTop\Portal\Brick\BrowseBrick;
class BrowseBrickController extends BrickController
{

View File

@@ -19,13 +19,13 @@
namespace Combodo\iTop\Portal\Controller;
use \Silex\Application;
use \Symfony\Component\HttpFoundation\Request;
use \Symfony\Component\HttpKernel\HttpKernelInterface;
use \MetaModel;
use \Combodo\iTop\Portal\Helper\ApplicationHelper;
use \Combodo\iTop\Portal\Helper\ContextManipulatorHelper;
use \Combodo\iTop\Portal\Helper\SecurityHelper;
use Silex\Application;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpKernel\HttpKernelInterface;
use MetaModel;
use Combodo\iTop\Portal\Helper\ApplicationHelper;
use Combodo\iTop\Portal\Helper\ContextManipulatorHelper;
use Combodo\iTop\Portal\Helper\SecurityHelper;
class CreateBrickController extends BrickController
{

View File

@@ -20,34 +20,34 @@
namespace Combodo\iTop\Portal\Controller;
use Combodo\iTop\Portal\Helper\ScopeValidatorHelper;
use \Silex\Application;
use \Symfony\Component\HttpFoundation\Request;
use \UserRights;
use \CMDBSource;
use \IssueLog;
use \MetaModel;
use \AttributeDefinition;
use \AttributeDate;
use \AttributeDateTime;
use \AttributeDuration;
use \AttributeSubItem;
use \DBSearch;
use \DBObjectSearch;
use \DBObjectSet;
use \DBObject;
use \FieldExpression;
use \BinaryExpression;
use \VariableExpression;
use \SQLExpression;
use \UnaryExpression;
use \Dict;
use \iPopupMenuExtension;
use \URLButtonItem;
use \JSButtonItem;
use \Combodo\iTop\Portal\Helper\ApplicationHelper;
use \Combodo\iTop\Portal\Helper\SecurityHelper;
use \Combodo\iTop\Portal\Brick\AbstractBrick;
use \Combodo\iTop\Portal\Brick\ManageBrick;
use Silex\Application;
use Symfony\Component\HttpFoundation\Request;
use UserRights;
use CMDBSource;
use IssueLog;
use MetaModel;
use AttributeDefinition;
use AttributeDate;
use AttributeDateTime;
use AttributeDuration;
use AttributeSubItem;
use DBSearch;
use DBObjectSearch;
use DBObjectSet;
use DBObject;
use FieldExpression;
use BinaryExpression;
use VariableExpression;
use SQLExpression;
use UnaryExpression;
use Dict;
use iPopupMenuExtension;
use URLButtonItem;
use JSButtonItem;
use Combodo\iTop\Portal\Helper\ApplicationHelper;
use Combodo\iTop\Portal\Helper\SecurityHelper;
use Combodo\iTop\Portal\Brick\AbstractBrick;
use Combodo\iTop\Portal\Brick\ManageBrick;
class ManageBrickController extends BrickController
{

View File

@@ -19,40 +19,40 @@
namespace Combodo\iTop\Portal\Controller;
use \Silex\Application;
use \Symfony\Component\HttpFoundation\Request;
use \Symfony\Component\HttpFoundation\Response;
use \Symfony\Component\HttpFoundation\RedirectResponse;
use \Symfony\Component\HttpKernel\HttpKernelInterface;
use \Exception;
use \FileUploadException;
use \utils;
use \Dict;
use \IssueLog;
use \MetaModel;
use \DBObject;
use \DBSearch;
use \DBObjectSearch;
use \FalseExpression;
use \BinaryExpression;
use \FieldExpression;
use \VariableExpression;
use \ListExpression;
use \ScalarExpression;
use \DBObjectSet;
use \cmdbAbstractObject;
use \AttributeEnum;
use \AttributeFinalClass;
use \AttributeFriendlyName;
use \UserRights;
use \iPopupMenuExtension;
use \URLButtonItem;
use \JSButtonItem;
use \Combodo\iTop\Portal\Helper\ApplicationHelper;
use \Combodo\iTop\Portal\Helper\SecurityHelper;
use \Combodo\iTop\Portal\Helper\ContextManipulatorHelper;
use \Combodo\iTop\Portal\Form\ObjectFormManager;
use \Combodo\iTop\Renderer\Bootstrap\BsFormRenderer;
use Silex\Application;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpKernel\HttpKernelInterface;
use Exception;
use FileUploadException;
use utils;
use Dict;
use IssueLog;
use MetaModel;
use DBObject;
use DBSearch;
use DBObjectSearch;
use FalseExpression;
use BinaryExpression;
use FieldExpression;
use VariableExpression;
use ListExpression;
use ScalarExpression;
use DBObjectSet;
use cmdbAbstractObject;
use AttributeEnum;
use AttributeFinalClass;
use AttributeFriendlyName;
use UserRights;
use iPopupMenuExtension;
use URLButtonItem;
use JSButtonItem;
use Combodo\iTop\Portal\Helper\ApplicationHelper;
use Combodo\iTop\Portal\Helper\SecurityHelper;
use Combodo\iTop\Portal\Helper\ContextManipulatorHelper;
use Combodo\iTop\Portal\Form\ObjectFormManager;
use Combodo\iTop\Renderer\Bootstrap\BsFormRenderer;
/**
* Controller to handle basic view / edit / create of cmdbAbstractObject

View File

@@ -19,19 +19,19 @@
namespace Combodo\iTop\Portal\Controller;
use \Exception;
use \IssueLog;
use \utils;
use \MetaModel;
use \UserRights;
use \Silex\Application;
use \Symfony\Component\HttpFoundation\Request;
use \Combodo\iTop\Portal\Helper\ApplicationHelper;
use \Combodo\iTop\Portal\Brick\UserProfileBrick;
use \Combodo\iTop\Portal\Controller\ObjectController;
use \Combodo\iTop\Portal\Form\PreferencesFormManager;
use \Combodo\iTop\Portal\Form\PasswordFormManager;
use \Combodo\iTop\Renderer\Bootstrap\BsFormRenderer;
use Exception;
use IssueLog;
use utils;
use MetaModel;
use UserRights;
use Silex\Application;
use Symfony\Component\HttpFoundation\Request;
use Combodo\iTop\Portal\Helper\ApplicationHelper;
use Combodo\iTop\Portal\Brick\UserProfileBrick;
use Combodo\iTop\Portal\Controller\ObjectController;
use Combodo\iTop\Portal\Form\PreferencesFormManager;
use Combodo\iTop\Portal\Form\PasswordFormManager;
use Combodo\iTop\Renderer\Bootstrap\BsFormRenderer;
class UserProfileBrickController extends BrickController
{

View File

@@ -22,10 +22,10 @@ namespace Combodo\iTop\Portal\Brick;
require_once APPROOT . '/core/moduledesign.class.inc.php';
require_once APPROOT . '/setup/compiler.class.inc.php';
use \DOMXPath;
use \DOMFormatException;
use \ModuleDesign;
use \Combodo\iTop\DesignElement;
use DOMXPath;
use DOMFormatException;
use ModuleDesign;
use Combodo\iTop\DesignElement;
/**
* Description of AbstractBrick

View File

@@ -19,9 +19,9 @@
namespace Combodo\iTop\Portal\Brick;
use \DOMFormatException;
use \Combodo\iTop\DesignElement;
use \Combodo\iTop\Portal\Brick\PortalBrick;
use DOMFormatException;
use Combodo\iTop\DesignElement;
use Combodo\iTop\Portal\Brick\PortalBrick;
/**
* Description of BrowseBrick

View File

@@ -19,9 +19,9 @@
namespace Combodo\iTop\Portal\Brick;
use \DOMFormatException;
use \Combodo\iTop\DesignElement;
use \Combodo\iTop\Portal\Brick\PortalBrick;
use DOMFormatException;
use Combodo\iTop\DesignElement;
use Combodo\iTop\Portal\Brick\PortalBrick;
/**
* Description of CreateBrick

View File

@@ -19,9 +19,9 @@
namespace Combodo\iTop\Portal\Brick;
use \Combodo\iTop\DesignElement;
use \Combodo\iTop\Portal\Brick\PortalBrick;
use \Combodo\iTop\Portal\Brick\BrowseBrick;
use Combodo\iTop\DesignElement;
use Combodo\iTop\Portal\Brick\PortalBrick;
use Combodo\iTop\Portal\Brick\BrowseBrick;
/**
* Description of FilterBrick

View File

@@ -19,11 +19,11 @@
namespace Combodo\iTop\Portal\Brick;
use \Combodo\iTop\DesignElement;
use \Combodo\iTop\Portal\Brick\PortalBrick;
use DOMFormatException;
use DBSearch;
use MetaModel;
use Combodo\iTop\DesignElement;
use Combodo\iTop\Portal\Brick\PortalBrick;
/**
* Description of ManageBrick

View File

@@ -1,6 +1,6 @@
<?php
// Copyright (C) 2010-2015 Combodo SARL
// Copyright (C) 2010-2018 Combodo SARL
//
// This file is part of iTop.
//
@@ -19,9 +19,8 @@
namespace Combodo\iTop\Portal\Brick;
use \ModuleDesign;
use \Combodo\iTop\DesignElement;
use \Combodo\iTop\Portal\Brick\AbstractBrick;
use ModuleDesign;
use Combodo\iTop\DesignElement;
/**
* Description of PortalBrick

View File

@@ -1,5 +1,5 @@
<?php
// Copyright (C) 2010-2017 Combodo SARL
// Copyright (C) 2010-2018 Combodo SARL
//
// This file is part of iTop.
//
@@ -18,9 +18,8 @@
namespace Combodo\iTop\Portal\Brick;
use \DOMFormatException;
use \Combodo\iTop\DesignElement;
use \Combodo\iTop\Portal\Brick\PortalBrick;
use DOMFormatException;
use Combodo\iTop\DesignElement;
/**
* Description of UserProfileBrick

View File

@@ -1,6 +1,6 @@
<?php
// Copyright (C) 2010-2018Combodo SARL
// Copyright (C) 2010-2018 Combodo SARL
//
// This file is part of iTop.
//
@@ -19,31 +19,27 @@
namespace Combodo\iTop\Portal\Form;
use \Exception;
use \Silex\Application;
use \utils;
use \Dict;
use \IssueLog;
use \UserRights;
use \MetaModel;
use \CMDBSource;
use \DBObject;
use \DBObjectSet;
use \DBSearch;
use \DBObjectSearch;
use \BinaryExpression;
use \FieldExpression;
use \ScalarExpression;
use \DBObjectSetComparator;
use \InlineImage;
use \AttributeDateTime;
use \AttachmentPlugIn;
use \Combodo\iTop\Form\FormManager;
use \Combodo\iTop\Form\Form;
use \Combodo\iTop\Form\Field\Field;
use \Combodo\iTop\Form\Field\FileUploadField;
use \Combodo\iTop\Form\Field\LabelField;
use \Combodo\iTop\Portal\Helper\ApplicationHelper;
use Exception;
use Silex\Application;
use utils;
use Dict;
use IssueLog;
use UserRights;
use MetaModel;
use CMDBSource;
use DBObject;
use DBObjectSet;
use DBSearch;
use DBObjectSearch;
use InlineImage;
use AttributeDateTime;
use AttachmentPlugIn;
use Combodo\iTop\Form\FormManager;
use Combodo\iTop\Form\Form;
use Combodo\iTop\Form\Field\Field;
use Combodo\iTop\Form\Field\FileUploadField;
use Combodo\iTop\Form\Field\LabelField;
use Combodo\iTop\Portal\Helper\ApplicationHelper;
/**
* Description of objectformmanager

View File

@@ -1,6 +1,6 @@
<?php
// Copyright (C) 2010-2016 Combodo SARL
// Copyright (C) 2010-2018 Combodo SARL
//
// This file is part of iTop.
//
@@ -19,14 +19,13 @@
namespace Combodo\iTop\Portal\Form;
use \Exception;
use \CMDBSource;
use \Dict;
use \UserRights;
use \Combodo\iTop\Form\FormManager;
use \Combodo\iTop\Form\Form;
use \Combodo\iTop\Form\Field\HiddenField;
use \Combodo\iTop\Form\Field\PasswordField;
use Exception;
use Dict;
use UserRights;
use Combodo\iTop\Form\FormManager;
use Combodo\iTop\Form\Form;
use Combodo\iTop\Form\Field\HiddenField;
use Combodo\iTop\Form\Field\PasswordField;
/**
* Description of passwordformmanager

View File

@@ -1,6 +1,6 @@
<?php
// Copyright (C) 2010-2016 Combodo SARL
// Copyright (C) 2010-2018 Combodo SARL
//
// This file is part of iTop.
//
@@ -19,14 +19,14 @@
namespace Combodo\iTop\Portal\Form;
use \Exception;
use \CMDBSource;
use \Dict;
use \UserRights;
use \Combodo\iTop\Form\FormManager;
use \Combodo\iTop\Form\Form;
use \Combodo\iTop\Form\Field\HiddenField;
use \Combodo\iTop\Form\Field\SelectField;
use Exception;
use CMDBSource;
use Dict;
use UserRights;
use Combodo\iTop\Form\FormManager;
use Combodo\iTop\Form\Form;
use Combodo\iTop\Form\Field\HiddenField;
use Combodo\iTop\Form\Field\SelectField;
/**
* Description of preferencesformmanager

View File

@@ -1,6 +1,6 @@
<?php
// Copyright (C) 2010-2017 Combodo SARL
// Copyright (C) 2010-2018 Combodo SARL
//
// This file is part of iTop.
//
@@ -19,26 +19,24 @@
namespace Combodo\iTop\Portal\Helper;
use \Exception;
use \Silex\Application;
use \Symfony\Component\Debug\ErrorHandler;
use \Symfony\Component\Debug\ExceptionHandler;
use \Symfony\Component\HttpFoundation\Request;
use \Twig_Environment;
use \Twig_SimpleFilter;
use \Dict;
use \utils;
use \IssueLog;
use \UserRights;
use \CMDBSource;
use \DOMFormatException;
use \ModuleDesign;
use \MetaModel;
use \DBObjectSearch;
use \DBObjectSet;
use \iPortalUIExtension;
use \ApplicationContext;
use \Combodo\iTop\Portal\Brick\AbstractBrick;
use Exception;
use Silex\Application;
use Symfony\Component\Debug\ErrorHandler;
use Symfony\Component\Debug\ExceptionHandler;
use Twig_Environment;
use Twig_SimpleFilter;
use Dict;
use utils;
use IssueLog;
use UserRights;
use DOMFormatException;
use ModuleDesign;
use MetaModel;
use DBObjectSearch;
use DBObjectSet;
use iPortalUIExtension;
use ApplicationContext;
use Combodo\iTop\Portal\Brick\AbstractBrick;
/**
* Contains static methods to help loading / registering classes of the application.

View File

@@ -1,6 +1,6 @@
<?php
// Copyright (C) 2010-2015 Combodo SARL
// Copyright (C) 2010-2018 Combodo SARL
//
// This file is part of iTop.
//
@@ -19,20 +19,17 @@
namespace Combodo\iTop\Portal\Helper;
use \Exception;
use \Silex\Application;
use \DOMNodeList;
use \DOMFormatException;
use \UserRights;
use \DBObject;
use \DBSearch;
use \DBObjectSet;
use \BinaryExpression;
use \FieldExpression;
use \ScalarExpression;
use \iTopObjectCopier;
use \Combodo\iTop\DesignElement;
use \Combodo\iTop\Portal\Brick\Portalbrick;
use Exception;
use Silex\Application;
use DOMNodeList;
use DOMFormatException;
use UserRights;
use DBObject;
use DBSearch;
use DBObjectSet;
use BinaryExpression;
use FieldExpression;
use ScalarExpression;
class ContextManipulatorHelper
{

View File

@@ -1,6 +1,6 @@
<?php
// Copyright (C) 2010-2017 Combodo SARL
// Copyright (C) 2010-2018 Combodo SARL
//
// This file is part of iTop.
//
@@ -19,13 +19,13 @@
namespace Combodo\iTop\Portal\Helper;
use \Exception;
use \DOMNodeList;
use \DOMFormatException;
use \utils;
use \ProfilesConfig;
use \MetaModel;
use \DBSearch;
use Exception;
use DOMNodeList;
use DOMFormatException;
use utils;
use ProfilesConfig;
use MetaModel;
use DBSearch;
class LifecycleValidatorHelper
{

View File

@@ -1,6 +1,6 @@
<?php
// Copyright (C) 2010-2017 Combodo SARL
// Copyright (C) 2010-2018 Combodo SARL
//
// This file is part of iTop.
//
@@ -19,15 +19,14 @@
namespace Combodo\iTop\Portal\Helper;
use \Exception;
use \DOMNodeList;
use \DOMFormatException;
use \utils;
use \ProfilesConfig;
use \MetaModel;
use \DBSearch;
use \DBUnionSearch;
use \Combodo\iTop\DesignElement;
use Exception;
use DOMNodeList;
use DOMFormatException;
use utils;
use ProfilesConfig;
use MetaModel;
use DBSearch;
use DBUnionSearch;
class ScopeValidatorHelper
{

View File

@@ -1,6 +1,6 @@
<?php
// Copyright (C) 2010-2017 Combodo SARL
// Copyright (C) 2010-2018 Combodo SARL
//
// This file is part of iTop.
//
@@ -19,20 +19,16 @@
namespace Combodo\iTop\Portal\Helper;
use \Exception;
use \Silex\Application;
use \utils;
use \UserRights;
use \Dict;
use \IssueLog;
use \MetaModel;
use \DBSearch;
use \DBObjectSearch;
use \DBObjectSet;
use \FieldExpression;
use \VariableExpression;
use \BinaryExpression;
use \Combodo\iTop\Portal\Helper\ScopeValidatorHelper;
use Silex\Application;
use UserRights;
use IssueLog;
use MetaModel;
use DBSearch;
use DBObjectSearch;
use DBObjectSet;
use FieldExpression;
use VariableExpression;
use BinaryExpression;
/**
* SecurityHelper class

View File

@@ -1,6 +1,6 @@
<?php
// Copyright (C) 2010-2017 Combodo SARL
// Copyright (C) 2010-2018 Combodo SARL
//
// This file is part of iTop.
//
@@ -43,8 +43,8 @@ require_once __DIR__ . '/../src/helpers/lifecyclevalidatorhelper.class.inc.php';
require_once __DIR__ . '/../src/helpers/securityhelper.class.inc.php';
require_once __DIR__ . '/../src/helpers/applicationhelper.class.inc.php';
use \Silex\Application;
use \Combodo\iTop\Portal\Helper\ApplicationHelper;
use Silex\Application;
use Combodo\iTop\Portal\Helper\ApplicationHelper;
// Stacking context tag so it knows we are in the portal
$oContex = new ContextTag('GUI:Portal');