diff --git a/datamodels/2.x/itop-portal-base/portal/src/controllers/abstractcontroller.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/controllers/abstractcontroller.class.inc.php index af3b2356e..1bdc1ebd6 100644 --- a/datamodels/2.x/itop-portal-base/portal/src/controllers/abstractcontroller.class.inc.php +++ b/datamodels/2.x/itop-portal-base/portal/src/controllers/abstractcontroller.class.inc.php @@ -20,9 +20,11 @@ namespace Combodo\iTop\Portal\Controller; /** - * AbstractController class + * Class AbstractController * + * @package Combodo\iTop\Portal\Controller * @author Guillaume Lajarige + * @since 2.3.0 */ abstract class AbstractController { diff --git a/datamodels/2.x/itop-portal-base/portal/src/controllers/aggregatepagebrickcontroller.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/controllers/aggregatepagebrickcontroller.class.inc.php index 7a5b691be..b9379f8df 100644 --- a/datamodels/2.x/itop-portal-base/portal/src/controllers/aggregatepagebrickcontroller.class.inc.php +++ b/datamodels/2.x/itop-portal-base/portal/src/controllers/aggregatepagebrickcontroller.class.inc.php @@ -24,6 +24,14 @@ use Combodo\iTop\Portal\Helper\ApplicationHelper; use Silex\Application; use Symfony\Component\HttpFoundation\Request; + +/** + * Class AggregatePageBrickController + * + * @package Combodo\iTop\Portal\Controller + * @author Pierre Goiffon + * @since 2.5.0 + */ class AggregatePageBrickController { /** diff --git a/datamodels/2.x/itop-portal-base/portal/src/controllers/brickcontroller.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/controllers/brickcontroller.class.inc.php index d3f3a5304..89fde83e6 100644 --- a/datamodels/2.x/itop-portal-base/portal/src/controllers/brickcontroller.class.inc.php +++ b/datamodels/2.x/itop-portal-base/portal/src/controllers/brickcontroller.class.inc.php @@ -19,6 +19,13 @@ namespace Combodo\iTop\Portal\Controller; +/** + * Class BrickController + * + * @package Combodo\iTop\Portal\Controller + * @author Guillaume Lajarige + * @since 2.3.0 + */ abstract class BrickController extends AbstractController { diff --git a/datamodels/2.x/itop-portal-base/portal/src/controllers/browsebrickcontroller.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/controllers/browsebrickcontroller.class.inc.php index ddb4a8eb9..a48e82f34 100644 --- a/datamodels/2.x/itop-portal-base/portal/src/controllers/browsebrickcontroller.class.inc.php +++ b/datamodels/2.x/itop-portal-base/portal/src/controllers/browsebrickcontroller.class.inc.php @@ -35,6 +35,13 @@ use Combodo\iTop\Portal\Helper\ContextManipulatorHelper; use Combodo\iTop\Portal\Brick\AbstractBrick; use Combodo\iTop\Portal\Brick\BrowseBrick; +/** + * Class BrowseBrickController + * + * @package Combodo\iTop\Portal\Controller + * @author Guillaume Lajarige + * @since 2.3.0 + */ class BrowseBrickController extends BrickController { const LEVEL_SEPARATOR = '-'; @@ -588,6 +595,7 @@ class BrowseBrickController extends BrickController * @param array $aItems * @param string $sLevelsAlias * @param array $aLevelsProperties + * * @return array */ public static function PrepareActionRulesForItems(array $aItems, $sLevelsAlias, array &$aLevelsProperties) diff --git a/datamodels/2.x/itop-portal-base/portal/src/controllers/createbrickcontroller.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/controllers/createbrickcontroller.class.inc.php index 19f732daf..0d67a1781 100644 --- a/datamodels/2.x/itop-portal-base/portal/src/controllers/createbrickcontroller.class.inc.php +++ b/datamodels/2.x/itop-portal-base/portal/src/controllers/createbrickcontroller.class.inc.php @@ -27,6 +27,13 @@ use Combodo\iTop\Portal\Helper\ApplicationHelper; use Combodo\iTop\Portal\Helper\ContextManipulatorHelper; use Combodo\iTop\Portal\Helper\SecurityHelper; +/** + * Class CreateBrickController + * + * @package Combodo\iTop\Portal\Controller + * @author Guillaume Lajarige + * @since 2.3.0 + */ class CreateBrickController extends BrickController { diff --git a/datamodels/2.x/itop-portal-base/portal/src/controllers/defaultcontroller.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/controllers/defaultcontroller.class.inc.php index c805424cb..cb48fad5a 100644 --- a/datamodels/2.x/itop-portal-base/portal/src/controllers/defaultcontroller.class.inc.php +++ b/datamodels/2.x/itop-portal-base/portal/src/controllers/defaultcontroller.class.inc.php @@ -22,6 +22,13 @@ namespace Combodo\iTop\Portal\Controller; use Silex\Application; use Symfony\Component\HttpFoundation\Request; +/** + * Class DefaultController + * + * @package Combodo\iTop\Portal\Controller + * @author Guillaume Lajarige + * @since 2.3.0 + */ class DefaultController { /** diff --git a/datamodels/2.x/itop-portal-base/portal/src/controllers/managebrickcontroller.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/controllers/managebrickcontroller.class.inc.php index 51a3cb83b..ee39cd6f1 100644 --- a/datamodels/2.x/itop-portal-base/portal/src/controllers/managebrickcontroller.class.inc.php +++ b/datamodels/2.x/itop-portal-base/portal/src/controllers/managebrickcontroller.class.inc.php @@ -42,23 +42,31 @@ use JSButtonItem; use MetaModel; use Silex\Application; use Symfony\Component\HttpFoundation\Request; -use Symfony\Component\HttpFoundation\Response; use UnaryExpression; use URLButtonItem; use VariableExpression; +/** + * Class ManageBrickController + * + * @package Combodo\iTop\Portal\Controller + * @author Guillaume Lajarige + * @author Pierre Goiffon + * @author Eric Espie + * @since 2.3.0 + */ class ManageBrickController extends BrickController { const EXCEL_EXPORT_TEMPLATE_PATH = 'itop-portal-base/portal/src/views/bricks/manage/popup-export-excel.html.twig'; /** - * @param Request $oRequest - * @param Application $oApp + * @param \Symfony\Component\HttpFoundation\Request $oRequest + * @param \Silex\Application $oApp * @param string $sBrickId * @param string $sGroupingTab * @param string $sDisplayMode * - * @return Response + * @return \Symfony\Component\HttpFoundation\Response * * @throws \Exception * @throws \CoreException @@ -68,14 +76,13 @@ class ManageBrickController extends BrickController */ public function DisplayAction(Request $oRequest, Application $oApp, $sBrickId, $sGroupingTab, $sDisplayMode = null) { - /** @var ManageBrick $oBrick */ + /** @var \Combodo\iTop\Portal\Brick\ManageBrick $oBrick */ $oBrick = ApplicationHelper::GetLoadedBrickFromId($oApp, $sBrickId); if (is_null($sDisplayMode)) { $sDisplayMode = $oBrick->GetDefaultDisplayMode(); } - $aDisplayParams = $oBrick->GetPresentationDataForTileMode($sDisplayMode); $aData = $this->GetData($oRequest, $oApp, $sBrickId, $sGroupingTab, $oBrick::AreDetailsNeededForDisplayMode($sDisplayMode)); $aExportFields = $oBrick->GetExportFields(); @@ -100,17 +107,17 @@ class ManageBrickController extends BrickController /** * Method for the brick's tile on home page * - * @param Request $oRequest - * @param Application $oApp + * @param \Symfony\Component\HttpFoundation\Request $oRequest + * @param \Silex\Application $oApp * @param string $sBrickId * - * @return Response + * @return \Symfony\Component\HttpFoundation\Response * - * @throws Exception + * @throws \Exception */ public function TileAction(Request $oRequest, Application $oApp, $sBrickId) { - /** @var ManageBrick $oBrick */ + /** @var \Combodo\iTop\Portal\Brick\ManageBrick $oBrick */ $oBrick = ApplicationHelper::GetLoadedBrickFromId($oApp, $sBrickId); try @@ -127,15 +134,15 @@ class ManageBrickController extends BrickController } /** - * @param Request $oRequest - * @param Application $oApp + * @param \Symfony\Component\HttpFoundation\Request $oRequest + * @param \Silex\Application $oApp * @param string $sBrickId * @param string $sGroupingTab * @param string $sGroupingArea * - * @return Response + * @return \Symfony\Component\HttpFoundation\Request * - * @throws Exception + * @throws \Exception * @throws \DictExceptionMissingString * @throws \MySQLException * @throws \OQLException @@ -158,9 +165,7 @@ class ManageBrickController extends BrickController } else { - $oQuery = DBSearch::FromOQL($oBrick->GetOql()); - $sClass = $oQuery->GetClass(); - /** @var ScopeValidatorHelper $oScopeHelper */ + /** @var \Combodo\iTop\Portal\Helper\ScopeValidatorHelper $oScopeHelper */ $oScopeHelper = $oApp['scope_validator']; $oScopeHelper->AddScopeToQuery($oQuery, $sClass); $aData = array(); @@ -234,8 +239,8 @@ class ManageBrickController extends BrickController /** - * @param Request $oRequest - * @param Application $oApp + * @param \Symfony\Component\HttpFoundation\Request $oRequest + * @param \Silex\Application $oApp * @param string $sBrickId * @param string $sGroupingTab * @param bool $bNeedDetails @@ -250,7 +255,7 @@ class ManageBrickController extends BrickController */ public function GetData(Request $oRequest, Application $oApp, $sBrickId, $sGroupingTab, $bNeedDetails = false) { - /** @var ManageBrick $oBrick */ + /** @var \Combodo\iTop\Portal\Brick\ManageBrick $oBrick */ $oBrick = ApplicationHelper::GetLoadedBrickFromId($oApp, $sBrickId); $aData = array(); @@ -742,16 +747,16 @@ class ManageBrickController extends BrickController } /** - * @param Application $oApp + * @param \Silex\Application $oApp * @param array $aData - * @param DBSearch $oQuery + * @param \DBSearch $oQuery * @param string $sClass * @param array $aColumnsAttrs * * @throws \Exception * @throws \CoreException */ - protected function ManageSearchValue(Application $oApp, &$aData, DBSearch &$oQuery, $sClass, $aColumnsAttrs) + protected function ManageSearchValue(Application $oApp, &$aData, DBSearch &$oQuery, $sClass, $aColumnsAttrs = array()) { // Getting search value $sSearchValue = $oApp['request_manipulator']->ReadParam('sSearchValue', ''); @@ -807,10 +812,10 @@ class ManageBrickController extends BrickController * Get the groups using a given attribute code. * If a limit is given, the remaining groups are aggregated (groupby result and search request). * - * @param DBSearch $oQuery Initial query + * @param \DBSearch $oQuery Initial query * @param string $sGroupingTabAttCode Attribute code to group by - * @param Application $oApp - * @param ManageBrick $oBrick + * @param \Silex\Application $oApp + * @param \Combodo\iTop\Portal\Brick\ManageBrick $oBrick * * @return array of results from the groupby request and the corrsponding search. * @@ -923,11 +928,11 @@ class ManageBrickController extends BrickController } /** - * @param Application $oApp - * @param ManageBrick $oBrick + * @param \Silex\Application $oApp + * @param \Combodo\iTop\Portal\Brick\ManageBrick $oBrick * @param string $sClass * - * @return DBSearch + * @return \DBSearch * * @throws \CoreException * @throws \OQLException diff --git a/datamodels/2.x/itop-portal-base/portal/src/controllers/objectcontroller.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/controllers/objectcontroller.class.inc.php index 717168f79..d7d7c4204 100644 --- a/datamodels/2.x/itop-portal-base/portal/src/controllers/objectcontroller.class.inc.php +++ b/datamodels/2.x/itop-portal-base/portal/src/controllers/objectcontroller.class.inc.php @@ -53,7 +53,13 @@ use Combodo\iTop\Portal\Form\ObjectFormManager; use Combodo\iTop\Renderer\Bootstrap\BsFormRenderer; /** - * Controller to handle basic view / edit / create of cmdbAbstractObject + * Class ObjectController + * + * Controller to handle basic view / edit / create of cmdbAbstractObjectClass ManageBrickController + * + * @package Combodo\iTop\Portal\Controller + * @author Guillaume Lajarige + * @since 2.3.0 */ class ObjectController extends AbstractController { @@ -68,12 +74,12 @@ class ObjectController extends AbstractController /** * Displays an cmdbAbstractObject if the connected user is allowed to. * - * @param Request $oRequest - * @param Application $oApp + * @param \Symfony\Component\HttpFoundation\Request $oRequest + * @param \Silex\Application $oApp * @param string $sObjectClass (Class must be instance of cmdbAbstractObject) * @param string $sObjectId * - * @return Response + * @return \Symfony\Component\HttpFoundation\Response * * @throws \Exception * @throws \ArchivedObjectException @@ -156,12 +162,12 @@ class ObjectController extends AbstractController } /** - * @param Request $oRequest - * @param Application $oApp + * @param \Symfony\Component\HttpFoundation\Request $oRequest + * @param \Silex\Application $oApp * @param $sObjectClass * @param $sObjectId * - * @return Response + * @return \Symfony\Component\HttpFoundation\Response * * @throws \Exception * @throws \ArchivedObjectException @@ -236,11 +242,11 @@ class ObjectController extends AbstractController /** * Creates an cmdbAbstractObject of the $sObjectClass * - * @param Request $oRequest - * @param Application $oApp + * @param \Symfony\Component\HttpFoundation\Request $oRequest + * @param \Silex\Application $oApp * @param string $sObjectClass * - * @return Response + * @return \Symfony\Component\HttpFoundation\Response * * @throws \Exception * @throws \CoreException @@ -297,13 +303,13 @@ class ObjectController extends AbstractController * Creates an cmdbAbstractObject of a class determined by the method encoded in $sEncodedMethodName. * This method use an origin DBObject in order to determine the created cmdbAbstractObject. * - * @param Request $oRequest - * @param Application $oApp + * @param \Symfony\Component\HttpFoundation\Request $oRequest + * @param \Silex\Application $oApp * @param string $sObjectClass Class of the origin object * @param string $sObjectId ID of the origin object * @param string $sEncodedMethodName Base64 encoded factory method name * - * @return Response + * @return \Symfony\Component\HttpFoundation\Response * * @throws \Exception * @throws \ArchivedObjectException @@ -352,13 +358,13 @@ class ObjectController extends AbstractController /** * Applies a stimulus $sStimulus on an cmdbAbstractObject * - * @param Request $oRequest - * @param Application $oApp + * @param \Symfony\Component\HttpFoundation\Request $oRequest + * @param \Silex\Application $oApp * @param string $sObjectClass * @param string $sObjectId * @param string $sStimulusCode * - * @return Response + * @return \Symfony\Component\HttpFoundation\Response * * @throws \Exception * @throws \ArchivedObjectException @@ -469,12 +475,12 @@ class ObjectController extends AbstractController } /** - * @param Request $oRequest - * @param Application $oApp - * @param $sMode - * @param $sObjectClass - * @param null $sObjectId - * @param null $aFormProperties + * @param \Symfony\Component\HttpFoundation\Request $oRequest + * @param \Silex\Application $oApp + * @param string $sMode + * @param string $sObjectClass + * @param string $sObjectId + * @param string $aFormProperties * * @return array * @@ -726,13 +732,13 @@ class ObjectController extends AbstractController /** * Handles the autocomplete search * - * @param Request $oRequest - * @param Application $oApp + * @param \Symfony\Component\HttpFoundation\Request $oRequest + * @param \Silex\Application $oApp * @param string $sTargetAttCode Attribute code of the host object pointing to the Object class to search * @param string $sHostObjectClass Class name of the host object * @param string $sHostObjectId Id of the host object * - * @return Response + * @return \Symfony\Component\HttpFoundation\Response * * @throws \Exception * @throws \ArchivedObjectException @@ -760,7 +766,6 @@ class ObjectController extends AbstractController // Retrieving parameters $sQuery = $aRequestContent['sQuery']; - $sFormPath = $aRequestContent['sFormPath']; $sFieldId = $aRequestContent['sFieldId']; // Checking security layers @@ -890,13 +895,13 @@ class ObjectController extends AbstractController /** * Handles the regular (table) search from an attribute * - * @param Request $oRequest - * @param Application $oApp + * @param \Symfony\Component\HttpFoundation\Request $oRequest + * @param \Silex\Application $oApp * @param string $sTargetAttCode Attribute code of the host object pointing to the Object class to search * @param string $sHostObjectClass Class name of the host object * @param string $sHostObjectId Id of the host object * - * @return Response + * @return \Symfony\Component\HttpFoundation\Response * * @throws \Exception * @throws \ArchivedObjectException @@ -1188,8 +1193,8 @@ class ObjectController extends AbstractController /** * Handles the hierarchical search from an attribute * - * @param Request $oRequest - * @param Application $oApp + * @param \Symfony\Component\HttpFoundation\Request $oRequest + * @param \Silex\Application $oApp * @param string $sTargetAttCode Attribute code of the host object pointing to the Object class to search * @param string $sHostObjectClass Class name of the host object * @param string $sHostObjectId Id of the host object @@ -1207,11 +1212,11 @@ class ObjectController extends AbstractController * * Note: This is inspired from pages/ajax.document.php, but duplicated as there is no secret mecanism for ormDocument yet. * - * @param Request $oRequest - * @param Application $oApp + * @param \Symfony\Component\HttpFoundation\Request $oRequest + * @param \Silex\Application $oApp * @param string $sOperation * - * @return Response + * @return \Symfony\Component\HttpFoundation\Response * * @throws \ArchivedObjectException * @throws \CoreException @@ -1294,11 +1299,11 @@ class ObjectController extends AbstractController * * Note: This is inspired from itop-attachment/ajax.attachment.php * - * @param Request $oRequest - * @param Application $oApp + * @param \Symfony\Component\HttpFoundation\Request $oRequest + * @param \Silex\Application $oApp * @param string $sOperation * - * @return Response + * @return \Symfony\Component\HttpFoundation\Response * * @throws \Exception * @throws \CoreException @@ -1389,10 +1394,10 @@ class ObjectController extends AbstractController * - aObjectIds : An array of object ids * - aObjectAttCodes : An array of attribute codes to retrieve * - * @param Request $oRequest - * @param Application $oApp + * @param \Symfony\Component\HttpFoundation\Request $oRequest + * @param \Silex\Application $oApp * - * @return Response + * @return \Symfony\Component\HttpFoundation\Response * * @throws \OQLException * @throws \CoreException @@ -1439,8 +1444,8 @@ class ObjectController extends AbstractController /** * Prepare a DBObject informations as an array for a client side usage (typically, add a row in a table) * - * @param Application $oApp - * @param DBObject $oObject + * @param \Silex\Application $oApp + * @param \DBObject $oObject * @param array $aAttCodes * * @return array diff --git a/datamodels/2.x/itop-portal-base/portal/src/controllers/userprofilebrickcontroller.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/controllers/userprofilebrickcontroller.class.inc.php index ef5c140ea..1031119c2 100644 --- a/datamodels/2.x/itop-portal-base/portal/src/controllers/userprofilebrickcontroller.class.inc.php +++ b/datamodels/2.x/itop-portal-base/portal/src/controllers/userprofilebrickcontroller.class.inc.php @@ -20,29 +20,36 @@ namespace Combodo\iTop\Portal\Controller; use Exception; +use FileUploadException; use IssueLog; use utils; use MetaModel; use UserRights; use Silex\Application; use Symfony\Component\HttpFoundation\Request; -use Symfony\Component\HttpFoundation\Response; use Combodo\iTop\Portal\Helper\ApplicationHelper; use Combodo\iTop\Portal\Brick\UserProfileBrick; use Combodo\iTop\Portal\Form\PreferencesFormManager; use Combodo\iTop\Portal\Form\PasswordFormManager; use Combodo\iTop\Renderer\Bootstrap\BsFormRenderer; +/** + * Class UserProfileBrickController + * + * @package Combodo\iTop\Portal\Controller + * @author Guillaume Lajarige + * @since 2.3.0 + */ class UserProfileBrickController extends BrickController { const ENUM_FORM_TYPE_PICTURE = 'picture'; /** - * @param Request $oRequest - * @param Application $oApp + * @param \Symfony\Component\HttpFoundation\Request $oRequest + * @param \Silex\Application $oApp * @param $sBrickId * - * @return Response + * @return \Symfony\Component\HttpFoundation\Response * * @throws \Exception * @throws \ArchivedObjectException @@ -94,11 +101,11 @@ class UserProfileBrickController extends BrickController } elseif ($sFormType === PasswordFormManager::FORM_TYPE) { - $aData['form'] = $this->HandlePasswordForm($oRequest, $oApp); + $aData['form'] = $this->HandlePasswordForm($oRequest, $oApp, $sFormMode); } elseif ($sFormType === static::ENUM_FORM_TYPE_PICTURE) { - $aData['form'] = $this->HandlePictureForm($oRequest, $oApp, $sFormMode); + $aData['form'] = $this->HandlePictureForm($oRequest, $oApp); } else { @@ -118,7 +125,7 @@ class UserProfileBrickController extends BrickController $aData['forms']['contact'] = ObjectController::HandleForm($oRequest, $oApp, $sFormMode, $sCurContactClass, $sCurContactId, $oBrick->GetForm()); $aData['forms']['preferences'] = $this->HandlePreferencesForm($oRequest, $oApp, $sFormMode); // - If user can change password, we display the form - $aData['forms']['password'] = (UserRights::CanChangePassword()) ? $this->HandlePasswordForm($oRequest, $oApp) : null; + $aData['forms']['password'] = (UserRights::CanChangePassword()) ? $this->HandlePasswordForm($oRequest, $oApp, $sFormMode) : null; $aData = $aData + array( 'oBrick' => $oBrick, @@ -133,11 +140,13 @@ class UserProfileBrickController extends BrickController } /** - * @param Request $oRequest - * @param Application $oApp - * @param $sFormMode + * @param \Symfony\Component\HttpFoundation\Request $oRequest + * @param \Silex\Application $oApp + * @param string $sFormMode * * @return array + * + * @throws \Exception */ public function HandlePreferencesForm(Request $oRequest, Application $oApp, $sFormMode) { @@ -184,10 +193,7 @@ class UserProfileBrickController extends BrickController ); } } - else - { - // Else, submit from another form - } + // Else, submit from another form // Preparing field_set data $aFieldSetData = array( @@ -207,12 +213,15 @@ class UserProfileBrickController extends BrickController } /** - * @param Request $oRequest - * @param Application $oApp + * @param \Symfony\Component\HttpFoundation\Request $oRequest + * @param \Silex\Application $oApp + * @param string $sFormMode * * @return array + * + * @throws \Exception */ - public function HandlePasswordForm(Request $oRequest, Application $oApp) + public function HandlePasswordForm(Request $oRequest, Application $oApp, $sFormMode) { $aFormData = array(); @@ -228,6 +237,11 @@ class UserProfileBrickController extends BrickController $oFormManager = new PasswordFormManager(); $oFormManager->SetRenderer($oFormRenderer) ->Build(); + // - Checking if we have to make the form read only + if ($sFormMode === ObjectController::ENUM_MODE_VIEW) + { + $oFormManager->GetForm()->MakeReadOnly(); + } } // - Submit else if ($sOperation === 'submit') @@ -245,10 +259,7 @@ class UserProfileBrickController extends BrickController // Applying modification to object $aFormData['validation'] = $oFormManager->OnSubmit(array('currentValues' => $oApp['request_manipulator']->ReadParam('current_values', array(), FILTER_UNSAFE_RAW))); } - else - { - // Else, submit from another form - } + // Else, submit from another form // Preparing field_set data $aFieldSetData = array( @@ -268,14 +279,14 @@ class UserProfileBrickController extends BrickController } /** - * @param Request $oRequest - * @param Application $oApp - * @param $sFormMode + * @param \Symfony\Component\HttpFoundation\Request $oRequest + * @param \Silex\Application $oApp * * @return array - * @throws \FileUploadException + * + * @throws \Exception */ - public function HandlePictureForm(Request $oRequest, Application $oApp, $sFormMode) + public function HandlePictureForm(Request $oRequest, Application $oApp) { $aFormData = array(); $sPictureAttCode = 'picture'; @@ -326,10 +337,7 @@ class UserProfileBrickController extends BrickController 'messages' => array() ); } - else - { - // Else, submit from another form - } + // Else, submit from another form return $aFormData; } diff --git a/datamodels/2.x/itop-portal-base/portal/src/forms/objectformmanager.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/forms/objectformmanager.class.inc.php index 26440b74c..af67c409e 100644 --- a/datamodels/2.x/itop-portal-base/portal/src/forms/objectformmanager.class.inc.php +++ b/datamodels/2.x/itop-portal-base/portal/src/forms/objectformmanager.class.inc.php @@ -1181,7 +1181,7 @@ class ObjectFormManager extends FormManager protected function FinalizeAttachments($aAttachmentIds) { $aRemovedAttachmentsIds = (isset($aAttachmentIds['removed_attachments_ids'])) ? $aAttachmentIds['removed_attachments_ids'] : array(); - $aActualAttachmentsIds = (isset($aAttachmentIds['actual_attachments_ids'])) ? $aAttachmentIds['actual_attachments_ids'] : array(); + // Not used for now. //$aActualAttachmentsIds = (isset($aAttachmentIds['actual_attachments_ids'])) ? $aAttachmentIds['actual_attachments_ids'] : array(); // Removing attachments from currents if (!empty($aRemovedAttachmentsIds)) diff --git a/datamodels/2.x/itop-portal-base/portal/src/helpers/applicationhelper.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/helpers/applicationhelper.class.inc.php index 2c3934726..8a5e3acbe 100644 --- a/datamodels/2.x/itop-portal-base/portal/src/helpers/applicationhelper.class.inc.php +++ b/datamodels/2.x/itop-portal-base/portal/src/helpers/applicationhelper.class.inc.php @@ -286,7 +286,7 @@ class ApplicationHelper // Intercepting manually aborted request if (1 || !$oApp['debug']) { - $oApp->error(function (Exception $oException, Request $oRequest) use ($oApp) { + $oApp->error(function (Exception $oException /*, Request $oRequest*/) use ($oApp) { $iErrorCode = ($oException instanceof HttpException) ? $oException->getStatusCode() : 500; $aData = array( diff --git a/datamodels/2.x/itop-portal-base/portal/src/routers/aggregatepagebrickrouter.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/routers/aggregatepagebrickrouter.class.inc.php index aa0355825..526e0297f 100644 --- a/datamodels/2.x/itop-portal-base/portal/src/routers/aggregatepagebrickrouter.class.inc.php +++ b/datamodels/2.x/itop-portal-base/portal/src/routers/aggregatepagebrickrouter.class.inc.php @@ -20,6 +20,13 @@ namespace Combodo\iTop\Portal\Router; +/** + * Class AggregatePageBrickRouter + * + * @package Combodo\iTop\Portal\Router + * @author Pierre Goiffon + * @since 2.5.0 + */ class AggregatePageBrickRouter extends AbstractRouter { static $aRoutes = array( diff --git a/datamodels/2.x/itop-portal-base/portal/src/routers/browsebrickrouter.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/routers/browsebrickrouter.class.inc.php index 83c376c74..13248a27f 100644 --- a/datamodels/2.x/itop-portal-base/portal/src/routers/browsebrickrouter.class.inc.php +++ b/datamodels/2.x/itop-portal-base/portal/src/routers/browsebrickrouter.class.inc.php @@ -19,6 +19,13 @@ namespace Combodo\iTop\Portal\Router; +/** + * Class BrowseBrickRouter + * + * @package Combodo\iTop\Portal\Router + * @author Guillaume Lajarige + * @since 2.3.0 + */ class BrowseBrickRouter extends AbstractRouter { static $aRoutes = array( diff --git a/datamodels/2.x/itop-portal-base/portal/src/routers/createbrickrouter.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/routers/createbrickrouter.class.inc.php index b78b85800..4549793d0 100644 --- a/datamodels/2.x/itop-portal-base/portal/src/routers/createbrickrouter.class.inc.php +++ b/datamodels/2.x/itop-portal-base/portal/src/routers/createbrickrouter.class.inc.php @@ -19,6 +19,13 @@ namespace Combodo\iTop\Portal\Router; +/** + * Class CreateBrickRouter + * + * @package Combodo\iTop\Portal\Router + * @author Guillaume Lajarige + * @since 2.3.0 + */ class CreateBrickRouter extends AbstractRouter { static $aRoutes = array( diff --git a/datamodels/2.x/itop-portal-base/portal/src/routers/defaultrouter.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/routers/defaultrouter.class.inc.php index 18a37a88a..0ef4d47e3 100644 --- a/datamodels/2.x/itop-portal-base/portal/src/routers/defaultrouter.class.inc.php +++ b/datamodels/2.x/itop-portal-base/portal/src/routers/defaultrouter.class.inc.php @@ -19,6 +19,14 @@ namespace Combodo\iTop\Portal\Router; + +/** + * Class DefaultRouter + * + * @package Combodo\iTop\Portal\Router + * @author Guillaume Lajarige + * @since 2.3.0 + */ class DefaultRouter extends AbstractRouter { static $aRoutes = array( diff --git a/datamodels/2.x/itop-portal-base/portal/src/routers/managebrickrouter.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/routers/managebrickrouter.class.inc.php index 06af20ea6..2635b7dcf 100644 --- a/datamodels/2.x/itop-portal-base/portal/src/routers/managebrickrouter.class.inc.php +++ b/datamodels/2.x/itop-portal-base/portal/src/routers/managebrickrouter.class.inc.php @@ -19,6 +19,15 @@ namespace Combodo\iTop\Portal\Router; +/** + * Class ManageBrickRouter + * + * @package Combodo\iTop\Portal\Router + * @author Guillaume Lajarige + * @author Pierre Goiffon + * @author Eric Espie + * @since 2.3.0 + */ class ManageBrickRouter extends AbstractRouter { static $aRoutes = array( diff --git a/datamodels/2.x/itop-portal-base/portal/src/routers/objectrouter.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/routers/objectrouter.class.inc.php index c9089fa3f..214d4e191 100644 --- a/datamodels/2.x/itop-portal-base/portal/src/routers/objectrouter.class.inc.php +++ b/datamodels/2.x/itop-portal-base/portal/src/routers/objectrouter.class.inc.php @@ -19,6 +19,13 @@ namespace Combodo\iTop\Portal\Router; +/** + * Class ObjectRouter + * + * @package Combodo\iTop\Portal\Router + * @author Guillaume Lajarige + * @since 2.3.0 + */ class ObjectRouter extends AbstractRouter { static $aRoutes = array( diff --git a/datamodels/2.x/itop-portal-base/portal/src/routers/userprofilebrickrouter.class.inc.php b/datamodels/2.x/itop-portal-base/portal/src/routers/userprofilebrickrouter.class.inc.php index d40118595..d3dad2bf0 100644 --- a/datamodels/2.x/itop-portal-base/portal/src/routers/userprofilebrickrouter.class.inc.php +++ b/datamodels/2.x/itop-portal-base/portal/src/routers/userprofilebrickrouter.class.inc.php @@ -19,6 +19,13 @@ namespace Combodo\iTop\Portal\Router; +/** + * Class UserProfileRouter + * + * @package Combodo\iTop\Portal\Router + * @author Guillaume Lajarige + * @since 2.3.0 + */ class UserProfileRouter extends AbstractRouter { static $aRoutes = array(