');
@@ -604,13 +579,10 @@ JS
$oLayout = new $this->sLayoutClass();
$oPage->add('
');
- foreach($this->aCells as $iCellIdx => $aCell)
- {
+ foreach ($this->aCells as $iCellIdx => $aCell) {
/** @var \Dashlet $oDashlet */
- foreach($aCell as $oDashlet)
- {
- if ($oDashlet->IsVisible())
- {
+ foreach ($aCell as $oDashlet) {
+ if ($oDashlet->IsVisible()) {
$oPage->add('
');
$oForm = $oDashlet->GetForm();
$this->SetFormParams($oForm, $aExtraParams);
@@ -632,18 +604,17 @@ JS
*/
protected function GetAvailableDashlets()
{
- $aDashlets = array();
+ $aDashlets = [];
- foreach( get_declared_classes() as $sDashletClass)
- {
+ foreach (get_declared_classes() as $sDashletClass) {
// DashletUnknown is not among the selection as it is just a fallback for dashlets that can't instantiated.
- if (is_subclass_of($sDashletClass, 'Dashlet') && !in_array($sDashletClass, array('DashletUnknown', 'DashletProxy'))) {
+ if (is_subclass_of($sDashletClass, 'Dashlet') && !in_array($sDashletClass, ['DashletUnknown', 'DashletProxy'])) {
$oReflection = new ReflectionClass($sDashletClass);
if (!$oReflection->isAbstract()) {
- $aCallSpec = array($sDashletClass, 'IsVisible');
+ $aCallSpec = [$sDashletClass, 'IsVisible'];
$bVisible = call_user_func($aCallSpec);
if ($bVisible) {
- $aCallSpec = array($sDashletClass, 'GetInfo');
+ $aCallSpec = [$sDashletClass, 'GetInfo'];
$aInfo = call_user_func($aCallSpec);
$aDashlets[$sDashletClass] = $aInfo;
}
@@ -660,11 +631,9 @@ JS
protected function GetNewDashletId()
{
$iNewId = 0;
- foreach($this->aCells as $aDashlets)
- {
+ foreach ($this->aCells as $aDashlets) {
/** @var \Dashlet $oDashlet */
- foreach($aDashlets as $oDashlet)
- {
+ foreach ($aDashlets as $oDashlet) {
$iNewId = max($iNewId, (int)$oDashlet->GetID());
}
}
@@ -681,15 +650,15 @@ JS
*
* @return void
*/
- abstract protected function PrepareDashletForRendering(Dashlet $oDashlet, $aCoordinates, $aExtraParams = array());
+ abstract protected function PrepareDashletForRendering(Dashlet $oDashlet, $aCoordinates, $aExtraParams = []);
- /**
- * @param \DesignerForm $oForm
- * @param array $aExtraParams
- *
- * @return mixed
- */
- abstract protected function SetFormParams($oForm, $aExtraParams = array());
+ /**
+ * @param \DesignerForm $oForm
+ * @param array $aExtraParams
+ *
+ * @return mixed
+ */
+ abstract protected function SetFormParams($oForm, $aExtraParams = []);
/**
* @param string $sType
@@ -699,8 +668,7 @@ JS
*/
public static function GetDashletClassFromType($sType, $oFactory = null)
{
- if (is_subclass_of($sType, 'Dashlet'))
- {
+ if (is_subclass_of($sType, 'Dashlet')) {
return $sType;
}
return 'DashletUnknown';
@@ -723,14 +691,12 @@ JS
*/
public static function GetDashletUniqueId($bIsCustomized, $sDashboardDivId, $iRow, $iCol, $sDashletOrigId)
{
- if(strpos($sDashletOrigId, '_ID_row') !== false)
- {
+ if (strpos($sDashletOrigId, '_ID_row') !== false) {
return $sDashletOrigId;
}
$sDashletId = $sDashboardDivId."_ID_row".$iRow."_col".$iCol."_".$sDashletOrigId;
- if ($bIsCustomized)
- {
+ if ($bIsCustomized) {
$sDashletId = 'CUSTOM_'.$sDashletId;
}
@@ -782,9 +748,9 @@ class RuntimeDashboard extends Dashboard
* @inheritDoc
* @throws \Exception
*/
- protected function SetFormParams($oForm, $aExtraParams = array())
+ protected function SetFormParams($oForm, $aExtraParams = [])
{
- $oForm->SetSubmitParams(utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php', array('operation' => 'update_dashlet_property', 'extra_params' => $aExtraParams));
+ $oForm->SetSubmitParams(utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php', ['operation' => 'update_dashlet_property', 'extra_params' => $aExtraParams]);
}
/**
@@ -800,14 +766,11 @@ class RuntimeDashboard extends Dashboard
$oUDSearch->AddCondition('menu_code', $this->sId, '=');
$oUDSet = new DBObjectSet($oUDSearch);
$bIsNew = false;
- if ($oUDSet->Count() > 0)
- {
+ if ($oUDSet->Count() > 0) {
// Assuming there is at most one couple {user, menu}!
$oUserDashboard = $oUDSet->Fetch();
$oUserDashboard->Set('contents', $sXml);
- }
- else
- {
+ } else {
// No such customized dashboard for the current user, let's create a new record
$oUserDashboard = new UserDashboard();
$oUserDashboard->Set('user_id', UserRights::GetUserId());
@@ -838,8 +801,7 @@ class RuntimeDashboard extends Dashboard
$oUDSearch->AddCondition('user_id', UserRights::GetUserId(), '=');
$oUDSearch->AddCondition('menu_code', $this->sId, '=');
$oUDSet = new DBObjectSet($oUDSearch);
- if ($oUDSet->Count() > 0)
- {
+ if ($oUDSet->Count() > 0) {
// Assuming there is at most one couple {user, menu}!
$oUserDashboard = $oUDSet->Fetch();
utils::PushArchiveMode(false);
@@ -883,14 +845,11 @@ class RuntimeDashboard extends Dashboard
} else {
$sDashboardDefinition = @file_get_contents($sDashboardFileSanitized);
}
- }
- else
- {
+ } else {
$sDashboardDefinition = @file_get_contents($sDashboardFileSanitized);
}
- if ($sDashboardDefinition !== false)
- {
+ if ($sDashboardDefinition !== false) {
$oDashboard = new RuntimeDashboard($sDashBoardId);
$oDashboard->FromXml($sDashboardDefinition);
$oDashboard->SetCustomFlag($bCustomized);
@@ -937,7 +896,6 @@ class RuntimeDashboard extends Dashboard
$sDashboardDefinition = @file_get_contents($sDashboardFileSanitized);
}
-
if ($sDashboardDefinition !== false) {
$oDashboard = new RuntimeDashboard($sDashBoardId);
$oDashboard->FromXml($sDashboardDefinition);
@@ -954,11 +912,11 @@ class RuntimeDashboard extends Dashboard
* @inheritDoc
* @throws \Exception
*/
- public function Render($oPage, $bEditMode = false, $aExtraParams = array(), $bCanEdit = true)
+ public function Render($oPage, $bEditMode = false, $aExtraParams = [], $bCanEdit = true)
{
if (!isset($aExtraParams['query_params']) && isset($aExtraParams['this->class'])) {
$oObj = MetaModel::GetObject($aExtraParams['this->class'], $aExtraParams['this->id']);
- $aRenderParams = array('query_params' => $oObj->ToArgsForQuery());
+ $aRenderParams = ['query_params' => $oObj->ToArgsForQuery()];
} else {
$aRenderParams = $aExtraParams;
}
@@ -968,7 +926,7 @@ class RuntimeDashboard extends Dashboard
if (isset($aExtraParams['query_params']['this->object()'])) {
/** @var \DBObject $oObj */
$oObj = $aExtraParams['query_params']['this->object()'];
- $aAjaxParams = array('this->class' => get_class($oObj), 'this->id' => $oObj->GetKey());
+ $aAjaxParams = ['this->class' => get_class($oObj), 'this->id' => $oObj->GetKey()];
if (isset($aExtraParams['from_dashboard_page'])) {
$aAjaxParams['from_dashboard_page'] = $aExtraParams['from_dashboard_page'];
}
@@ -1001,9 +959,7 @@ class RuntimeDashboard extends Dashboard
}
JS
);
- }
- else
- {
+ } else {
$oPage->add_script(
<<HasCustomDashboard()) {
return;
@@ -1092,8 +1048,7 @@ JS
*/
protected function HasCustomDashboard()
{
- try
- {
+ try {
// Search for an eventual user defined dashboard
$oUDSearch = new DBObjectSearch('UserDashboard');
$oUDSearch->AddCondition('user_id', UserRights::GetUserId(), '=');
@@ -1101,9 +1056,7 @@ JS
$oUDSet = new DBObjectSet($oUDSearch);
return ($oUDSet->Count() > 0);
- }
- catch (Exception $e)
- {
+ } catch (Exception $e) {
return false;
}
}
@@ -1139,21 +1092,23 @@ JS
->AddCSSClass('ibo-action-button');
$oToolbar->AddSubBlock($oActionButton);
- $aActions = array();
+ $aActions = [];
$sFile = addslashes(utils::LocalPath($this->sDefinitionFile));
$sJSExtraParams = json_encode($aExtraParams);
if ($this->HasCustomDashboard()) {
$oEdit = new JSPopupMenuItem('UI:Dashboard:Edit', Dict::S('UI:Dashboard:EditCustom'), "return EditDashboard('{$this->sId}', '$sFile', $sJSExtraParams)");
$aActions[$oEdit->GetUID()] = $oEdit->GetMenuItem();
- $oRevert = new JSPopupMenuItem('UI:Dashboard:RevertConfirm', Dict::S('UI:Dashboard:DeleteCustom'),
- "if (confirm('".addslashes(Dict::S('UI:Dashboard:RevertConfirm'))."')) return RevertDashboard('{$this->sId}', $sJSExtraParams); else return false");
+ $oRevert = new JSPopupMenuItem(
+ 'UI:Dashboard:RevertConfirm',
+ Dict::S('UI:Dashboard:DeleteCustom'),
+ "if (confirm('".addslashes(Dict::S('UI:Dashboard:RevertConfirm'))."')) return RevertDashboard('{$this->sId}', $sJSExtraParams); else return false"
+ );
$aActions[$oRevert->GetUID()] = $oRevert->GetMenuItem();
} else {
$oEdit = new JSPopupMenuItem('UI:Dashboard:Edit', Dict::S('UI:Dashboard:CreateCustom'), "return EditDashboard('{$this->sId}', '$sFile', $sJSExtraParams)");
$aActions[$oEdit->GetUID()] = $oEdit->GetMenuItem();
}
-
utils::GetPopupMenuItems($oPage, iPopupMenuExtension::MENU_DASHBOARD_ACTIONS, $this, $aActions);
$oActionsMenu = $oPage->GetPopoverMenu($sPopoverMenuId, $aActions)
@@ -1193,12 +1148,12 @@ EOF
/**
* @inheritDoc
*/
- public function RenderProperties($oPage, $aExtraParams = array())
+ public function RenderProperties($oPage, $aExtraParams = [])
{
parent::RenderProperties($oPage, $aExtraParams);
$oPage->add_ready_script(
-<<class'])) {
$oObj = MetaModel::GetObject($aExtraParams['this->class'], $aExtraParams['this->id']);
- $aRenderParams = array('query_params' => $oObj->ToArgsForQuery());
+ $aRenderParams = ['query_params' => $oObj->ToArgsForQuery()];
} else {
$aRenderParams = $aExtraParams;
}
@@ -1262,7 +1216,7 @@ EOF
$sDialogTitle = Dict::S('UI:DashboardEdit:Title');
$sOkButtonLabel = Dict::S('UI:Button:Save');
$sCancelButtonLabel = Dict::S('UI:Button:Cancel');
-
+
$sId = json_encode($this->sId);
$sLayoutClass = json_encode($this->sLayoutClass);
$sAutoReload = $this->bAutoReload ? 'true' : 'false';
@@ -1275,9 +1229,9 @@ EOF
$sExitConfirmationMessage = addslashes(Dict::S('UI:NavigateAwayConfirmationMessage'));
$sCancelConfirmationMessage = addslashes(Dict::S('UI:CancelConfirmationMessage'));
$sAutoApplyConfirmationMessage = addslashes(Dict::S('UI:AutoApplyConfirmationMessage'));
-
+
$oPage->add_ready_script(
-<<GetCurrentValue('menu', null);
$oForm = new DesignerForm();
-
+
// Get the list of all 'dashboard' menus in which we can insert a dashlet
$aAllMenus = ApplicationMenu::ReflectionMenuNodes();
$sRootMenuId = ApplicationMenu::GetRootMenuId($sContextMenuId);
- $aAllowedDashboards = array();
+ $aAllowedDashboards = [];
$sDefaultDashboard = null;
// Store the parent menus for acces check
- $aParentMenus = array();
- foreach($aAllMenus as $idx => $aMenu)
- {
- /** @var MenuNode $oMenu */
- $oMenu = $aMenu['node'];
- if (count(ApplicationMenu::GetChildren($oMenu->GetIndex())) > 0)
- {
- $aParentMenus[$oMenu->GetMenuId()] = $aMenu;
- }
- }
-
- foreach($aAllMenus as $idx => $aMenu)
- {
+ $aParentMenus = [];
+ foreach ($aAllMenus as $idx => $aMenu) {
+ /** @var MenuNode $oMenu */
$oMenu = $aMenu['node'];
- if ($oMenu instanceof DashboardMenuNode)
- {
- // Get the root parent for access check
- $sParentId = $aMenu['parent'];
- $aParentMenu = $aParentMenus[$sParentId];
- while (isset($aParentMenus[$aParentMenu['parent']]))
- {
- // grand parent exists
- $sParentId = $aParentMenu['parent'];
- $aParentMenu = $aParentMenus[$sParentId];
- }
- /** @var \MenuNode $oParentMenu */
- $oParentMenu = $aParentMenu['node'];
- if ($oMenu->IsEnabled() && $oParentMenu->IsEnabled())
- {
- $sMenuLabel = $oMenu->GetTitle();
- $sParentLabel = Dict::S('Menu:'.$sParentId);
- if ($sParentLabel != $sMenuLabel)
- {
- $aAllowedDashboards[$oMenu->GetMenuId()] = $sParentLabel.' - '.$sMenuLabel;
- }
- else
- {
- $aAllowedDashboards[$oMenu->GetMenuId()] = $sMenuLabel;
- }
- if (empty($sDefaultDashboard) && ($sRootMenuId == ApplicationMenu::GetRootMenuId($oMenu->GetMenuId())))
- {
- $sDefaultDashboard = $oMenu->GetMenuId();
- }
- }
- }
+ if (count(ApplicationMenu::GetChildren($oMenu->GetIndex())) > 0) {
+ $aParentMenus[$oMenu->GetMenuId()] = $aMenu;
+ }
}
- asort($aAllowedDashboards);
-
- $oField = new DesignerComboField('menu_id', Dict::S('UI:DashletCreation:Dashboard'), $sDefaultDashboard);
- $oField->SetAllowedValues($aAllowedDashboards);
- $oField->SetMandatory(true);
- $oForm->AddField($oField);
-
- // Get the list of possible dashlets that support a creation from
- // an OQL
- $aDashlets = array();
- foreach(get_declared_classes() as $sDashletClass)
- {
- if (is_subclass_of($sDashletClass, 'Dashlet'))
- {
- $oReflection = new ReflectionClass($sDashletClass);
- if (!$oReflection->isAbstract())
- {
- $aCallSpec = array($sDashletClass, 'CanCreateFromOQL');
- $bShorcutMode = call_user_func($aCallSpec);
- if ($bShorcutMode)
- {
- $aCallSpec = array($sDashletClass, 'GetInfo');
- $aInfo = call_user_func($aCallSpec);
- $aDashlets[$sDashletClass] = array('label' => $aInfo['label'], 'class' => $sDashletClass, 'icon' => $aInfo['icon']);
+
+ foreach ($aAllMenus as $idx => $aMenu) {
+ $oMenu = $aMenu['node'];
+ if ($oMenu instanceof DashboardMenuNode) {
+ // Get the root parent for access check
+ $sParentId = $aMenu['parent'];
+ $aParentMenu = $aParentMenus[$sParentId];
+ while (isset($aParentMenus[$aParentMenu['parent']])) {
+ // grand parent exists
+ $sParentId = $aParentMenu['parent'];
+ $aParentMenu = $aParentMenus[$sParentId];
+ }
+ /** @var \MenuNode $oParentMenu */
+ $oParentMenu = $aParentMenu['node'];
+ if ($oMenu->IsEnabled() && $oParentMenu->IsEnabled()) {
+ $sMenuLabel = $oMenu->GetTitle();
+ $sParentLabel = Dict::S('Menu:'.$sParentId);
+ if ($sParentLabel != $sMenuLabel) {
+ $aAllowedDashboards[$oMenu->GetMenuId()] = $sParentLabel.' - '.$sMenuLabel;
+ } else {
+ $aAllowedDashboards[$oMenu->GetMenuId()] = $sMenuLabel;
+ }
+ if (empty($sDefaultDashboard) && ($sRootMenuId == ApplicationMenu::GetRootMenuId($oMenu->GetMenuId()))) {
+ $sDefaultDashboard = $oMenu->GetMenuId();
}
}
}
}
-
+ asort($aAllowedDashboards);
+
+ $oField = new DesignerComboField('menu_id', Dict::S('UI:DashletCreation:Dashboard'), $sDefaultDashboard);
+ $oField->SetAllowedValues($aAllowedDashboards);
+ $oField->SetMandatory(true);
+ $oForm->AddField($oField);
+
+ // Get the list of possible dashlets that support a creation from
+ // an OQL
+ $aDashlets = [];
+ foreach (get_declared_classes() as $sDashletClass) {
+ if (is_subclass_of($sDashletClass, 'Dashlet')) {
+ $oReflection = new ReflectionClass($sDashletClass);
+ if (!$oReflection->isAbstract()) {
+ $aCallSpec = [$sDashletClass, 'CanCreateFromOQL'];
+ $bShorcutMode = call_user_func($aCallSpec);
+ if ($bShorcutMode) {
+ $aCallSpec = [$sDashletClass, 'GetInfo'];
+ $aInfo = call_user_func($aCallSpec);
+ $aDashlets[$sDashletClass] = ['label' => $aInfo['label'], 'class' => $sDashletClass, 'icon' => $aInfo['icon']];
+ }
+ }
+ }
+ }
+
$oSelectorField = new DesignerFormSelectorField('dashlet_class', Dict::S('UI:DashletCreation:DashletType'), '');
$oForm->AddField($oSelectorField);
- foreach($aDashlets as $sDashletClass => $aDashletInfo)
- {
+ foreach ($aDashlets as $sDashletClass => $aDashletInfo) {
$oSubForm = new DesignerForm();
$oMetaModel = new ModelReflectionRuntime();
/** @var \Dashlet $oDashlet */
$oDashlet = new $sDashletClass($oMetaModel, 0);
$oDashlet->GetPropertiesFieldsFromOQL($oSubForm, $sOQL);
-
+
$oSelectorField->AddSubForm($oSubForm, $aDashletInfo['label'], $aDashletInfo['class']);
}
$oField = new DesignerBooleanField('open_editor', Dict::S('UI:DashletCreation:EditNow'), true);
$oForm->AddField($oField);
-
+
return $oForm;
}
@@ -1501,11 +1440,11 @@ JS
$oForm->Render($oPage);
$oPage->add('
');
-
+
$sDialogTitle = Dict::S('UI:DashletCreation:Title');
$sOkButtonLabel = Dict::S('UI:Button:Ok');
$sCancelButtonLabel = Dict::S('UI:Button:Cancel');
-
+
$oPage->add_ready_script(
<<
GetID();
$sDashboardSanitizedId = $this->GetSanitizedId();
@@ -1630,31 +1569,27 @@ JS
private function UpdateDashletUserPrefs(Dashlet $oDashlet, $sDashletIdOrig, array $aExtraParams)
{
$bIsDashletWithListPref = ($oDashlet instanceof DashletObjectList);
- if (!$bIsDashletWithListPref)
- {
+ if (!$bIsDashletWithListPref) {
return;
}
/** @var \DashletObjectList $oDashlet */
$bDashletIdInNewFormat = ($sDashletIdOrig === $oDashlet->GetID());
- if ($bDashletIdInNewFormat)
- {
+ if ($bDashletIdInNewFormat) {
return;
}
$sNewPrefKey = $this->GetDashletObjectListAppUserPreferencesPrefix($oDashlet, $aExtraParams, $oDashlet->GetID());
$sPrefValueForNewKey = appUserPreferences::GetPref($sNewPrefKey, null);
$bHasPrefInNewFormat = ($sPrefValueForNewKey !== null);
- if ($bHasPrefInNewFormat)
- {
+ if ($bHasPrefInNewFormat) {
return;
}
$sOldPrefKey = $this->GetDashletObjectListAppUserPreferencesPrefix($oDashlet, $aExtraParams, $sDashletIdOrig);
$sPrefValueForOldKey = appUserPreferences::GetPref($sOldPrefKey, null);
$bHasPrefInOldFormat = ($sPrefValueForOldKey !== null);
- if (!$bHasPrefInOldFormat)
- {
+ if (!$bHasPrefInOldFormat) {
return;
}
@@ -1673,7 +1608,7 @@ JS
private function GetDashletObjectListAppUserPreferencesPrefix(DashletObjectList $oDashlet, $aExtraParams, $sDashletId)
{
$sDataTableId = Dashlet::APPUSERPREFERENCES_PREFIX.$sDashletId;
- $aClassAliases = array();
+ $aClassAliases = [];
try {
$oFilter = $oDashlet->GetDBSearch($aExtraParams);
$aClassAliases = $oFilter->GetSelectedClasses();
diff --git a/application/dashboardlayout.class.inc.php b/application/dashboardlayout.class.inc.php
index fd1d98b2d..ec8601797 100644
--- a/application/dashboardlayout.class.inc.php
+++ b/application/dashboardlayout.class.inc.php
@@ -1,9 +1,10 @@
'',
'icon' => '',
'description' => '',
- );
+ ];
}
}
abstract class DashboardLayoutMultiCol extends DashboardLayout
{
protected $iNbCols;
-
+
public function __construct()
{
$this->iNbCols = 1;
@@ -63,47 +64,38 @@ abstract class DashboardLayoutMultiCol extends DashboardLayout
$aKeys = array_reverse(array_keys($aDashlets));
$idx = 0;
$bNoVisibleFound = true;
- while($idx < count($aKeys) && $bNoVisibleFound)
- {
+ while ($idx < count($aKeys) && $bNoVisibleFound) {
/** @var \Dashlet $oDashlet */
$oDashlet = $aDashlets[$aKeys[$idx]];
- if ($oDashlet::IsVisible())
- {
+ if ($oDashlet::IsVisible()) {
$bNoVisibleFound = false;
- }
- else
- {
+ } else {
unset($aDashlets[$aKeys[$idx]]);
}
$idx++;
}
return $aDashlets;
}
-
+
protected function TrimCellsArray($aCells)
{
- foreach($aCells as $key => $aDashlets)
- {
+ foreach ($aCells as $key => $aDashlets) {
$aCells[$key] = $this->TrimCell($aDashlets);
}
$aKeys = array_reverse(array_keys($aCells));
$idx = 0;
$bNoVisibleFound = true;
- while($idx < count($aKeys) && $bNoVisibleFound)
- {
+ while ($idx < count($aKeys) && $bNoVisibleFound) {
$aDashlets = $aCells[$aKeys[$idx]];
- if (count($aDashlets) > 0)
- {
+ if (count($aDashlets) > 0) {
$bNoVisibleFound = false;
- }
- else
- {
+ } else {
unset($aCells[$aKeys[$idx]]);
}
$idx++;
}
- return $aCells;
-
+ return $aCells;
+
}
/**
@@ -112,7 +104,7 @@ abstract class DashboardLayoutMultiCol extends DashboardLayout
* @param bool $bEditMode
* @param array $aExtraParams
*/
- public function Render($oPage, $aCells, $bEditMode = false, $aExtraParams = array())
+ public function Render($oPage, $aCells, $bEditMode = false, $aExtraParams = [])
{
// Trim the list of cells to remove the invisible/empty ones at the end of the array
$aCells = $this->TrimCellsArray($aCells);
@@ -157,8 +149,7 @@ abstract class DashboardLayoutMultiCol extends DashboardLayout
$oPage->add_script("function updateDashboard".$aExtraParams['dashboard_div_id']."(){".$sJSReload."}");
- if ($bEditMode) // Add one row for extensibility
- {
+ if ($bEditMode) { // Add one row for extensibility
$oDashboardRow = new DashboardRow();
$oDashboardLayout->AddDashboardRow($oDashboardRow);
@@ -180,7 +171,7 @@ abstract class DashboardLayoutMultiCol extends DashboardLayout
$iColNumber = (int) $iCellIdx % $this->iNbCols;
$iRowNumber = (int) floor($iCellIdx / $this->iNbCols);
- return array($iColNumber, $iRowNumber);
+ return [$iColNumber, $iRowNumber];
}
}
@@ -191,13 +182,13 @@ class DashboardLayoutOneCol extends DashboardLayoutMultiCol
parent::__construct();
$this->iNbCols = 1;
}
- static public function GetInfo()
+ public static function GetInfo()
{
- return array(
+ return [
'label' => 'One Column',
'icon' => 'images/layout_1col.png',
'description' => '',
- );
+ ];
}
}
@@ -208,13 +199,13 @@ class DashboardLayoutTwoCols extends DashboardLayoutMultiCol
parent::__construct();
$this->iNbCols = 2;
}
- static public function GetInfo()
+ public static function GetInfo()
{
- return array(
+ return [
'label' => 'Two Columns',
'icon' => 'images/layout_2col.png',
'description' => '',
- );
+ ];
}
}
@@ -225,12 +216,12 @@ class DashboardLayoutThreeCols extends DashboardLayoutMultiCol
parent::__construct();
$this->iNbCols = 3;
}
- static public function GetInfo()
+ public static function GetInfo()
{
- return array(
+ return [
'label' => 'Two Columns',
'icon' => 'images/layout_3col.png',
'description' => '',
- );
+ ];
}
-}
\ No newline at end of file
+}
diff --git a/application/dashlet.class.inc.php b/application/dashlet.class.inc.php
index e25766268..c0a67b24b 100644
--- a/application/dashlet.class.inc.php
+++ b/application/dashlet.class.inc.php
@@ -1,9 +1,10 @@
sId = $sId;
$this->bRedrawNeeded = true; // By default: redraw each time a property changes
$this->bFormRedrawNeeded = false; // By default: no need to redraw the form (independent fields)
- $this->aProperties = array(); // By default: there is no property
- $this->aCSSClasses = array('ibo-dashlet');
+ $this->aProperties = []; // By default: there is no property
+ $this->aCSSClasses = ['ibo-dashlet'];
$this->sDashletType = get_class($this);
}
@@ -100,16 +101,11 @@ abstract class Dashlet
public function Prop2Str($value)
{
$sType = gettype($value);
- if ($sType == 'boolean')
- {
+ if ($sType == 'boolean') {
$sRet = $value ? 'true' : 'false';
- }
- elseif ($sType == 'array')
- {
+ } elseif ($sType == 'array') {
$sRet = implode(',', $value);
- }
- else
- {
+ } else {
$sRet = (string) $value;
}
return $sRet;
@@ -124,11 +120,9 @@ abstract class Dashlet
*/
public function FromDOMNode($oDOMNode)
{
- foreach ($this->aProperties as $sProperty => $value)
- {
+ foreach ($this->aProperties as $sProperty => $value) {
$oPropNode = $oDOMNode->getElementsByTagName($sProperty)->item(0);
- if ($oPropNode != null)
- {
+ if ($oPropNode != null) {
$this->aProperties[$sProperty] = $this->PropertyFromDOMNode($oPropNode, $sProperty);
}
}
@@ -140,8 +134,7 @@ abstract class Dashlet
*/
public function ToDOMNode($oDOMNode)
{
- foreach ($this->aProperties as $sProperty => $value)
- {
+ foreach ($this->aProperties as $sProperty => $value) {
$oPropNode = $oDOMNode->ownerDocument->createElement($sProperty);
$oDOMNode->appendChild($oPropNode);
$this->PropertyToDOMNode($oPropNode, $sProperty, $value);
@@ -183,8 +176,7 @@ abstract class Dashlet
libxml_clear_errors();
$oDomDoc->loadXml($sXml);
$aErrors = libxml_get_errors();
- if (count($aErrors) > 0)
- {
+ if (count($aErrors) > 0) {
throw new DOMException("Malformed XML");
}
@@ -228,7 +220,7 @@ abstract class Dashlet
* @param bool $bEnclosingDiv
* @param array $aExtraParams
*/
- public function DoRender($oPage, $bEditMode = false, $bEnclosingDiv = true, $aExtraParams = array()): UIBlock
+ public function DoRender($oPage, $bEditMode = false, $bEnclosingDiv = true, $aExtraParams = []): UIBlock
{
$sId = $this->GetID();
@@ -305,7 +297,7 @@ EOF
*
* @return iUIBlock
*/
- abstract public function Render($oPage, $bEditMode = false, $aExtraParams = array());
+ abstract public function Render($oPage, $bEditMode = false, $aExtraParams = []);
/**
* Rendering without the real data
@@ -316,7 +308,7 @@ EOF
*
* @return iUIBlock
*/
- public function RenderNoData($oPage, $bEditMode = false, $aExtraParams = array())
+ public function RenderNoData($oPage, $bEditMode = false, $aExtraParams = [])
{
return $this->Render($oPage, $bEditMode, $aExtraParams);
}
@@ -344,10 +336,8 @@ EOF
*/
public function Update($aValues, $aUpdatedFields)
{
- foreach($aUpdatedFields as $sProp)
- {
- if (array_key_exists($sProp, $this->aProperties))
- {
+ foreach ($aUpdatedFields as $sProp) {
+ if (array_key_exists($sProp, $this->aProperties)) {
$this->aProperties[$sProp] = $this->Str2Prop($sProp, $aValues[$sProp]);
}
}
@@ -374,13 +364,13 @@ EOF
/**
* @return array
*/
- static public function GetInfo()
+ public static function GetInfo()
{
- return array(
+ return [
'label' => '',
'icon' => '',
'description' => '',
- );
+ ];
}
/**
@@ -388,7 +378,7 @@ EOF
*
* @return \DesignerForm
*/
- public function GetForm($aInfo = array())
+ public function GetForm($aInfo = [])
{
$oForm = new DesignerForm();
$sPrefix = "dashlet_".$this->GetID();
@@ -413,7 +403,7 @@ EOF
/**
* @return bool
*/
- static public function IsVisible()
+ public static function IsVisible()
{
return true;
}
@@ -421,7 +411,7 @@ EOF
/**
* @return bool
*/
- static public function CanCreateFromOQL()
+ public static function CanCreateFromOQL()
{
return false;
}
@@ -442,18 +432,15 @@ EOF
*/
protected function GetGroupByOptions($sOql)
{
- $aGroupBy = array();
- try
- {
+ $aGroupBy = [];
+ try {
$oQuery = $this->oModelReflection->GetQuery($sOql);
$sClass = $oQuery->GetClass();
- foreach($this->oModelReflection->ListAttributes($sClass) as $sAttCode => $sAttType)
- {
+ foreach ($this->oModelReflection->ListAttributes($sClass) as $sAttCode => $sAttType) {
// For external fields, find the real type of the target
$sExtFieldAttCode = $sAttCode;
$sTargetClass = $sClass;
- while (is_a($sAttType, 'AttributeExternalField', true))
- {
+ while (is_a($sAttType, 'AttributeExternalField', true)) {
$sExtKeyAttCode = $this->oModelReflection->GetAttributeProperty($sTargetClass, $sExtFieldAttCode, 'extkey_attcode');
$sTargetAttCode = $this->oModelReflection->GetAttributeProperty($sTargetClass, $sExtFieldAttCode, 'target_attcode');
$sTargetClass = $this->oModelReflection->GetAttributeProperty($sTargetClass, $sExtKeyAttCode, 'targetclass');
@@ -472,19 +459,16 @@ EOF
'AttributePassword',
];
foreach ($aForbidenAttType as $sForbidenAttType) {
- if (is_a($sAttType, $sForbidenAttType, true))
- {
+ if (is_a($sAttType, $sForbidenAttType, true)) {
continue 2;
}
}
$sLabel = $this->oModelReflection->GetLabel($sClass, $sAttCode);
- if (!in_array($sLabel, $aGroupBy))
- {
+ if (!in_array($sLabel, $aGroupBy)) {
$aGroupBy[$sAttCode] = $sLabel;
- if (is_a($sAttType, 'AttributeDateTime', true))
- {
+ if (is_a($sAttType, 'AttributeDateTime', true)) {
$aGroupBy[$sAttCode.':hour'] = Dict::Format('UI:DashletGroupBy:Prop-GroupBy:Select-Hour', $sLabel);
$aGroupBy[$sAttCode.':month'] = Dict::Format('UI:DashletGroupBy:Prop-GroupBy:Select-Month', $sLabel);
$aGroupBy[$sAttCode.':day_of_week'] = Dict::Format('UI:DashletGroupBy:Prop-GroupBy:Select-DayOfWeek', $sLabel);
@@ -493,9 +477,7 @@ EOF
}
}
asort($aGroupBy);
- }
- catch (Exception $e)
- {
+ } catch (Exception $e) {
// Fallback in case of OQL problem
}
return $aGroupBy;
@@ -527,7 +509,7 @@ EOF
*/
class DashletUnknown extends Dashlet
{
- static protected $aClassList = null;
+ protected static $aClassList = null;
protected $sOriginalDashletXML;
@@ -550,22 +532,19 @@ class DashletUnknown extends Dashlet
parent::FromDOMNode($oDOMNode);
// Build properties from XML
- $this->sOriginalDashletXML = "";
- foreach($oDOMNode->childNodes as $oDOMChildNode)
- {
- if($oDOMChildNode instanceof DOMElement)
- {
+ $this->sOriginalDashletXML = "";
+ foreach ($oDOMNode->childNodes as $oDOMChildNode) {
+ if ($oDOMChildNode instanceof DOMElement) {
$sProperty = $oDOMChildNode->tagName;
// For all properties but "rank" as it is handle by the dashboard.
- if($sProperty !== 'rank')
- {
+ if ($sProperty !== 'rank') {
// We need to initialize the property before setting it, otherwise it will guessed as NULL and not used.
$this->aProperties[$sProperty] = '';
$this->aProperties[$sProperty] = $this->PropertyFromDOMNode($oDOMChildNode, $sProperty);
// And build the original XML
- $this->sOriginalDashletXML .= $oDOMChildNode->ownerDocument->saveXML($oDOMChildNode)."\n";
+ $this->sOriginalDashletXML .= $oDOMChildNode->ownerDocument->saveXML($oDOMChildNode)."\n";
}
}
}
@@ -585,12 +564,10 @@ class DashletUnknown extends Dashlet
libxml_clear_errors();
$oDoc->loadXML(''.$this->sOriginalDashletXML.' ');
$aErrors = libxml_get_errors();
- if (count($aErrors) > 0)
- {
+ if (count($aErrors) > 0) {
throw new DOMFormatException('Dashlet definition not correctly formatted!');
}
- foreach($oDoc->documentElement->childNodes as $oDOMChildNode)
- {
+ foreach ($oDoc->documentElement->childNodes as $oDOMChildNode) {
$oPropNode = $oDOMNode->ownerDocument->importNode($oDOMChildNode, true);
$oDOMNode->appendChild($oPropNode);
}
@@ -602,23 +579,22 @@ class DashletUnknown extends Dashlet
* @throws \DOMException
*/
public function FromParams($aParams)
- {
- // For unknown dashlet, parameters are not parsed but passed as a raw xml
- if(array_key_exists('xml', $aParams))
- {
- // A namespace must be present for the "xsi:type" attribute, otherwise a warning will be thrown.
- $sXML = ''.$aParams['xml'].' ';
- $this->FromXml($sXML);
- }
- $this->OnUpdate();
- }
+ {
+ // For unknown dashlet, parameters are not parsed but passed as a raw xml
+ if (array_key_exists('xml', $aParams)) {
+ // A namespace must be present for the "xsi:type" attribute, otherwise a warning will be thrown.
+ $sXML = ''.$aParams['xml'].' ';
+ $this->FromXml($sXML);
+ }
+ $this->OnUpdate();
+ }
/**
* @inheritdoc
*
* @throws \Exception
*/
- public function Render($oPage, $bEditMode = false, $aExtraParams = array())
+ public function Render($oPage, $bEditMode = false, $aExtraParams = [])
{
$aInfos = static::GetInfo();
@@ -637,7 +613,7 @@ class DashletUnknown extends Dashlet
*
* @throws \Exception
*/
- public function RenderNoData($oPage, $bEditMode = false, $aExtraParams = array())
+ public function RenderNoData($oPage, $bEditMode = false, $aExtraParams = [])
{
$aInfos = static::GetInfo();
@@ -654,10 +630,9 @@ class DashletUnknown extends Dashlet
/**
* @inheritdoc
*/
- public function GetForm($aInfo = array())
+ public function GetForm($aInfo = [])
{
- if (isset($aInfo['configuration']) && empty($this->sOriginalDashletXML))
- {
+ if (isset($aInfo['configuration']) && empty($this->sOriginalDashletXML)) {
$this->sOriginalDashletXML = $aInfo['configuration'];
}
return parent::GetForm($aInfo);
@@ -678,23 +653,18 @@ class DashletUnknown extends Dashlet
protected function PropertyFromDOMNode($oDOMNode, $sProperty)
{
$bHasSubProperties = false;
- foreach($oDOMNode->childNodes as $oDOMChildNode)
- {
- if($oDOMChildNode->nodeType === XML_ELEMENT_NODE)
- {
+ foreach ($oDOMNode->childNodes as $oDOMChildNode) {
+ if ($oDOMChildNode->nodeType === XML_ELEMENT_NODE) {
$bHasSubProperties = true;
break;
}
}
- if($bHasSubProperties)
- {
+ if ($bHasSubProperties) {
$sTmp = $oDOMNode->ownerDocument->saveXML($oDOMNode, LIBXML_NOENT);
$sTmp = trim(preg_replace("/(<".$oDOMNode->tagName."[^>]*>|<\/".$oDOMNode->tagName.">)/", "", $sTmp));
return $sTmp;
- }
- else
- {
+ } else {
return parent::PropertyFromDOMNode($oDOMNode, $sProperty);
}
}
@@ -705,15 +675,12 @@ class DashletUnknown extends Dashlet
protected function PropertyToDOMNode($oDOMNode, $sProperty, $value)
{
// Save subnodes
- if(preg_match('/<(.*)>/', $value))
- {
+ if (preg_match('/<(.*)>/', $value)) {
/** @var \DOMDocumentFragment $oDOMFragment */
$oDOMFragment = $oDOMNode->ownerDocument->createDocumentFragment();
$oDOMFragment->appendXML($value);
$oDOMNode->appendChild($oDOMFragment);
- }
- else
- {
+ } else {
parent::PropertyToDOMNode($oDOMNode, $sProperty, $value);
}
}
@@ -724,22 +691,22 @@ class DashletUnknown extends Dashlet
* @throws \DOMException
*/
public function Update($aValues, $aUpdatedFields)
- {
- $this->FromParams($aValues);
- // OnUpdate() already done in FromParams()
- return $this;
- }
+ {
+ $this->FromParams($aValues);
+ // OnUpdate() already done in FromParams()
+ return $this;
+ }
/**
* @inheritdoc
*/
- static public function GetInfo()
+ public static function GetInfo()
{
- return array(
+ return [
'label' => Dict::S('UI:DashletUnknown:Label'),
'icon' => 'images/dashlet-unknown.png',
'description' => Dict::S('UI:DashletUnknown:Description'),
- );
+ ];
}
}
@@ -753,10 +720,9 @@ class DashletProxy extends DashletUnknown
parent::__construct($oModelReflection, $sId);
// Remove DashletUnknown class
- if( ($key = array_search('dashlet-unknown', $this->aCSSClasses)) !== false )
- {
- unset($this->aCSSClasses[$key]);
- }
+ if (($key = array_search('dashlet-unknown', $this->aCSSClasses)) !== false) {
+ unset($this->aCSSClasses[$key]);
+ }
$this->aCSSClasses[] = 'dashlet-proxy';
}
@@ -764,7 +730,7 @@ class DashletProxy extends DashletUnknown
/**
* @inheritdoc
*/
- public function Render($oPage, $bEditMode = false, $aExtraParams = array())
+ public function Render($oPage, $bEditMode = false, $aExtraParams = [])
{
// This should never be called.
$oDashletContainer = new DashletContainer(null, ['dashlet-content']);
@@ -777,7 +743,7 @@ class DashletProxy extends DashletUnknown
*
* @throws \Exception
*/
- public function RenderNoData($oPage, $bEditMode = false, $aExtraParams = array())
+ public function RenderNoData($oPage, $bEditMode = false, $aExtraParams = [])
{
$aInfos = static::GetInfo();
@@ -797,13 +763,13 @@ class DashletProxy extends DashletUnknown
/**
* @inheritdoc
*/
- static public function GetInfo()
+ public static function GetInfo()
{
- return array(
+ return [
'label' => Dict::S('UI:DashletProxy:Label'),
'icon' => 'images/dashlet-proxy.png',
'description' => Dict::S('UI:DashletProxy:Description'),
- );
+ ];
}
}
@@ -820,7 +786,7 @@ class DashletEmptyCell extends Dashlet
/**
* @inheritdoc
*/
- public function Render($oPage, $bEditMode = false, $aExtraParams = array())
+ public function Render($oPage, $bEditMode = false, $aExtraParams = [])
{
return new Html(' ');
}
@@ -835,19 +801,19 @@ class DashletEmptyCell extends Dashlet
/**
* @inheritdoc
*/
- static public function GetInfo()
+ public static function GetInfo()
{
- return array(
+ return [
'label' => 'Empty Cell',
'icon' => 'images/dashlet-text.png',
'description' => 'Empty Cell Dashlet Placeholder',
- );
+ ];
}
/**
* @inheritdoc
*/
- static public function IsVisible()
+ public static function IsVisible()
{
return false;
}
@@ -867,11 +833,11 @@ class DashletPlainText extends Dashlet
/**
* @inheritdoc
*/
- public function Render($oPage, $bEditMode = false, $aExtraParams = array())
+ public function Render($oPage, $bEditMode = false, $aExtraParams = [])
{
$sText = $this->aProperties['text'];
$sText = utils::EscapeHtml(Dict::S($sText));
- $sText = str_replace(array("\r\n", "\n", "\r"), "
$sCSV = implode(',', $aValues);
- $aParams = array(
+ $aParams = [
'title[block]' => $sTitle,
'label[block]' => $sSubtitle,
'status[block]' => $sGroupBy,
'status_codes[block]' => $sCSV,
'context_filter' => 1,
- );
+ ];
} else {
// Simple stats
- $aParams = array(
+ $aParams = [
'title[block]' => $sTitle,
'label[block]' => $sSubtitle,
'context_filter' => 1,
- );
+ ];
}
if (isset($aExtraParams['query_params'])) {
@@ -2121,7 +2012,7 @@ class DashletHeaderDynamic extends Dashlet
$oObj = MetaModel::GetObject($aExtraParams['this->class'], $aExtraParams['this->id']);
$aQueryParams = $oObj->ToArgsForQuery();
} else {
- $aQueryParams = array();
+ $aQueryParams = [];
}
$oFilter = DBObjectSearch::FromOQL($sQuery, $aQueryParams);
$oFilter->SetShowObsoleteData(utils::ShowObsoleteData());
@@ -2147,7 +2038,7 @@ class DashletHeaderDynamic extends Dashlet
/**
* @inheritdoc
*/
- public function RenderNoData($oPage, $bEditMode = false, $aExtraParams = array())
+ public function RenderNoData($oPage, $bEditMode = false, $aExtraParams = [])
{
$sTitle = utils::HtmlEntities($this->aProperties['title']);
$sIcon = $this->aProperties['icon'];
@@ -2164,8 +2055,7 @@ class DashletHeaderDynamic extends Dashlet
foreach ($aValues as $sValue) {
$aValueLabels[] = $this->oModelReflection->GetValueLabel($sClass, $sGroupBy, $sValue);
}
- }
- catch (UnknownClassOqlException $e) {
+ } catch (UnknownClassOqlException $e) {
$aValueLabels[] = $e->GetUserFriendlyDescription();
$aValues[] = 1;
}
@@ -2207,7 +2097,6 @@ class DashletHeaderDynamic extends Dashlet
$sHtml .= ''.utils::HtmlEntities($sSubtitle).' ';
$sHtml .= ' ';
-
$oDashletContainer->AddHtml($sHtml);
return $oDashletContainer;
@@ -2234,8 +2123,7 @@ class DashletHeaderDynamic extends Dashlet
$oField->AddCSSClass("ibo-is-code");
$oForm->AddField($oField);
- try
- {
+ try {
// Group by field: build the list of possible values (attribute codes + ...)
$oQuery = $this->oModelReflection->GetQuery($this->aProperties['query']);
$sClass = $oQuery->GetClass();
@@ -2243,9 +2131,7 @@ class DashletHeaderDynamic extends Dashlet
$oField = new DesignerComboField('group_by', Dict::S('UI:DashletHeaderDynamic:Prop-GroupBy'), $this->aProperties['group_by']);
$oField->SetMandatory();
$oField->SetAllowedValues($aGroupBy);
- }
- catch(Exception $e)
- {
+ } catch (Exception $e) {
$oField = new DesignerTextField('group_by', Dict::S('UI:DashletHeaderDynamic:Prop-GroupBy'), $this->aProperties['group_by']);
$oField->SetReadOnly();
}
@@ -2253,13 +2139,10 @@ class DashletHeaderDynamic extends Dashlet
$oField = new DesignerComboField('values', Dict::S('UI:DashletHeaderDynamic:Prop-Values'), $this->aProperties['values']);
$oField->MultipleSelection(true);
- if (isset($sClass) && $this->oModelReflection->IsValidAttCode($sClass, $this->aProperties['group_by']))
- {
+ if (isset($sClass) && $this->oModelReflection->IsValidAttCode($sClass, $this->aProperties['group_by'])) {
$aValues = $this->oModelReflection->GetAllowedValues_att($sClass, $this->aProperties['group_by']);
$oField->SetAllowedValues($aValues);
- }
- else
- {
+ } else {
$oField->SetReadOnly();
}
$oForm->AddField($oField);
@@ -2270,10 +2153,8 @@ class DashletHeaderDynamic extends Dashlet
*/
public function Update($aValues, $aUpdatedFields)
{
- if (in_array('query', $aUpdatedFields))
- {
- try
- {
+ if (in_array('query', $aUpdatedFields)) {
+ try {
$sCurrQuery = $aValues['query'];
$oCurrSearch = $this->oModelReflection->GetQuery($sCurrQuery);
$sCurrClass = $oCurrSearch->GetClass();
@@ -2282,23 +2163,19 @@ class DashletHeaderDynamic extends Dashlet
$oPrevSearch = $this->oModelReflection->GetQuery($sPrevQuery);
$sPrevClass = $oPrevSearch->GetClass();
- if ($sCurrClass != $sPrevClass)
- {
+ if ($sCurrClass != $sPrevClass) {
$this->bFormRedrawNeeded = true;
// wrong but not necessary - unset($aUpdatedFields['group_by']);
$this->aProperties['group_by'] = '';
- $this->aProperties['values'] = array();
+ $this->aProperties['values'] = [];
}
- }
- catch(Exception $e)
- {
+ } catch (Exception $e) {
$this->bFormRedrawNeeded = true;
}
}
- if (in_array('group_by', $aUpdatedFields))
- {
+ if (in_array('group_by', $aUpdatedFields)) {
$this->bFormRedrawNeeded = true;
- $this->aProperties['values'] = array();
+ $this->aProperties['values'] = [];
}
return parent::Update($aValues, $aUpdatedFields);
}
@@ -2308,13 +2185,10 @@ class DashletHeaderDynamic extends Dashlet
*/
protected function PropertyFromDOMNode($oDOMNode, $sProperty)
{
- if ($sProperty == 'icon')
- {
+ if ($sProperty == 'icon') {
$oIconField = $this->oModelReflection->GetIconSelectionField('icon');
return $oIconField->ValueFromDOMNode($oDOMNode);
- }
- else
- {
+ } else {
return parent::PropertyFromDOMNode($oDOMNode, $sProperty);
}
}
@@ -2324,13 +2198,10 @@ class DashletHeaderDynamic extends Dashlet
*/
protected function PropertyToDOMNode($oDOMNode, $sProperty, $value)
{
- if ($sProperty == 'icon')
- {
+ if ($sProperty == 'icon') {
$oIconField = $this->oModelReflection->GetIconSelectionField('icon');
$oIconField->ValueToDOMNode($oDOMNode, $value);
- }
- else
- {
+ } else {
parent::PropertyToDOMNode($oDOMNode, $sProperty, $value);
}
}
@@ -2338,17 +2209,16 @@ class DashletHeaderDynamic extends Dashlet
/**
* @inheritdoc
*/
- static public function GetInfo()
+ public static function GetInfo()
{
- return array(
+ return [
'label' => Dict::S('UI:DashletHeaderDynamic:Label'),
'icon' => 'images/dashlets/icons8-header-altered-48.png',
'description' => Dict::S('UI:DashletHeaderDynamic:Description'),
- );
+ ];
}
}
-
class DashletBadge extends Dashlet
{
/**
@@ -2367,7 +2237,7 @@ class DashletBadge extends Dashlet
*
* @throws \Exception
*/
- public function Render($oPage, $bEditMode = false, $aExtraParams = array())
+ public function Render($oPage, $bEditMode = false, $aExtraParams = [])
{
$oDashletContainer = new DashletContainer($this->sId, ['dashlet-content']);
@@ -2385,7 +2255,7 @@ class DashletBadge extends Dashlet
/**
* @inheritdoc
*/
- public function RenderNoData($oPage, $bEditMode = false, $aExtraParams = array())
+ public function RenderNoData($oPage, $bEditMode = false, $aExtraParams = [])
{
$oDashletContainer = new DashletContainer($this->sId, ['dashlet-content']);
@@ -2409,7 +2279,7 @@ HTML;
return $oDashletContainer;
}
- static protected $aClassList = null;
+ protected static $aClassList = null;
/**
* @inheritdoc
@@ -2418,28 +2288,24 @@ HTML;
*/
public function GetPropertiesFields(DesignerForm $oForm)
{
- if (is_null(self::$aClassList))
- {
+ if (is_null(self::$aClassList)) {
// Cache the ordered list of classes (ordered on the label)
// (has a significant impact when editing a page with lots of badges)
//
- $aClasses = array();
- foreach($this->oModelReflection->GetClasses('bizmodel', true /*exclude links*/) as $sClass)
- {
+ $aClasses = [];
+ foreach ($this->oModelReflection->GetClasses('bizmodel', true /*exclude links*/) as $sClass) {
$aClasses[$sClass] = $this->oModelReflection->GetName($sClass);
}
asort($aClasses);
- self::$aClassList = array();
- foreach($aClasses as $sClass => $sLabel)
- {
+ self::$aClassList = [];
+ foreach ($aClasses as $sClass => $sLabel) {
$sIconUrl = $this->oModelReflection->GetClassIcon($sClass, false);
- if ($sIconUrl == '')
- {
+ if ($sIconUrl == '') {
// The icon does not exist, let's use a transparent one of the same size.
$sIconUrl = utils::GetAbsoluteUrlAppRoot().'images/transparent_32_32.png';
}
- self::$aClassList[] = array('value' => $sClass, 'label' => $sLabel, 'icon' => $sIconUrl);
+ self::$aClassList[] = ['value' => $sClass, 'label' => $sLabel, 'icon' => $sIconUrl];
}
}
@@ -2452,12 +2318,12 @@ HTML;
/**
* @inheritdoc
*/
- static public function GetInfo()
+ public static function GetInfo()
{
- return array(
+ return [
'label' => Dict::S('UI:DashletBadge:Label'),
'icon' => 'images/dashlets/icons8-badge-48.png',
'description' => Dict::S('UI:DashletBadge:Description'),
- );
+ ];
}
}
diff --git a/application/datatable.class.inc.php b/application/datatable.class.inc.php
index 4a01b1be5..3d78889cb 100644
--- a/application/datatable.class.inc.php
+++ b/application/datatable.class.inc.php
@@ -80,42 +80,31 @@ class DataTable
// Identified tables can have their own specific settings
$oCustomSettings = DataTableSettings::GetTableSettings($this->aClassAliases, $this->sTableId);
-
- if ($oCustomSettings != null)
- {
+
+ if ($oCustomSettings != null) {
// Custom settings overload the default ones
$this->bUseCustomSettings = true;
- if ($this->oDefaultSettings->iDefaultPageSize == 0)
- {
+ if ($this->oDefaultSettings->iDefaultPageSize == 0) {
$oCustomSettings->iDefaultPageSize = 0;
}
- }
- else
- {
+ } else {
$oCustomSettings = $oSettings;
}
- if ($oCustomSettings->iDefaultPageSize > 0)
- {
+ if ($oCustomSettings->iDefaultPageSize > 0) {
$this->oSet->SetLimit($oCustomSettings->iDefaultPageSize);
}
$this->oSet->SetOrderBy($oCustomSettings->GetSortOrder());
// Load only the requested columns
- $aColumnsToLoad = array();
- foreach($oCustomSettings->aColumns as $sAlias => $aColumnsInfo)
- {
- foreach($aColumnsInfo as $sAttCode => $aData)
- {
- if ($sAttCode != '_key_')
- {
- if ($aData['checked'])
- {
+ $aColumnsToLoad = [];
+ foreach ($oCustomSettings->aColumns as $sAlias => $aColumnsInfo) {
+ foreach ($aColumnsInfo as $sAttCode => $aData) {
+ if ($sAttCode != '_key_') {
+ if ($aData['checked']) {
$aColumnsToLoad[$sAlias][] = $sAttCode;
- }
- else
- {
- // See if this column is a must to load
+ } else {
+ // See if this column is a must to load
$sClass = $this->aClassAliases[$sAlias];
$oAttDef = MetaModel::GetAttributeDef($sClass, $sAttCode);
if ($oAttDef->AlwaysLoadInTables()) {
@@ -127,18 +116,15 @@ class DataTable
}
$this->oSet->OptimizeColumnLoad($aColumnsToLoad);
-
$bToolkitMenu = true;
- if (isset($aExtraParams['toolkit_menu']))
- {
+ if (isset($aExtraParams['toolkit_menu'])) {
$bToolkitMenu = (bool) $aExtraParams['toolkit_menu'];
}
- if (UserRights::IsPortalUser())
- {
+ if (UserRights::IsPortalUser()) {
// Portal users have a limited access to data, for now they can only see what's configured for them
$bToolkitMenu = false;
}
-
+
return $this->GetAsHTML($oPage, $oCustomSettings->iDefaultPageSize, $oCustomSettings->iDefaultPageSize, 0, $oCustomSettings->aColumns, $bActionsMenu, $bToolkitMenu, $sSelectMode, $bViewLink, $aExtraParams);
}
@@ -167,10 +153,10 @@ class DataTable
if ($bActionsMenu) {
$sActionsMenu = $this->GetActionsMenu($oPage, $aExtraParams);
}
-// if ($bToolkitMenu)
-// {
-// $sToolkitMenu = $this->GetToolkitMenu($oPage, $aExtraParams);
-// }
+ // if ($bToolkitMenu)
+ // {
+ // $sToolkitMenu = $this->GetToolkitMenu($oPage, $aExtraParams);
+ // }
$sDataTable = $this->GetHTMLTable($oPage, $aColumns, $sSelectMode, $iPageSize, $bViewLink, $aExtraParams);
$sConfigDlg = $this->GetTableConfigDlg($oPage, $aColumns, $bViewLink, $iDefaultPageSize);
@@ -188,7 +174,7 @@ class DataTable
$aExtraParams['show_obsolete_data'] = $this->bShowObsoleteData;
- $aOptions = array(
+ $aOptions = [
'sPersistentId' => '',
'sFilter' => $this->oSet->GetFilter()->serialize(),
'oColumns' => $aColumns,
@@ -202,12 +188,11 @@ class DataTable
'sTableId' => $this->sTableId,
'oExtraParams' => $aExtraParams,
'sRenderUrl' => utils::GetAbsoluteUrlAppRoot().'pages/ajax.render.php',
- 'oRenderParameters' => array('str' => ''), // Forces JSON to encode this as a object...
- 'oDefaultSettings' => array('str' => ''), // Forces JSON to encode this as a object...
- 'oLabels' => array('moveup' => Dict::S('UI:Button:MoveUp'), 'movedown' => Dict::S('UI:Button:MoveDown')),
- );
- if($this->oDefaultSettings != null)
- {
+ 'oRenderParameters' => ['str' => ''], // Forces JSON to encode this as a object...
+ 'oDefaultSettings' => ['str' => ''], // Forces JSON to encode this as a object...
+ 'oLabels' => ['moveup' => Dict::S('UI:Button:MoveUp'), 'movedown' => Dict::S('UI:Button:MoveDown')],
+ ];
+ if ($this->oDefaultSettings != null) {
$aOptions['oDefaultSettings'] = $this->GetAsHash($this->oDefaultSettings);
}
$sJSOptions = json_encode($aOptions);
@@ -222,16 +207,14 @@ class DataTable
*/
public function GetAsHTMLTableRows(WebPage $oPage, $iPageSize, $aColumns, $sSelectMode, $bViewLink, $aExtraParams)
{
- if ($iPageSize < 1)
- {
+ if ($iPageSize < 1) {
$iPageSize = -1; // convention: no pagination
}
$aAttribs = $this->GetHTMLTableConfig($aColumns, $sSelectMode, $bViewLink);
$aValues = $this->GetHTMLTableValues($aColumns, $sSelectMode, $iPageSize, $bViewLink, $aExtraParams);
-
+
$sHtml = '';
- foreach($aValues as $aRow)
- {
+ foreach ($aValues as $aRow) {
$sHtml .= $oPage->GetTableRow($aRow, $aAttribs);
}
return $sHtml;
@@ -245,15 +228,12 @@ class DataTable
*/
protected function GetObjectCount(WebPage $oPage, $sSelectMode)
{
- if (($sSelectMode == 'single') || ($sSelectMode == 'multiple'))
- {
+ if (($sSelectMode == 'single') || ($sSelectMode == 'multiple')) {
$sHtml = '';
- }
- else
- {
+ } else {
$sHtml = '';
}
- return $sHtml;
+ return $sHtml;
}
/**
@@ -267,26 +247,19 @@ class DataTable
protected function GetPager(WebPage $oPage, $iPageSize, $iDefaultPageSize, $iPageIndex)
{
$sHtml = '';
- if ($iPageSize < 1) // Display all
- {
+ if ($iPageSize < 1) { // Display all
$sPagerStyle = 'style="display:none"'; // no limit: display the full table, so hide the "pager" UI
- // WARNING: mPDF does not take the "display" style into account
- // when applied to a
or a tag, so make sure you apply this to a div
- }
- else
- {
+ // WARNING: mPDF does not take the "display" style into account
+ // when applied to a or a tag, so make sure you apply this to a div
+ } else {
$sPagerStyle = '';
}
-
+
$sCombo = '';
- if($iPageSize < 1)
- {
+ if ($iPageSize < 1) {
$sCombo .= "".Dict::S('UI:Pagination:All')." ";
- }
- else
- {
- for($iPage = 1; $iPage < 5; $iPage++)
- {
+ } else {
+ for ($iPage = 1; $iPage < 5; $iPage++) {
$iNbItems = $iPage * $iDefaultPageSize;
$sSelected = ($iNbItems == $iPageSize) ? 'selected="selected"' : '';
$sCombo .= "$iNbItems ";
@@ -295,31 +268,25 @@ class DataTable
}
$sCombo .= ' ';
-
+
$sPages = Dict::S('UI:Pagination:PagesLabel');
$sPageSizeCombo = Dict::Format('UI:Pagination:PageSize', $sCombo);
-
+
$iNbPages = ($iPageSize < 1) ? 1 : ceil($this->iNbObjects / $iPageSize);
- if ($iNbPages == 1)
- {
+ if ($iNbPages == 1) {
// No need to display the pager
$sPagerStyle = 'style="display:none"';
}
- $aPagesToDisplay = array();
- for($idx = 0; $idx <= min(4, $iNbPages-1); $idx++)
- {
- if ($idx == 0)
- {
+ $aPagesToDisplay = [];
+ for ($idx = 0; $idx <= min(4, $iNbPages - 1); $idx++) {
+ if ($idx == 0) {
$aPagesToDisplay[$idx] = '1 ';
- }
- else
- {
- $aPagesToDisplay[$idx] = "".(1+$idx)." ";
+ } else {
+ $aPagesToDisplay[$idx] = "".(1 + $idx)." ";
}
}
$iLastPageIdx = $iNbPages - 1;
- if (!isset($aPagesToDisplay[$iLastPageIdx]))
- {
+ if (!isset($aPagesToDisplay[$iLastPageIdx])) {
unset($aPagesToDisplay[$idx - 1]); // remove the last page added to make room for the very last page
$aPagesToDisplay[$iLastPageIdx] = "... $iNbPages ";
}
@@ -386,22 +353,19 @@ EOF;
*/
protected function GetToolkitMenu(WebPage $oPage, $aExtraParams)
{
- if (!$oPage->IsPrintableVersion())
- {
+ if (!$oPage->IsPrintableVersion()) {
$sMenuTitle = Dict::S('UI:ConfigureThisList');
$sHtml = '
';
$sHtml .= "";
$sHtml .= "";
-
+
$sDlgTitle = addslashes(Dict::S('UI:ListConfigurationTitle'));
$oPage->add_ready_script("$('#datatable_dlg_{$this->iListId}').dialog({autoOpen: false, title: '$sDlgTitle', width: 500, close: function() { $('#{$this->sDatatableContainerId}').datatable('onDlgCancel'); } });");
@@ -458,7 +422,7 @@ EOF;
*/
public function GetAsHash($oSetting)
{
- $aSettings = array('iDefaultPageSize' => $oSetting->iDefaultPageSize, 'oColumns' => $oSetting->aColumns);
+ $aSettings = ['iDefaultPageSize' => $oSetting->iDefaultPageSize, 'oColumns' => $oSetting->aColumns];
return $aSettings;
}
@@ -474,55 +438,46 @@ EOF;
*/
protected function GetHTMLTableConfig($aColumns, $sSelectMode, $bViewLink)
{
- $aAttribs = array();
- if ($sSelectMode == 'multiple')
- {
- $aAttribs['form::select'] = array(
+ $aAttribs = [];
+ if ($sSelectMode == 'multiple') {
+ $aAttribs['form::select'] = [
'label' => "';
- foreach($this->oSet->GetFilter()->GetInternalParams() as $sName => $sValue)
- {
+ foreach ($this->oSet->GetFilter()->GetInternalParams() as $sName => $sValue) {
$aExtraParams['query_params'][$sName] = $sValue;
}
$aExtraParams['show_obsolete_data'] = $this->bShowObsoleteData;
@@ -707,20 +629,16 @@ EOF;
$sExtraParams = addslashes(str_replace('"', "'", json_encode(array_merge($aExtraParams, $aArgs)))); // JSON encode, change the style of the quotes and escape them
$sSelectModeJS = '';
$sHeaders = '';
- if (($sSelectMode == 'single') || ($sSelectMode == 'multiple'))
- {
+ if (($sSelectMode == 'single') || ($sSelectMode == 'multiple')) {
$sSelectModeJS = $sSelectMode;
$sHeaders = 'headers: { 0: {sorter: false}},';
}
$sDisplayKey = ($bViewLink) ? 'true' : 'false';
// Protect against duplicate elements in the Zlist
- $aUniqueOrderedList = array();
- foreach($this->aClassAliases as $sAlias => $sClassName)
- {
- foreach($aColumns[$sAlias] as $sAttCode => $aData)
- {
- if ($aData['checked'])
- {
+ $aUniqueOrderedList = [];
+ foreach ($this->aClassAliases as $sAlias => $sClassName) {
+ foreach ($aColumns[$sAlias] as $sAttCode => $aData) {
+ if ($aData['checked']) {
$aUniqueOrderedList[$sAttCode] = true;
}
}
@@ -732,41 +650,32 @@ EOF;
$this->oSet->ApplyParameters();
// Display the actual sort order of the table
$aRealSortOrder = $this->oSet->GetRealSortOrder();
- $aDefaultSort = array();
+ $aDefaultSort = [];
$iColOffset = 0;
- if (($sSelectMode == 'single') || ($sSelectMode == 'multiple'))
- {
+ if (($sSelectMode == 'single') || ($sSelectMode == 'multiple')) {
$iColOffset += 1;
}
- if ($bViewLink)
- {
-// $iColOffset += 1;
+ if ($bViewLink) {
+ // $iColOffset += 1;
}
- foreach($aRealSortOrder as $sColCode => $bAscending)
- {
+ foreach ($aRealSortOrder as $sColCode => $bAscending) {
$iPos = array_search($sColCode, $aUniqueOrderedList);
- if ($iPos !== false)
- {
- $aDefaultSort[] = "[".($iColOffset+$iPos).",".($bAscending ? '0' : '1')."]";
- }
- else if (($iPos = array_search(preg_replace('/_friendlyname$/', '', $sColCode), $aUniqueOrderedList)) !== false)
- {
+ if ($iPos !== false) {
+ $aDefaultSort[] = "[".($iColOffset + $iPos).",".($bAscending ? '0' : '1')."]";
+ } elseif (($iPos = array_search(preg_replace('/_friendlyname$/', '', $sColCode), $aUniqueOrderedList)) !== false) {
// if sorted on the friendly name of an external key, then consider it sorted on the column that shows the links
- $aDefaultSort[] = "[".($iColOffset+$iPos).",".($bAscending ? '0' : '1')."]";
- }
- else if($sColCode == 'friendlyname' && $bViewLink)
- {
+ $aDefaultSort[] = "[".($iColOffset + $iPos).",".($bAscending ? '0' : '1')."]";
+ } elseif ($sColCode == 'friendlyname' && $bViewLink) {
$aDefaultSort[] = "[".($iColOffset).",".($bAscending ? '0' : '1')."]";
}
}
$sFakeSortList = '';
- if (count($aDefaultSort) > 0)
- {
+ if (count($aDefaultSort) > 0) {
$sFakeSortList = '['.implode(',', $aDefaultSort).']';
}
$sOQL = addslashes($this->oSet->GetFilter()->serialize());
$oPage->add_ready_script(
-<<sDatatableContainerId} table.listResults');
oTable.tableHover();
oTable
@@ -784,9 +693,8 @@ oTable
class_aliases: $sJSClassAliases $sCssCount
});
JS
- );
- if ($sFakeSortList != '')
- {
+ );
+ if ($sFakeSortList != '') {
$oPage->add_ready_script("oTable.trigger(\"fakesorton\", [$sFakeSortList]);");
}
return $sHtml;
@@ -803,12 +711,9 @@ JS
$iPageIndex = 0;
$sHtml = $this->GetPager($oPage, $iPageSize, $iDefaultPageSize, $iPageIndex);
$oPage->add_ready_script("$('#pager{$this->iListId}').html('".json_encode($sHtml)."');");
- if ($iDefaultPageSize < 1)
- {
+ if ($iDefaultPageSize < 1) {
$oPage->add_ready_script("$('#pager{$this->iListId}').parent().hide()");
- }
- else
- {
+ } else {
$oPage->add_ready_script("$('#pager{$this->iListId}').parent().show()");
}
}
@@ -865,16 +770,15 @@ class PrintableDataTable extends DataTable
public function GetHTMLTable(WebPage $oPage, $aColumns, $sSelectMode, $iPageSize, $bViewLink, $aExtraParams)
{
$iNbPages = ($iPageSize < 1) ? 1 : ceil($this->iNbObjects / $iPageSize);
- if ($iPageSize < 1)
- {
+ if ($iPageSize < 1) {
$iPageSize = -1; // convention: no pagination
}
$aAttribs = $this->GetHTMLTableConfig($aColumns, $sSelectMode, $bViewLink);
-
+
$aValues = $this->GetHTMLTableValues($aColumns, $sSelectMode, $iPageSize, $bViewLink, $aExtraParams);
-
+
$sHtml = $oPage->GetTable($aAttribs, $aValues);
-
+
return $sHtml;
}
}
diff --git a/application/displayblock.class.inc.php b/application/displayblock.class.inc.php
index 0c0e5d0c5..01d3872c0 100644
--- a/application/displayblock.class.inc.php
+++ b/application/displayblock.class.inc.php
@@ -1,4 +1,5 @@
avoid duplicate conditions
@@ -137,20 +138,18 @@ class DisplayBlock
*
* @throws \ApplicationException
*/
- public function __construct(DBSearch $oFilter, $sStyle = self::ENUM_STYLE_LIST, $bAsynchronous = false, $aParams = array(), $oSet = null)
+ public function __construct(DBSearch $oFilter, $sStyle = self::ENUM_STYLE_LIST, $bAsynchronous = false, $aParams = [], $oSet = null)
{
$this->m_oFilter = $oFilter->DeepClone();
- $this->m_aConditions = array();
+ $this->m_aConditions = [];
$this->m_sStyle = $sStyle;
$this->m_bAsynchronous = $bAsynchronous;
$this->m_aParams = $aParams;
$this->m_oSet = $oSet;
- if (array_key_exists('show_obsolete_data', $aParams))
- {
+ if (array_key_exists('show_obsolete_data', $aParams)) {
$this->m_bShowObsoleteData = $aParams['show_obsolete_data'];
}
- if ($this->m_bShowObsoleteData === null)
- {
+ if ($this->m_bShowObsoleteData === null) {
// User defined
$this->m_bShowObsoleteData = utils::ShowObsoleteData();
}
@@ -410,22 +409,18 @@ class DisplayBlock
* @throws \CoreException
* @throws \Exception
*/
- public static function FromObjectSet(DBObjectSet $oSet, $sStyle, $aParams = array())
+ public static function FromObjectSet(DBObjectSet $oSet, $sStyle, $aParams = [])
{
$oDummyFilter = new DBObjectSearch($oSet->GetClass());
- $aKeys = array();
- $oSet->OptimizeColumnLoad(array($oSet->GetClassAlias() => array())); // No need to load all the columns just to get the id
- while($oObject = $oSet->Fetch())
- {
- $aKeys[] = $oObject->GetKey();
+ $aKeys = [];
+ $oSet->OptimizeColumnLoad([$oSet->GetClassAlias() => []]); // No need to load all the columns just to get the id
+ while ($oObject = $oSet->Fetch()) {
+ $aKeys[] = $oObject->GetKey();
}
$oSet->Rewind();
- if (count($aKeys) > 0)
- {
+ if (count($aKeys) > 0) {
$oDummyFilter->AddCondition('id', $aKeys, 'IN');
- }
- else
- {
+ } else {
$oDummyFilter->AddCondition('id', 0, '=');
}
$oBlock = new DisplayBlock($oDummyFilter, $sStyle, false, $aParams); // DisplayBlocks built this way are synchronous
@@ -446,7 +441,7 @@ class DisplayBlock
$iStartPos = stripos($sTemplate, '<'.self::TAG_BLOCK.' ', 0);
$iEndPos = stripos($sTemplate, '', $iStartPos);
$iEndTag = stripos($sTemplate, '>', $iStartPos);
- $aParams = array();
+ $aParams = [];
if (($iStartPos === false) || ($iEndPos === false)) {
return null;
@@ -454,7 +449,7 @@ class DisplayBlock
$sITopData = substr($sTemplate, 1 + $iEndTag, $iEndPos - $iEndTag - 1);
$sITopTag = substr($sTemplate, $iStartPos + strlen('<'.self::TAG_BLOCK), $iEndTag - $iStartPos - strlen('<'.self::TAG_BLOCK));
- $aMatches = array();
+ $aMatches = [];
$sBlockClass = "DisplayBlock";
$bAsynchronous = false;
$sBlockType = 'list';
@@ -520,25 +515,28 @@ class DisplayBlock
return new $sBlockClass($oFilter, $sBlockType, $bAsynchronous, $aParams);
}
- public function DisplayIntoContentBlock(UIContentBlock $oContentBlock, WebPage $oPage, $sId, $aExtraParams = array())
+ public function DisplayIntoContentBlock(UIContentBlock $oContentBlock, WebPage $oPage, $sId, $aExtraParams = [])
{
$oContentBlock->AddSubBlock($this->GetDisplay($oPage, $sId, $aExtraParams));
}
- public function Display(WebPage $oPage, $sId, $aExtraParams = array())
+ public function Display(WebPage $oPage, $sId, $aExtraParams = [])
{
$oPage->AddUiBlock($this->GetDisplay($oPage, $sId, $aExtraParams));
}
- public function GetDisplay(WebPage $oPage, $sId, $aExtraParams = array()): UIContentBlock
+ public function GetDisplay(WebPage $oPage, $sId, $aExtraParams = []): UIContentBlock
{
$oHtml = new UIContentBlock($sId);
$oHtml->AddCSSClass("display_block");
$aExtraParams = array_merge($aExtraParams, $this->m_aParams);
$aExtraParams['currentId'] = $sId;
- $sExtraParams = addslashes(str_replace('"', "'",
- json_encode($aExtraParams))); // JSON encode, change the style of the quotes and escape them
+ $sExtraParams = addslashes(str_replace(
+ '"',
+ "'",
+ json_encode($aExtraParams)
+ )); // JSON encode, change the style of the quotes and escape them
if (isset($aExtraParams['query_params'])) {
$aQueryParams = $aExtraParams['query_params'];
@@ -547,9 +545,9 @@ class DisplayBlock
$sClass = $aExtraParams['this->class'];
$iKey = $aExtraParams['this->id'];
$oObj = MetaModel::GetObject($sClass, $iKey);
- $aQueryParams = array('this->object()' => $oObj);
+ $aQueryParams = ['this->object()' => $oObj];
} else {
- $aQueryParams = array();
+ $aQueryParams = [];
}
}
@@ -585,8 +583,7 @@ class DisplayBlock
');
}
- if ($this->m_sStyle == static::ENUM_STYLE_LIST) // Search form need to extract result list extra data, the simplest way is to expose this configuration
- {
+ if ($this->m_sStyle == static::ENUM_STYLE_LIST) { // Search form need to extract result list extra data, the simplest way is to expose this configuration
$listJsonExtraParams = json_encode(json_encode($aExtraParams));
$oPage->add_ready_script("
$('#$sId').data('sExtraParams', ".$listJsonExtraParams.");
@@ -606,7 +603,7 @@ class DisplayBlock
* @throws \DictExceptionMissingString
* @throws \MySQLException
*/
- public function RenderContent(WebPage $oPage, $aExtraParams = array())
+ public function RenderContent(WebPage $oPage, $aExtraParams = [])
{
if (!isset($aExtraParams['currentId'])) {
$sId = utils::GetUniqueId(); // Works only if the page is not an Ajax one !
@@ -638,7 +635,7 @@ class DisplayBlock
$this->CheckParams($this->m_sStyle, $aExtraParams);
// Add the extra params into the filter if they make sense for such a filter
$bDoSearch = utils::ReadParam('dosearch', false);
- $aQueryParams = array();
+ $aQueryParams = [];
if (isset($aExtraParams['query_params'])) {
$aQueryParams = $aExtraParams['query_params'];
} else {
@@ -646,7 +643,7 @@ class DisplayBlock
$sClass = $aExtraParams['this->class'];
$iKey = $aExtraParams['this->id'];
$oObj = MetaModel::GetObject($sClass, $iKey);
- $aQueryParams = array('this->object()' => $oObj);
+ $aQueryParams = ['this->object()' => $oObj];
}
}
if ($this->m_oSet == null) {
@@ -656,7 +653,7 @@ class DisplayBlock
$oAppContext = new ApplicationContext();
$sClass = $this->m_oFilter->GetClass();
$aFilterCodes = MetaModel::GetFiltersList($sClass);
- $aCallSpec = array($sClass, 'MapContextParam');
+ $aCallSpec = [$sClass, 'MapContextParam'];
if (is_callable($aCallSpec)) {
foreach ($oAppContext->GetNames() as $sContextParam) {
$sParamCode = call_user_func($aCallSpec, $sContextParam); //Map context parameter to the value/filter code depending on the class
@@ -691,11 +688,9 @@ class DisplayBlock
}
}
- if (!is_null($condition))
- {
+ if (!is_null($condition)) {
$sOpCode = null; // default operator
- if (is_array($condition))
- {
+ if (is_array($condition)) {
// Multiple values, add them as AND X IN (v1, v2, v3...)
$sOpCode = 'IN';
}
@@ -703,26 +698,22 @@ class DisplayBlock
$this->AddCondition($sFilterCode, $condition, $sOpCode, $bParseSearchString);
}
}
- if ($bDoSearch)
- {
+ if ($bDoSearch) {
// Keep the table_id identifying this table if we're performing a search
$sTableId = utils::ReadParam('_table_id_', null, false, utils::ENUM_SANITIZATION_FILTER_ELEMENT_IDENTIFIER);
- if ($sTableId != null)
- {
+ if ($sTableId != null) {
$aExtraParams['table_id'] = $sTableId;
}
}
}
- $aOrderBy = array();
- if (isset($aExtraParams['order_by']))
- {
+ $aOrderBy = [];
+ if (isset($aExtraParams['order_by'])) {
// Convert the string describing the order_by parameter into an array
// The syntax is +attCode1,-attCode2
// attCode1 => ascending, attCode2 => descending
$aTemp = explode(',', $aExtraParams['order_by']);
- foreach($aTemp as $sTemp)
- {
- $aMatches = array();
+ foreach ($aTemp as $sTemp) {
+ $aMatches = [];
if (preg_match('/^([+-])?(.+)$/', $sTemp, $aMatches)) {
$bAscending = true;
if ($aMatches[1] == '-') {
@@ -738,7 +729,7 @@ class DisplayBlock
}
$this->m_oSet->SetShowObsoleteData($this->m_bShowObsoleteData);
- switch($this->m_sStyle) {
+ switch ($this->m_sStyle) {
case static::ENUM_STYLE_LIST_SEARCH:
case static::ENUM_STYLE_LIST:
break;
@@ -768,7 +759,7 @@ class DisplayBlock
case static::ENUM_STYLE_LIST:
case static::ENUM_STYLE_LIST_IN_OBJECT:
$oBlock = $this->RenderList($aExtraParams, $oPage);
- break;
+ break;
case 'links':
$oBlock = $this->RenderLinks($oPage, $aExtraParams);
@@ -793,53 +784,45 @@ class DisplayBlock
case static::ENUM_STYLE_CHART:
$oBlock = $this->RenderChart($sId, $aQueryParams, $aExtraParams);
break;
-
+
case static::ENUM_STYLE_CHART_AJAX:
$oBlock = $this->RenderChartAjax($aExtraParams);
break;
-
+
default:
- // Unsupported style, do nothing.
- $sHtml .= Dict::format('UI:Error:UnsupportedStyleOfBlock', $this->m_sStyle);
+ // Unsupported style, do nothing.
+ $sHtml .= Dict::format('UI:Error:UnsupportedStyleOfBlock', $this->m_sStyle);
}
-
$bAutoReload = false;
- if (isset($aExtraParams['auto_reload']))
- {
- if ($aExtraParams['auto_reload'] === true)
- {
+ if (isset($aExtraParams['auto_reload'])) {
+ if ($aExtraParams['auto_reload'] === true) {
// Note: does not work in the switch (case true) because a positive number evaluates to true!!!
$aExtraParams['auto_reload'] = 'standard';
}
- switch($aExtraParams['auto_reload'])
- {
+ switch ($aExtraParams['auto_reload']) {
case 'fast':
$bAutoReload = true;
- $iReloadInterval = MetaModel::GetConfig()->GetFastReloadInterval()*1000;
+ $iReloadInterval = MetaModel::GetConfig()->GetFastReloadInterval() * 1000;
break;
case 'standard':
case 'true':
$bAutoReload = true;
- $iReloadInterval = MetaModel::GetConfig()->GetStandardReloadInterval()*1000;
+ $iReloadInterval = MetaModel::GetConfig()->GetStandardReloadInterval() * 1000;
break;
default:
- if (is_numeric($aExtraParams['auto_reload']) && ($aExtraParams['auto_reload'] > 0))
- {
+ if (is_numeric($aExtraParams['auto_reload']) && ($aExtraParams['auto_reload'] > 0)) {
$bAutoReload = true;
- $iReloadInterval = max(MetaModel::GetConfig()->Get('min_reload_interval'), $aExtraParams['auto_reload'])*1000;
- }
- else
- {
+ $iReloadInterval = max(MetaModel::GetConfig()->Get('min_reload_interval'), $aExtraParams['auto_reload']) * 1000;
+ } else {
// incorrect config, ignore it
$bAutoReload = false;
}
}
}
- if (($bAutoReload) && ($this->m_sStyle != static::ENUM_STYLE_SEARCH)) // Search form do NOT auto-reload
- {
+ if (($bAutoReload) && ($this->m_sStyle != static::ENUM_STYLE_SEARCH)) { // Search form do NOT auto-reload
// Used either for asynchronous or auto_reload
// does a json_encode twice to get a string usable as function parameter
$sFilterBefore = $this->m_oFilter->serialize();
@@ -886,8 +869,7 @@ JS
{
// Workaround to an issue revealed whenever a condition on org_id is applied twice (with a hierarchy of organizations)
// Moreover, it keeps the query as simple as possible
- if (isset($this->m_aConditions[$sFilterCode]) && $condition == $this->m_aConditions[$sFilterCode])
- {
+ if (isset($this->m_aConditions[$sFilterCode]) && $condition == $this->m_aConditions[$sFilterCode]) {
// Skip
return;
}
@@ -895,59 +877,48 @@ JS
$sClass = $this->m_oFilter->GetClass();
$bConditionAdded = false;
-
+
// If the condition is an external key with a class having a hierarchy, use a "below" criteria
- if (MetaModel::IsValidAttCode($sClass, $sFilterCode))
- {
+ if (MetaModel::IsValidAttCode($sClass, $sFilterCode)) {
$oAttDef = MetaModel::GetAttributeDef($sClass, $sFilterCode);
- if ($oAttDef->IsExternalKey())
- {
+ if ($oAttDef->IsExternalKey()) {
$sHierarchicalKeyCode = MetaModel::IsHierarchicalClass($oAttDef->GetTargetClass());
-
- if ($sHierarchicalKeyCode !== false)
- {
+
+ if ($sHierarchicalKeyCode !== false) {
$oFilter = new DBObjectSearch($oAttDef->GetTargetClass());
- if (($sOpCode == 'IN') && is_array($condition))
- {
- $oFilter->AddConditionExpression(self::GetConditionIN($oFilter, 'id', $condition));
- }
- else
- {
+ if (($sOpCode == 'IN') && is_array($condition)) {
+ $oFilter->AddConditionExpression(self::GetConditionIN($oFilter, 'id', $condition));
+ } else {
$oFilter->AddCondition('id', $condition);
}
$oHKFilter = new DBObjectSearch($oAttDef->GetTargetClass());
$oHKFilter->AddCondition_PointingTo($oFilter, $sHierarchicalKeyCode, TREE_OPERATOR_BELOW); // Use the 'below' operator by default
$this->m_oFilter->AddCondition_PointingTo($oHKFilter, $sFilterCode);
$bConditionAdded = true;
- }
- else if (($sOpCode == 'IN') && is_array($condition))
- {
+ } elseif (($sOpCode == 'IN') && is_array($condition)) {
$this->m_oFilter->AddConditionExpression(self::GetConditionIN($this->m_oFilter, $sFilterCode, $condition));
$bConditionAdded = true;
}
- }
- else if (($sOpCode == 'IN') && is_array($condition))
- {
+ } elseif (($sOpCode == 'IN') && is_array($condition)) {
$this->m_oFilter->AddConditionExpression(self::GetConditionIN($this->m_oFilter, $sFilterCode, $condition));
$bConditionAdded = true;
}
}
-
+
// In all other cases, just add the condition directly
- if (!$bConditionAdded)
- {
+ if (!$bConditionAdded) {
$this->m_oFilter->AddCondition($sFilterCode, $condition, null); // Use the default 'loose' operator
}
}
-
- static protected function GetConditionIN($oFilter, $sFilterCode, $condition)
+
+ protected static function GetConditionIN($oFilter, $sFilterCode, $condition)
{
- $oField = new FieldExpression($sFilterCode, $oFilter->GetClassAlias());
+ $oField = new FieldExpression($sFilterCode, $oFilter->GetClassAlias());
$sListExpr = '('.implode(', ', CMDBSource::Quote($condition)).')';
$sOQLCondition = $oField->RenderExpression()." IN $sListExpr";
$oNewCondition = Expression::FromOQL($sOQLCondition);
- return $oNewCondition;
+ return $oNewCondition;
}
/**
@@ -974,13 +945,10 @@ JS
protected function MakeGroupByQuery(&$aExtraParams, &$oGroupByExp, &$sGroupByLabel, &$aGroupBy, &$sAggregationFunction, &$sFctVar, &$sAggregationAttr, &$sSql)
{
$sAlias = $this->m_oFilter->GetClassAlias();
- if (isset($aExtraParams['group_by_label']))
- {
+ if (isset($aExtraParams['group_by_label'])) {
$oGroupByExp = Expression::FromOQL($aExtraParams['group_by']);
$sGroupByLabel = $aExtraParams['group_by_label'];
- }
- else
- {
+ } else {
// Backward compatibility: group_by is simply a field id
$oGroupByExp = new FieldExpression($aExtraParams['group_by'], $sAlias);
$sGroupByLabel = MetaModel::GetLabel($this->m_oFilter->GetClass(), $aExtraParams['group_by']);
@@ -988,61 +956,52 @@ JS
// Security filtering
$aFields = $oGroupByExp->ListRequiredFields();
- foreach($aFields as $sFieldAlias)
- {
- $aMatches = array();
- if (preg_match('/^([^.]+)\\.([^.]+)$/', $sFieldAlias, $aMatches))
- {
+ foreach ($aFields as $sFieldAlias) {
+ $aMatches = [];
+ if (preg_match('/^([^.]+)\\.([^.]+)$/', $sFieldAlias, $aMatches)) {
$sFieldClass = $this->m_oFilter->GetClassName($aMatches[1]);
$oAttDef = MetaModel::GetAttributeDef($sFieldClass, $aMatches[2]);
- if ($oAttDef instanceof AttributeOneWayPassword)
- {
+ if ($oAttDef instanceof AttributeOneWayPassword) {
throw new Exception('Grouping on password fields is not supported.');
}
}
}
- $aGroupBy = array();
+ $aGroupBy = [];
$aGroupBy['grouped_by_1'] = $oGroupByExp;
- $aQueryParams = array();
- if (isset($aExtraParams['query_params']))
- {
+ $aQueryParams = [];
+ if (isset($aExtraParams['query_params'])) {
$aQueryParams = $aExtraParams['query_params'];
}
- $aFunctions = array();
+ $aFunctions = [];
$sAggregationFunction = 'count';
$sFctVar = '_itop_count_';
$sAggregationAttr = '';
- if (isset($aExtraParams['aggregation_function']) && !empty($aExtraParams['aggregation_attribute']))
- {
+ if (isset($aExtraParams['aggregation_function']) && !empty($aExtraParams['aggregation_attribute'])) {
$sAggregationFunction = $aExtraParams['aggregation_function'];
$sAggregationAttr = $aExtraParams['aggregation_attribute'];
$oAttrExpr = Expression::FromOQL('`'.$sAlias.'`.`'.$sAggregationAttr.'`');
- $oFctExpr = new FunctionExpression(strtoupper($sAggregationFunction), array($oAttrExpr));
+ $oFctExpr = new FunctionExpression(strtoupper($sAggregationFunction), [$oAttrExpr]);
$sFctVar = '_itop_'.$sAggregationFunction.'_';
- $aFunctions = array($sFctVar => $oFctExpr);
+ $aFunctions = [$sFctVar => $oFctExpr];
}
- if (!empty($sAggregationAttr))
- {
+ if (!empty($sAggregationAttr)) {
$sClass = $this->m_oFilter->GetClass();
$sAggregationAttr = MetaModel::GetLabel($sClass, $sAggregationAttr);
}
$iLimit = 0;
- if (isset($aExtraParams['limit']))
- {
+ if (isset($aExtraParams['limit'])) {
$iLimit = intval($aExtraParams['limit']);
}
- $aOrderBy = array();
- if (isset($aExtraParams['order_direction']) && isset($aExtraParams['order_by']))
- {
- switch ($aExtraParams['order_by'])
- {
+ $aOrderBy = [];
+ if (isset($aExtraParams['order_direction']) && isset($aExtraParams['order_by'])) {
+ switch ($aExtraParams['order_by']) {
case 'attribute':
- $aOrderBy = array('grouped_by_1' => ($aExtraParams['order_direction'] === 'asc'));
+ $aOrderBy = ['grouped_by_1' => ($aExtraParams['order_direction'] === 'asc')];
break;
case 'function':
- $aOrderBy = array($sFctVar => ($aExtraParams['order_direction'] === 'asc'));
+ $aOrderBy = [$sFctVar => ($aExtraParams['order_direction'] === 'asc')];
break;
}
}
@@ -1078,31 +1037,31 @@ JS
$this->AddCondition($sFilterCode, $sContextParamValue);
}
}
- $aQueryParams = array();
+ $aQueryParams = [];
if (isset($aExtraParams['query_params'])) {
$aQueryParams = $aExtraParams['query_params'];
}
- $this->m_oSet = new CMDBObjectSet($this->m_oFilter, array(), $aQueryParams);
+ $this->m_oSet = new CMDBObjectSet($this->m_oFilter, [], $aQueryParams);
$this->m_oSet->SetShowObsoleteData($this->m_bShowObsoleteData);
}
// Summary details
- $aCounts = array();
- $aStateLabels = array();
+ $aCounts = [];
+ $aStateLabels = [];
if (!empty($sStateAttrCode) && !empty($sStatesList)) {
$aStates = explode(',', $sStatesList);
// Generate one count + group by query [#1330]
$sClassAlias = $this->m_oFilter->GetClassAlias();
$oGroupByExpr = Expression::FromOQL($sClassAlias.'.'.$sStateAttrCode);
- $aGroupBy = array('group1' => $oGroupByExpr);
+ $aGroupBy = ['group1' => $oGroupByExpr];
$oGroupBySearch = $this->m_oFilter->DeepClone();
if (isset($this->m_bShowObsoleteData)) {
$oGroupBySearch->SetShowObsoleteData($this->m_bShowObsoleteData);
}
$sCountGroupByQuery = $oGroupBySearch->MakeGroupByQuery($aQueryParams, $aGroupBy, false);
$aCountGroupByResults = CMDBSource::QueryToArray($sCountGroupByQuery);
- $aCountsQueryResults = array();
+ $aCountsQueryResults = [];
foreach ($aCountGroupByResults as $aCountGroupBySingleResult) {
$aCountsQueryResults[$aCountGroupBySingleResult[0]] = $aCountGroupBySingleResult[1];
}
@@ -1116,7 +1075,8 @@ JS
: 0;
if ($aCounts[$sStateValue] == 0) {
- $aCounts[$sStateValue] = ['link' => '-', 'label' => $aCounts[$sStateValue]];;
+ $aCounts[$sStateValue] = ['link' => '-', 'label' => $aCounts[$sStateValue]];
+ ;
} else {
$oSingleGroupByValueFilter = $this->m_oFilter->DeepClone();
$oSingleGroupByValueFilter->AddCondition($sStateAttrCode, $sStateValue, '=');
@@ -1166,7 +1126,7 @@ JS
$oBlock->AddSubBlock($oPill);
}
$aExtraParams['query_params'] = $this->m_oFilter->GetInternalParams();
- if(isset($aExtraParams['query_params']['this->object()'])){
+ if (isset($aExtraParams['query_params']['this->object()'])) {
$aExtraParams['query_params']['this->class'] = get_class($aExtraParams['query_params']['this->object()']);
$aExtraParams['query_params']['this->id'] = $aExtraParams['query_params']['this->object()']->GetKey();
unset($aExtraParams['query_params']['this->object()']);
@@ -1180,7 +1140,8 @@ JS
$('#".$oBlock->GetId()."').html(data);
$('#".$oBlock->GetId()."').unblock();
});
- $('#".$oBlock->GetId()."').unblock();");
+ $('#".$oBlock->GetId()."').unblock();"
+ );
return $oBlock;
}
@@ -1190,7 +1151,7 @@ JS
*
* @return string[]
*/
- protected function GetAllowedActionsParams(array $aExtraParams)
+ protected function GetAllowedActionsParams(array $aExtraParams)
{
return [
'context_filter', /** int if != 0 filter with user context */
@@ -1222,11 +1183,11 @@ JS
$this->AddCondition($sFilterCode, $sContextParamValue);
}
}
- $aQueryParams = array();
+ $aQueryParams = [];
if (isset($aExtraParams['query_params'])) {
$aQueryParams = $aExtraParams['query_params'];
}
- $this->m_oSet = new CMDBObjectSet($this->m_oFilter, array(), $aQueryParams);
+ $this->m_oSet = new CMDBObjectSet($this->m_oFilter, [], $aQueryParams);
$this->m_oSet->SetShowObsoleteData($this->m_bShowObsoleteData);
}
$iCount = $this->m_oSet->Count();
@@ -1243,8 +1204,15 @@ JS
if (UserRights::IsActionAllowed($sClass, UR_ACTION_MODIFY)) {
$sCreateActionUrl = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=new&class='.$sClass.$oAppContext->GetForLink(true);
$sCreateActionLabel = Dict::Format('UI:Button:Create');
- $oBlock = DashletFactory::MakeForDashletBadge($sClassIconUrl, $sHyperlink, $iCount, $sClassLabel, $sCreateActionUrl,
- $sCreateActionLabel, $aRefreshParams);
+ $oBlock = DashletFactory::MakeForDashletBadge(
+ $sClassIconUrl,
+ $sHyperlink,
+ $iCount,
+ $sClassLabel,
+ $sCreateActionUrl,
+ $sCreateActionLabel,
+ $aRefreshParams
+ );
} else {
$oBlock = DashletFactory::MakeForDashletBadge($sClassIconUrl, $sHyperlink, $iCount, $sClassLabel, null, null, $aRefreshParams);
}
@@ -1274,9 +1242,9 @@ JS
$aRes = CMDBSource::QueryToArray($sSql);
- $aGroupBy = array();
- $aLabels = array();
- $aValues = array();
+ $aGroupBy = [];
+ $aLabels = [];
+ $aValues = [];
$iTotalCount = 0;
foreach ($aRes as $iRow => $aRow) {
$sValue = $aRow['grouped_by_1'];
@@ -1287,7 +1255,7 @@ JS
$iTotalCount += $aRow['_itop_count_'];
}
- $aData = array();
+ $aData = [];
$oAppContext = new ApplicationContext();
$sParams = $oAppContext->GetForLink(true);
foreach ($aGroupBy as $iRow => $iCount) {
@@ -1298,22 +1266,22 @@ JS
if (isset($aExtraParams['query_params'])) {
$aQueryParams = $aExtraParams['query_params'];
} else {
- $aQueryParams = array();
+ $aQueryParams = [];
}
$sFilter = rawurlencode($oSubsetSearch->serialize(false, $aQueryParams));
- $aData[] = array(
+ $aData[] = [
'group' => $aLabels[$iRow],
- 'value' => "$iCount "
- ); // TO DO: add the context information
+ 'value' => "$iCount ",
+ ]; // TO DO: add the context information
}
- $aAttribs = array(
- 'group' => array('label' => $sGroupByLabel, 'description' => ''),
- 'value' => array(
+ $aAttribs = [
+ 'group' => ['label' => $sGroupByLabel, 'description' => ''],
+ 'value' => [
'label' => Dict::S('UI:GroupBy:'.$sAggregationFunction),
'description' => Dict::Format('UI:GroupBy:'.$sAggregationFunction.'+', $sAggregationAttr),
- ),
- );
+ ],
+ ];
$sFormat = isset($aExtraParams['format']) ? $aExtraParams['format'] : 'UI:Pagination:HeaderNoSelection';
$aExtraParams['query_params'] = $this->m_oFilter->GetInternalParams();
@@ -1324,7 +1292,7 @@ JS
$oBlock = PanelUIBlockFactory::MakeForClass($aExtraParams["panel_class"], $aExtraParams["panel_title"]);
$oBlock->AddSubTitleBlock(new Html($sTitle));
$oBlock->AddCSSClass('ibo-datatable-panel');
- if(isset($aExtraParams["panel_icon"]) && strlen($aExtraParams["panel_icon"]) > 0){
+ if (isset($aExtraParams["panel_icon"]) && strlen($aExtraParams["panel_icon"]) > 0) {
$oBlock->SetIcon($aExtraParams["panel_icon"]);
}
$oDataTable = DataTableUIBlockFactory::MakeForStaticData("", $aAttribs, $aData, null, $aExtraParams, $this->m_oFilter->ToOQL(), $aOption);
@@ -1343,7 +1311,7 @@ JS
}
if (isset($aExtraParams["surround_with_panel"]) && $aExtraParams["surround_with_panel"]) {
$oBlock = PanelUIBlockFactory::MakeForClass($aExtraParams["panel_class"], $aExtraParams["panel_title"]);
- if(isset($aExtraParams["panel_icon"]) && strlen($aExtraParams["panel_icon"]) > 0){
+ if (isset($aExtraParams["panel_icon"]) && strlen($aExtraParams["panel_icon"]) > 0) {
$oBlock->SetIcon($aExtraParams["panel_icon"]);
}
$oBlock->AddSubBlock(new Html(''.Dict::Format($sFormat, $iCount).'
'));
@@ -1353,7 +1321,7 @@ JS
}
return $oBlock;
-}
+ }
/**
* @param WebPage $oPage
@@ -1411,7 +1379,6 @@ JS
$oBlock->aExtraParams = $aExtraParams;
$oBlock->sFilter = $this->m_oFilter->ToOQL();
-
// Check the classes that can be read (i.e authorized) by this user...
foreach ($aClasses as $sAlias => $sClassName) {
if (UserRights::IsActionAllowed($sClassName, UR_ACTION_READ, $this->m_oSet) != UR_ALLOWED_NO) {
@@ -1433,7 +1400,7 @@ JS
$sSearchFilter = $this->m_oSet->GetFilter()->serialize();
// Limit the size of the URL (N°1585 - request uri too long)
if (strlen($sSearchFilter) < SERVER_MAX_URL_LENGTH) {
- $oBlock->sEventAttachedData = json_encode(array(
+ $oBlock->sEventAttachedData = json_encode([
'filter' => $sSearchFilter,
'breadcrumb_id' => "ui-search-".$this->m_oSet->GetClass(),
'breadcrumb_label' => MetaModel::GetName($this->m_oSet->GetClass()),
@@ -1441,7 +1408,7 @@ JS
'breadcrumb_instance_id' => MetaModel::GetConfig()->GetItopInstanceid(),
'breadcrumb_icon' => 'fas fa-search',
'breadcrumb_icon_type' => iTopWebPage::ENUM_BREADCRUMB_ENTRY_ICON_TYPE_CSS_CLASSES,
- ));
+ ]);
}
}
@@ -1474,25 +1441,25 @@ JS
$oContentBlock = new UIContentBlock();
$oHtml = new Html();
$oContentBlock->AddSubBlock($oHtml);
- $aDisplayAliases = isset($aExtraParams['display_aliases']) ? explode(',', $aExtraParams['display_aliases']) : array();
+ $aDisplayAliases = isset($aExtraParams['display_aliases']) ? explode(',', $aExtraParams['display_aliases']) : [];
if (!isset($aExtraParams['group_by'])) {
$oHtml->AddHtml(''.Dict::S('UI:Error:MandatoryTemplateParameter_group_by').'
');
} else {
- $aGroupByFields = array();
+ $aGroupByFields = [];
$aGroupBy = explode(',', $aExtraParams['group_by']);
foreach ($aGroupBy as $sGroupBy) {
- $aMatches = array();
+ $aMatches = [];
if (preg_match('/^(.+)\.(.+)$/', $sGroupBy, $aMatches) > 0) {
- $aGroupByFields[] = array('alias' => $aMatches[1], 'att_code' => $aMatches[2]);
+ $aGroupByFields[] = ['alias' => $aMatches[1], 'att_code' => $aMatches[2]];
}
}
if (count($aGroupByFields) == 0) {
$oHtml->AddHtml(''.Dict::Format('UI:Error:InvalidGroupByFields', $aExtraParams['group_by']).'
');
} else {
- $aResults = array();
- $aCriteria = array();
+ $aResults = [];
+ $aCriteria = [];
while ($aObjects = $this->m_oSet->FetchAssoc()) {
- $aKeys = array();
+ $aKeys = [];
foreach ($aGroupByFields as $aField) {
$sAlias = $aField['alias'];
if (is_null($aObjects[$sAlias])) {
@@ -1509,7 +1476,7 @@ JS
$oHtml->AddHtml("\n");
// Construct a new (parametric) query that will return the content of this block
$oBlockFilter = $this->m_oFilter->DeepClone();
- $aExpressions = array();
+ $aExpressions = [];
$index = 0;
foreach ($aGroupByFields as $aField) {
$aExpressions[] = '`'.$aField['alias'].'`.`'.$aField['att_code'].'` = :param'.$index++;
@@ -1521,7 +1488,7 @@ JS
foreach ($aResults as $sCategory => $aObjects) {
$oHtml->AddHtml("$sCategory ".Dict::Format('UI:ClickToCreateNew',
- Metamodel::GetName($sClass))."
\n");
+ $oBlock->AddHtml("".Dict::Format(
+ 'UI:ClickToCreateNew',
+ Metamodel::GetName($sClass)
+ )."
\n");
}
}
}
@@ -1653,7 +1622,7 @@ JS
if (isset($aExtraParams["surround_with_panel"]) && $aExtraParams["surround_with_panel"]) {
$oPanel = PanelUIBlockFactory::MakeForClass($aExtraParams["panel_class"], $aExtraParams["panel_title"]);
- if(isset($aExtraParams["panel_icon"]) && strlen($aExtraParams["panel_icon"]) > 0){
+ if (isset($aExtraParams["panel_icon"]) && strlen($aExtraParams["panel_icon"]) > 0) {
$oPanel->SetIcon($aExtraParams["panel_icon"]);
}
$oPanel->AddSubBlock($oBlock);
@@ -1677,7 +1646,7 @@ JS
{
$sChartType = isset($aExtraParams['chart_type']) ? $aExtraParams['chart_type'] : 'pie';
$sId = utils::ReadParam('id', '');
- $aValues = array();
+ $aValues = [];
$oBlock = null;
$sJSURLs = '';
@@ -1688,21 +1657,18 @@ JS
$this->MakeGroupByQuery($aExtraParams, $oGroupByExp, $sGroupByLabel, $aGroupBy, $sAggregationFunction, $sFctVar, $sAggregationAttr, $sSql);
$aRes = CMDBSource::QueryToArray($sSql);
-
-
$iTotalCount = 0;
- $aURLs = array();
+ $aURLs = [];
foreach ($aRes as $iRow => $aRow) {
$sValue = $aRow['grouped_by_1'];
$sHtmlValue = $oGroupByExp->MakeValueLabel($this->m_oFilter, $sValue, $sValue);
$iTotalCount += $aRow['_itop_count_'];
- $aValues[] = array(
+ $aValues[] = [
'label' => html_entity_decode(strip_tags($sHtmlValue), ENT_QUOTES, 'UTF-8'),
'label_html' => $sHtmlValue,
'value' => (float)$aRow[$sFctVar],
- );
-
+ ];
// Build the search for this subset
$oSubsetSearch = $this->m_oFilter->DeepClone();
@@ -1741,7 +1707,7 @@ JS
$aColumns = [];
$aNames = [];
foreach ($aValues as $idx => $aValue) {
- $aColumns[] = array('series_'.$idx, (float)$aValue['value']);
+ $aColumns[] = ['series_'.$idx, (float)$aValue['value']];
$aNames['series_'.$idx] = $aValue['label'];
}
@@ -1763,7 +1729,7 @@ JS
}
if (isset($aExtraParams["surround_with_panel"]) && $aExtraParams["surround_with_panel"]) {
$oPanel = PanelUIBlockFactory::MakeForClass($aExtraParams["panel_class"], $aExtraParams["panel_title"]);
- if(isset($aExtraParams["panel_icon"]) && strlen($aExtraParams["panel_icon"]) > 0){
+ if (isset($aExtraParams["panel_icon"]) && strlen($aExtraParams["panel_icon"]) > 0) {
$oPanel->SetIcon($aExtraParams["panel_icon"]);
}
$oPanel->AddSubBlock($oBlock);
@@ -1790,12 +1756,12 @@ JS
$oBlock->sDownloadLink = utils::GetAbsoluteUrlAppRoot().'webservices/export.php?expression='.urlencode($this->m_oFilter->ToOQL(true)).'&format=csv&filename='.urlencode($oBlock->sCsvFile);
$oBlock->sLinkToToggle = utils::GetAbsoluteUrlAppRoot().'pages/UI.php?operation=search'.$oAppContext->GetForLink(true).'&filter='.rawurlencode($this->m_oFilter->serialize()).'&format=csv';
// Pass the parameters via POST, since expression may be very long
- $aParamsToPost = array(
+ $aParamsToPost = [
'expression' => $this->m_oFilter->ToOQL(true),
'format' => 'csv',
'filename' => $oBlock->sCsvFile,
'charset' => 'UTF-8',
- );
+ ];
if ($oBlock->bAdvancedMode) {
$oBlock->sDownloadLink .= '&fields_advanced=1';
$aParamsToPost['fields_advanced'] = 1;
@@ -1854,8 +1820,7 @@ class MenuBlock extends DisplayBlock
$oRouter = Router::GetInstance();
$oRenderBlock = new UIContentBlock();
- if ($this->m_sStyle == 'popup') // popup is a synonym of 'list' for backward compatibility
- {
+ if ($this->m_sStyle == 'popup') { // popup is a synonym of 'list' for backward compatibility
$this->m_sStyle = static::ENUM_STYLE_LIST;
}
@@ -1890,7 +1855,6 @@ class MenuBlock extends DisplayBlock
$oAppContext = new ApplicationContext();
$sContext = $oAppContext->GetForLink(true);
-
$sFilter = $this->GetFilter()->serialize();
$sUIPage = cmdbAbstractObject::ComputeStandardUIPage($sClass);
$sRootUrl = utils::GetAbsoluteUrlAppRoot();
@@ -1948,7 +1912,7 @@ class MenuBlock extends DisplayBlock
$iLimit = MetaModel::GetConfig()->Get('complex_actions_limit');
if (
($iSetCount > 0) && (false === $bLocked) && MetaModel::HasLifecycle($sClass) &&
- ( ($iLimit == 0) || ($iSetCount < $iLimit) )
+ (($iLimit == 0) || ($iSetCount < $iLimit))
) {
$aTransitions = [];
// Processing (optimizations) and endpoints are not exactly the same depending on if there is only 1 object or a set
@@ -1968,8 +1932,8 @@ class MenuBlock extends DisplayBlock
// Life cycle actions may be available... if all objects are in the same state
// Group by
$oGroupByExp = new FieldExpression(MetaModel::GetStateAttributeCode($sClass), $this->m_oFilter->GetClassAlias());
- $aGroupBy = array('__state__' => $oGroupByExp);
- $aQueryParams = array();
+ $aGroupBy = ['__state__' => $oGroupByExp];
+ $aQueryParams = [];
if (isset($aExtraParams['query_params'])) {
$aQueryParams = $aExtraParams['query_params'];
}
@@ -2001,10 +1965,10 @@ class MenuBlock extends DisplayBlock
switch ($iActionAllowed) {
case UR_ALLOWED_YES:
case UR_ALLOWED_DEPENDS:
- $aTransitionActions[$sStimulusCode] = array(
+ $aTransitionActions[$sStimulusCode] = [
'label' => $aStimuli[$sStimulusCode]->GetLabel(),
'url' => "{$sRootUrl}pages/UI.php?stimulus=$sStimulusCode&class=$sLifecycleClass&{$sUrlQueryString}",
- ) + $aActionParams;
+ ] + $aActionParams;
break;
default:
@@ -2066,16 +2030,16 @@ class MenuBlock extends DisplayBlock
// Just one object in the set, possible actions are "new / clone / modify and delete"
if (!isset($aExtraParams['link_attr'])) {
if ($bIsModifyAllowed) {
- $aRegularActions['UI:Menu:Modify'] = array(
+ $aRegularActions['UI:Menu:Modify'] = [
'label' => Dict::S('UI:Menu:Modify'),
- 'url' => $oRouter->GenerateUrl('object.modify', ['class' => $sClass, 'id' => $id]) . "{$sContext}#",
- ) + $aActionParams;
+ 'url' => $oRouter->GenerateUrl('object.modify', ['class' => $sClass, 'id' => $id])."{$sContext}#",
+ ] + $aActionParams;
}
if ($bIsDeleteAllowed) {
- $aRegularActions['UI:Menu:Delete'] = array(
+ $aRegularActions['UI:Menu:Delete'] = [
'label' => Dict::S('UI:Menu:Delete'),
'url' => "{$sRootUrl}pages/$sUIPage?operation=delete&class=$sClass&id=$id{$sContext}",
- ) + $aActionParams;
+ ] + $aActionParams;
}
// Relations...
@@ -2084,16 +2048,16 @@ class MenuBlock extends DisplayBlock
$this->AddMenuSeparator($aRegularActions);
foreach ($aRelations as $sRelationCode => $aRelationInfo) {
if (array_key_exists('down', $aRelationInfo)) {
- $aRegularActions[$sRelationCode.'_down'] = array(
+ $aRegularActions[$sRelationCode.'_down'] = [
'label' => $aRelationInfo['down'],
'url' => "{$sRootUrl}pages/$sUIPage?operation=view_relations&relation=$sRelationCode&direction=down&class=$sClass&id=$id{$sContext}",
- ) + $aActionParams;
+ ] + $aActionParams;
}
if (array_key_exists('up', $aRelationInfo)) {
- $aRegularActions[$sRelationCode.'_up'] = array(
+ $aRegularActions[$sRelationCode.'_up'] = [
'label' => $aRelationInfo['up'],
'url' => "{$sRootUrl}pages/$sUIPage?operation=view_relations&relation=$sRelationCode&direction=up&class=$sClass&id=$id{$sContext}",
- ) + $aActionParams;
+ ] + $aActionParams;
}
}
}
@@ -2105,7 +2069,7 @@ class MenuBlock extends DisplayBlock
$bCanKill = false;
$oUser = UserRights::GetUserObject();
- $aUserProfiles = array();
+ $aUserProfiles = [];
if (!is_null($oUser)) {
$oProfileSet = $oUser->Get('profile_list');
while ($oProfile = $oProfileSet->Fetch()) {
@@ -2127,10 +2091,10 @@ class MenuBlock extends DisplayBlock
if ($bCanKill) {
$this->AddMenuSeparator($aRegularActions);
- $aRegularActions['concurrent_lock_unlock'] = array(
+ $aRegularActions['concurrent_lock_unlock'] = [
'label' => Dict::S('UI:Menu:KillConcurrentLock'),
'url' => "{$sRootUrl}pages/$sUIPage?operation=kill_lock&class=$sClass&id=$id{$sContext}",
- );
+ ];
}
}
}
@@ -2138,7 +2102,7 @@ class MenuBlock extends DisplayBlock
$this->AddMenuSeparator($aRegularActions);
$this->GetEnumAllowedActions($oSet, function ($sLabel, $data) use (&$aRegularActions, $aActionParams) {
- $aRegularActions[$sLabel] = array('label' => $sLabel, 'url' => $data) + $aActionParams;
+ $aRegularActions[$sLabel] = ['label' => $sLabel, 'url' => $data] + $aActionParams;
});
}
break;
@@ -2474,13 +2438,11 @@ class MenuBlock extends DisplayBlock
protected function AddMenuSeparator(&$aActions)
{
$sSeparator = '';
- if (count($aActions) > 0) // Make sure that the separator is not the first item in the menu
- {
+ if (count($aActions) > 0) { // Make sure that the separator is not the first item in the menu
$aKeys = array_keys($aActions);
$sLastKey = array_pop($aKeys);
- if ($aActions[$sLastKey]['label'] != $sSeparator) // Make sure there are no 2 consecutive separators
- {
- $aActions['sep_'.(count($aActions)-1)] = array('label' => $sSeparator, 'url' => '');
+ if ($aActions[$sLastKey]['label'] != $sSeparator) { // Make sure there are no 2 consecutive separators
+ $aActions['sep_'.(count($aActions) - 1)] = ['label' => $sSeparator, 'url' => ''];
}
}
}
@@ -2540,10 +2502,10 @@ class MenuBlock extends DisplayBlock
*/
protected function AddBulkDeleteObjectsMenuAction(array &$aActions, string $sClass, string $sFilter, string $sActionIdentifier = 'UI:Menu:BulkDelete', $sActionLabel = 'UI:Menu:BulkDelete')
{
- $aActions[$sActionIdentifier] = array(
+ $aActions[$sActionIdentifier] = [
'label' => Dict::S($sActionLabel),
'url' => $this->PrepareUrlForStandardMenuAction($sClass, "operation=select_for_deletion&filter=".urlencode($sFilter)),
- ) + $this->GetDefaultParamsForMenuAction();
+ ] + $this->GetDefaultParamsForMenuAction();
}
/**
@@ -2580,6 +2542,6 @@ class MenuBlock extends DisplayBlock
$oAppContext = new ApplicationContext();
$sContext = $oAppContext->GetForLink(true);
- return $sUrl . $sContext;
+ return $sUrl.$sContext;
}
}
diff --git a/application/errorpage.class.inc.php b/application/errorpage.class.inc.php
index 9811de337..ecf84a17b 100644
--- a/application/errorpage.class.inc.php
+++ b/application/errorpage.class.inc.php
@@ -1,8 +1,9 @@
aStatistics = array(
+ $this->aStatistics = [
'objects_count' => 0,
'total_duration' => 0,
'data_retrieval_duration' => 0,
'excel_build_duration' => 0,
'excel_write_duration' => 0,
- 'peak_memory_usage' => 0,
- );
+ 'peak_memory_usage' => 0,
+ ];
$this->fStartTime = microtime(true);
$this->oSearch = null;
-
+
$this->sState = 'new';
- $this->aObjectsIDs = array();
+ $this->aObjectsIDs = [];
$this->iPosition = 0;
$this->aAuthorizedClasses = null;
$this->aTableHeaders = null;
$this->sOutputFilePath = null;
$this->bAdvancedMode = false;
$this->CheckDataDir();
- if ($sToken == null)
- {
+ if ($sToken == null) {
$this->sToken = $this->GetNewToken();
- }
- else
- {
+ } else {
$this->sToken = $sToken;
$this->ReloadState();
}
}
-
+
public function __destruct()
{
- if (($this->sState != 'done') && ($this->sState != 'error') && ($this->sToken != null))
- {
+ if (($this->sState != 'done') && ($this->sState != 'error') && ($this->sToken != null)) {
// Operation in progress, save the state
$this->SaveState();
- }
- else
- {
+ } else {
// Operation completed, cleanup the temp files
@unlink($this->GetStateFile());
@unlink($this->GetDataFile());
}
- self::CleanupOldFiles();
+ self::CleanupOldFiles();
}
-
+
public function SetChunkSize($iChunkSize)
{
- $this->iChunkSize = $iChunkSize;
+ $this->iChunkSize = $iChunkSize;
}
-
+
public function SetOutputFilePath($sDestFilePath)
{
$this->sOutputFilePath = $sDestFilePath;
}
-
+
public function SetAdvancedMode($bAdvanced)
{
$this->bAdvancedMode = $bAdvanced;
}
-
+
public function SaveState()
{
- $aState = array(
+ $aState = [
'state' => $this->sState,
'statistics' => $this->aStatistics,
'filter' => $this->oSearch->serialize(),
@@ -94,31 +88,28 @@ class ExcelExporter
'object_ids' => $this->aObjectsIDs,
'output_file_path' => $this->sOutputFilePath,
'advanced_mode' => $this->bAdvancedMode,
- );
-
+ ];
+
file_put_contents($this->GetStateFile(), json_encode($aState));
-
+
return $this->sToken;
}
-
+
public function ReloadState()
{
- if ($this->sToken == null)
- {
+ if ($this->sToken == null) {
throw new Exception('ExcelExporter not initialized with a token, cannot reload state');
}
-
- if (!file_exists($this->GetStateFile()))
- {
+
+ if (!file_exists($this->GetStateFile())) {
throw new Exception("ExcelExporter: missing status file '".$this->GetStateFile()."', cannot reload state.");
}
$sJson = file_get_contents($this->GetStateFile());
$aState = json_decode($sJson, true);
- if ($aState === null)
- {
+ if ($aState === null) {
throw new Exception("ExcelExporter:corrupted status file '".$this->GetStateFile()."', not a JSON, cannot reload state.");
}
-
+
$this->sState = $aState['state'];
$this->aStatistics = $aState['statistics'];
$this->oSearch = DBObjectSearch::unserialize($aState['filter']);
@@ -128,206 +119,183 @@ class ExcelExporter
$this->sOutputFilePath = $aState['output_file_path'];
$this->bAdvancedMode = $aState['advanced_mode'];
}
-
+
public function SetObjectList($oSearch)
{
$this->oSearch = $oSearch;
}
-
+
public function Run()
{
$sCode = 'error';
$iPercentage = 100;
$sMessage = Dict::Format('ExcelExporter:ErrorUnexpected_State', $this->sState);
$fTime = microtime(true);
-
- try
- {
- switch($this->sState)
- {
+
+ try {
+ switch ($this->sState) {
case 'new':
- $oIDSet = new DBObjectSet($this->oSearch);
- $oIDSet->OptimizeColumnLoad(array('id'));
- $this->aObjectsIDs = array();
- while($oObj = $oIDSet->Fetch())
- {
- $this->aObjectsIDs[] = $oObj->GetKey();
- }
- $sCode = 'retrieving-data';
- $iPercentage = 5;
- $sMessage = Dict::S('ExcelExporter:RetrievingData');
- $this->iPosition = 0;
- $this->aStatistics['objects_count'] = count($this->aObjectsIDs);
- $this->aStatistics['data_retrieval_duration'] += microtime(true) - $fTime;
-
- // The first line of the file is the "headers" specifying the label and the type of each column
- $this->GetFieldsList($oIDSet, $this->bAdvancedMode);
- $sRow = json_encode($this->aTableHeaders);
- $hFile = @fopen($this->GetDataFile(), 'ab');
- if ($hFile === false)
- {
- throw new Exception('ExcelExporter: Failed to open temporary data file: "'.$this->GetDataFile().'" for writing.');
- }
- fwrite($hFile, $sRow."\n");
- fclose($hFile);
-
- // Next state
- $this->sState = 'retrieving-data';
- break;
-
- case 'retrieving-data':
- $oCurrentSearch = clone $this->oSearch;
- $aIDs = array_slice($this->aObjectsIDs, $this->iPosition, $this->iChunkSize);
-
- $oCurrentSearch->AddCondition('id', $aIDs, 'IN');
- $hFile = @fopen($this->GetDataFile(), 'ab');
- if ($hFile === false)
- {
- throw new Exception('ExcelExporter: Failed to open temporary data file: "'.$this->GetDataFile().'" for writing.');
- }
- $oSet = new DBObjectSet($oCurrentSearch);
- $this->GetFieldsList($oSet, $this->bAdvancedMode);
- while($aObjects = $oSet->FetchAssoc())
- {
- $aRow = array();
- foreach($this->aAuthorizedClasses as $sAlias => $sClassName)
- {
- $oObj = $aObjects[$sAlias];
- if ($this->bAdvancedMode)
- {
- $aRow[] = $oObj->GetKey();
- }
- foreach($this->aFieldsList[$sAlias] as $sAttCodeEx => $oAttDef)
- {
- $value = $oObj->Get($sAttCodeEx);
- if ($value instanceOf ormCaseLog)
- {
- // Extract the case log as text and remove the "===" which make Excel think that the cell contains a formula the next time you edit it!
- $sExcelVal = trim(preg_replace('/========== ([^=]+) ============/', '********** $1 ************', $value->GetText()));
- }
- else
- {
- $sExcelVal = $oAttDef->GetEditValue($value, $oObj);
- }
- $aRow[] = $sExcelVal;
- }
+ $oIDSet = new DBObjectSet($this->oSearch);
+ $oIDSet->OptimizeColumnLoad(['id']);
+ $this->aObjectsIDs = [];
+ while ($oObj = $oIDSet->Fetch()) {
+ $this->aObjectsIDs[] = $oObj->GetKey();
}
- $sRow = json_encode($aRow);
- fwrite($hFile, $sRow."\n");
- }
- fclose($hFile);
-
- if (($this->iPosition + $this->iChunkSize) > count($this->aObjectsIDs))
- {
- // Next state
- $this->sState = 'building-excel';
- $sCode = 'building-excel';
- $iPercentage = 80;
- $sMessage = Dict::S('ExcelExporter:BuildingExcelFile');
- }
- else
- {
$sCode = 'retrieving-data';
- $this->iPosition += $this->iChunkSize;
- $iPercentage = 5 + round(75 * ($this->iPosition / count($this->aObjectsIDs)));
- $sMessage = Dict::S('ExcelExporter:RetrievingData');
- }
- break;
-
+ $iPercentage = 5;
+ $sMessage = Dict::S('ExcelExporter:RetrievingData');
+ $this->iPosition = 0;
+ $this->aStatistics['objects_count'] = count($this->aObjectsIDs);
+ $this->aStatistics['data_retrieval_duration'] += microtime(true) - $fTime;
+
+ // The first line of the file is the "headers" specifying the label and the type of each column
+ $this->GetFieldsList($oIDSet, $this->bAdvancedMode);
+ $sRow = json_encode($this->aTableHeaders);
+ $hFile = @fopen($this->GetDataFile(), 'ab');
+ if ($hFile === false) {
+ throw new Exception('ExcelExporter: Failed to open temporary data file: "'.$this->GetDataFile().'" for writing.');
+ }
+ fwrite($hFile, $sRow."\n");
+ fclose($hFile);
+
+ // Next state
+ $this->sState = 'retrieving-data';
+ break;
+
+ case 'retrieving-data':
+ $oCurrentSearch = clone $this->oSearch;
+ $aIDs = array_slice($this->aObjectsIDs, $this->iPosition, $this->iChunkSize);
+
+ $oCurrentSearch->AddCondition('id', $aIDs, 'IN');
+ $hFile = @fopen($this->GetDataFile(), 'ab');
+ if ($hFile === false) {
+ throw new Exception('ExcelExporter: Failed to open temporary data file: "'.$this->GetDataFile().'" for writing.');
+ }
+ $oSet = new DBObjectSet($oCurrentSearch);
+ $this->GetFieldsList($oSet, $this->bAdvancedMode);
+ while ($aObjects = $oSet->FetchAssoc()) {
+ $aRow = [];
+ foreach ($this->aAuthorizedClasses as $sAlias => $sClassName) {
+ $oObj = $aObjects[$sAlias];
+ if ($this->bAdvancedMode) {
+ $aRow[] = $oObj->GetKey();
+ }
+ foreach ($this->aFieldsList[$sAlias] as $sAttCodeEx => $oAttDef) {
+ $value = $oObj->Get($sAttCodeEx);
+ if ($value instanceof ormCaseLog) {
+ // Extract the case log as text and remove the "===" which make Excel think that the cell contains a formula the next time you edit it!
+ $sExcelVal = trim(preg_replace('/========== ([^=]+) ============/', '********** $1 ************', $value->GetText()));
+ } else {
+ $sExcelVal = $oAttDef->GetEditValue($value, $oObj);
+ }
+ $aRow[] = $sExcelVal;
+ }
+ }
+ $sRow = json_encode($aRow);
+ fwrite($hFile, $sRow."\n");
+ }
+ fclose($hFile);
+
+ if (($this->iPosition + $this->iChunkSize) > count($this->aObjectsIDs)) {
+ // Next state
+ $this->sState = 'building-excel';
+ $sCode = 'building-excel';
+ $iPercentage = 80;
+ $sMessage = Dict::S('ExcelExporter:BuildingExcelFile');
+ } else {
+ $sCode = 'retrieving-data';
+ $this->iPosition += $this->iChunkSize;
+ $iPercentage = 5 + round(75 * ($this->iPosition / count($this->aObjectsIDs)));
+ $sMessage = Dict::S('ExcelExporter:RetrievingData');
+ }
+ break;
+
case 'building-excel':
- $hFile = @fopen($this->GetDataFile(), 'rb');
- if ($hFile === false)
- {
- throw new Exception('ExcelExporter: Failed to open temporary data file: "'.$this->GetDataFile().'" for reading.');
- }
- $sHeaders = fgets($hFile);
- $aHeaders = json_decode($sHeaders, true);
-
- $aData = array();
- while($sLine = fgets($hFile))
- {
- $aRow = json_decode($sLine);
- $aData[] = $aRow;
- }
- fclose($hFile);
- @unlink($this->GetDataFile());
-
- $fStartExcel = microtime(true);
- $writer = new XLSXWriter();
- $writer->setAuthor(UserRights::GetUserFriendlyName());
- $writer->writeSheet($aData,'Sheet1', $aHeaders);
- $fExcelTime = microtime(true) - $fStartExcel;
- $this->aStatistics['excel_build_duration'] = $fExcelTime;
-
- $fTime = microtime(true);
- $writer->writeToFile($this->GetExcelFilePath());
- $fExcelSaveTime = microtime(true) - $fTime;
- $this->aStatistics['excel_write_duration'] = $fExcelSaveTime;
-
- // Next state
- $this->sState = 'done';
- $sCode = 'done';
- $iPercentage = 100;
- $sMessage = Dict::S('ExcelExporter:Done');
- break;
-
+ $hFile = @fopen($this->GetDataFile(), 'rb');
+ if ($hFile === false) {
+ throw new Exception('ExcelExporter: Failed to open temporary data file: "'.$this->GetDataFile().'" for reading.');
+ }
+ $sHeaders = fgets($hFile);
+ $aHeaders = json_decode($sHeaders, true);
+
+ $aData = [];
+ while ($sLine = fgets($hFile)) {
+ $aRow = json_decode($sLine);
+ $aData[] = $aRow;
+ }
+ fclose($hFile);
+ @unlink($this->GetDataFile());
+
+ $fStartExcel = microtime(true);
+ $writer = new XLSXWriter();
+ $writer->setAuthor(UserRights::GetUserFriendlyName());
+ $writer->writeSheet($aData, 'Sheet1', $aHeaders);
+ $fExcelTime = microtime(true) - $fStartExcel;
+ $this->aStatistics['excel_build_duration'] = $fExcelTime;
+
+ $fTime = microtime(true);
+ $writer->writeToFile($this->GetExcelFilePath());
+ $fExcelSaveTime = microtime(true) - $fTime;
+ $this->aStatistics['excel_write_duration'] = $fExcelSaveTime;
+
+ // Next state
+ $this->sState = 'done';
+ $sCode = 'done';
+ $iPercentage = 100;
+ $sMessage = Dict::S('ExcelExporter:Done');
+ break;
+
case 'done':
- $this->sState = 'done';
- $sCode = 'done';
- $iPercentage = 100;
- $sMessage = Dict::S('ExcelExporter:Done');
- break;
+ $this->sState = 'done';
+ $sCode = 'done';
+ $iPercentage = 100;
+ $sMessage = Dict::S('ExcelExporter:Done');
+ break;
}
- }
- catch(Exception $e)
- {
+ } catch (Exception $e) {
$sCode = 'error';
$sMessage = $e->getMessage();
}
-
+
$this->aStatistics['total_duration'] += microtime(true) - $fTime;
$peak_memory = memory_get_peak_usage(true);
- if ($peak_memory > $this->aStatistics['peak_memory_usage'])
- {
+ if ($peak_memory > $this->aStatistics['peak_memory_usage']) {
$this->aStatistics['peak_memory_usage'] = $peak_memory;
}
-
- return array(
+
+ return [
'code' => $sCode,
'message' => $sMessage,
'percentage' => $iPercentage,
- );
+ ];
}
-
+
public function GetExcelFilePath()
{
- if ($this->sOutputFilePath == null)
- {
+ if ($this->sOutputFilePath == null) {
return APPROOT.'data/bulk_export/'.$this->sToken.'.xlsx';
- }
- else
- {
+ } else {
return $this->sOutputFilePath;
}
}
-
+
public static function GetExcelFileFromToken($sToken)
{
return @file_get_contents(APPROOT.'data/bulk_export/'.$sToken.'.xlsx');
}
-
+
public static function CleanupFromToken($sToken)
{
@unlink(APPROOT.'data/bulk_export/'.$sToken.'.status');
@unlink(APPROOT.'data/bulk_export/'.$sToken.'.data');
@unlink(APPROOT.'data/bulk_export/'.$sToken.'.xlsx');
}
-
+
public function Cleanup()
{
self::CleanupFromToken($this->sToken);
}
-
+
/**
* Delete all files in the data/bulk_export directory which are older than 1 day
* unless a different delay is configured.
@@ -336,15 +304,12 @@ class ExcelExporter
{
$aFiles = glob(APPROOT.'data/bulk_export/*.*');
$iDelay = MetaModel::GetConfig()->Get('xlsx_exporter_cleanup_old_files_delay');
-
- if($iDelay > 0)
- {
- foreach($aFiles as $sFile)
- {
+
+ if ($iDelay > 0) {
+ foreach ($aFiles as $sFile) {
$iModificationTime = filemtime($sFile);
-
- if($iModificationTime < (time() - $iDelay))
- {
+
+ if ($iModificationTime < (time() - $iDelay)) {
// Temporary files older than one day are deleted
//echo "Supposed to delete: '".$sFile." (Unix Modification Time: $iModificationTime)'\n";
@unlink($sFile);
@@ -352,189 +317,155 @@ class ExcelExporter
}
}
}
-
+
public function DisplayStatistics(Page $oPage)
{
- $aStats = array(
+ $aStats = [
'Number of objects exported' => $this->aStatistics['objects_count'],
'Total export duration' => sprintf('%.3f s', $this->aStatistics['total_duration']),
'Data retrieval duration' => sprintf('%.3f s', $this->aStatistics['data_retrieval_duration']),
'Excel build duration' => sprintf('%.3f s', $this->aStatistics['excel_build_duration']),
'Excel write duration' => sprintf('%.3f s', $this->aStatistics['excel_write_duration']),
'Peak memory usage' => self::HumanDisplay($this->aStatistics['peak_memory_usage']),
- );
-
- if ($oPage instanceof CLIPage)
- {
+ ];
+
+ if ($oPage instanceof CLIPage) {
$oPage->add($this->GetStatistics('text'));
- }
- else
- {
+ } else {
$oPage->add($this->GetStatistics('html'));
}
}
-
+
public function GetStatistics($sFormat = 'html')
{
$sStats = '';
- $aStats = array(
+ $aStats = [
'Number of objects exported' => $this->aStatistics['objects_count'],
'Total export duration' => sprintf('%.3f s', $this->aStatistics['total_duration']),
'Data retrieval duration' => sprintf('%.3f s', $this->aStatistics['data_retrieval_duration']),
'Excel build duration' => sprintf('%.3f s', $this->aStatistics['excel_build_duration']),
'Excel write duration' => sprintf('%.3f s', $this->aStatistics['excel_write_duration']),
'Peak memory usage' => self::HumanDisplay($this->aStatistics['peak_memory_usage']),
- );
-
- if ($sFormat == 'text')
- {
- foreach($aStats as $sLabel => $sValue)
- {
+ ];
+
+ if ($sFormat == 'text') {
+ foreach ($aStats as $sLabel => $sValue) {
$sStats .= "+------------------------------+----------+\n";
$sStats .= sprintf("|%-30s|%10s|\n", $sLabel, $sValue);
}
$sStats .= "+------------------------------+----------+";
- }
- else
- {
+ } else {
$sStats .= '';
- foreach($aStats as $sLabel => $sValue)
- {
+ foreach ($aStats as $sLabel => $sValue) {
$sStats .= "$sLabel $sValue
';
-
+
}
return $sStats;
}
-
+
public static function HumanDisplay($iSize)
{
- $aUnits = array('B','KB','MB','GB','TB','PB');
- return @round($iSize/pow(1024,($i=floor(log($iSize,1024)))),2).' '.$aUnits[$i];
+ $aUnits = ['B','KB','MB','GB','TB','PB'];
+ return @round($iSize / pow(1024, ($i = floor(log($iSize, 1024)))), 2).' '.$aUnits[$i];
}
-
+
protected function CheckDataDir()
{
- if(!is_dir(APPROOT."data/bulk_export"))
- {
+ if (!is_dir(APPROOT."data/bulk_export")) {
@mkdir(APPROOT."data/bulk_export", 0777, true /* recursive */);
clearstatcache();
}
- if (!is_writable(APPROOT."data/bulk_export"))
- {
+ if (!is_writable(APPROOT."data/bulk_export")) {
throw new Exception('Data directory "'.APPROOT.'data/bulk_export" could not be written.');
}
}
-
+
protected function GetStateFile($sToken = null)
{
- if ($sToken == null)
- {
+ if ($sToken == null) {
$sToken = $this->sToken;
}
return APPROOT."data/bulk_export/$sToken.status";
}
-
+
protected function GetDataFile()
{
return APPROOT.'data/bulk_export/'.$this->sToken.'.data';
}
-
+
protected function GetNewToken()
{
$iNum = rand();
- do
- {
+ do {
$iNum++;
$sToken = sprintf("%08x", $iNum);
$sFileName = $this->GetStateFile($sToken);
$hFile = @fopen($sFileName, 'x');
- }
- while($hFile === false);
-
+ } while ($hFile === false);
+
fclose($hFile);
return $sToken;
}
-
+
protected function GetFieldsList($oSet, $bFieldsAdvanced = false, $bLocalize = true, $aFields = null)
{
- $this->aFieldsList = array();
-
+ $this->aFieldsList = [];
+
$oAppContext = new ApplicationContext();
$aClasses = $oSet->GetFilter()->GetSelectedClasses();
- $this->aAuthorizedClasses = array();
- foreach($aClasses as $sAlias => $sClassName)
- {
- if (UserRights::IsActionAllowed($sClassName, UR_ACTION_READ, $oSet) != UR_ALLOWED_NO)
- {
+ $this->aAuthorizedClasses = [];
+ foreach ($aClasses as $sAlias => $sClassName) {
+ if (UserRights::IsActionAllowed($sClassName, UR_ACTION_READ, $oSet) != UR_ALLOWED_NO) {
$this->aAuthorizedClasses[$sAlias] = $sClassName;
}
}
- $aAttribs = array();
- $this->aTableHeaders = array();
- foreach($this->aAuthorizedClasses as $sAlias => $sClassName)
- {
- $aList[$sAlias] = array();
-
- foreach(MetaModel::ListAttributeDefs($sClassName) as $sAttCode => $oAttDef)
- {
- if (is_null($aFields) || (count($aFields) == 0))
- {
+ $aAttribs = [];
+ $this->aTableHeaders = [];
+ foreach ($this->aAuthorizedClasses as $sAlias => $sClassName) {
+ $aList[$sAlias] = [];
+
+ foreach (MetaModel::ListAttributeDefs($sClassName) as $sAttCode => $oAttDef) {
+ if (is_null($aFields) || (count($aFields) == 0)) {
// Standard list of attributes (no link sets)
- if ($oAttDef->IsScalar() && ($oAttDef->IsWritable() || $oAttDef->IsExternalField()))
- {
+ if ($oAttDef->IsScalar() && ($oAttDef->IsWritable() || $oAttDef->IsExternalField())) {
$sAttCodeEx = $oAttDef->IsExternalField() ? $oAttDef->GetKeyAttCode().'->'.$oAttDef->GetExtAttCode() : $sAttCode;
-
- if ($oAttDef->IsExternalKey(EXTKEY_ABSOLUTE))
- {
- if ($bFieldsAdvanced)
- {
+
+ if ($oAttDef->IsExternalKey(EXTKEY_ABSOLUTE)) {
+ if ($bFieldsAdvanced) {
$aList[$sAlias][$sAttCodeEx] = $oAttDef;
-
- if ($oAttDef->IsExternalKey(EXTKEY_RELATIVE))
- {
- $sRemoteClass = $oAttDef->GetTargetClass();
- foreach(MetaModel::GetReconcKeys($sRemoteClass) as $sRemoteAttCode)
- {
+
+ if ($oAttDef->IsExternalKey(EXTKEY_RELATIVE)) {
+ $sRemoteClass = $oAttDef->GetTargetClass();
+ foreach (MetaModel::GetReconcKeys($sRemoteClass) as $sRemoteAttCode) {
$this->aFieldsList[$sAlias][$sAttCode.'->'.$sRemoteAttCode] = MetaModel::GetAttributeDef($sRemoteClass, $sRemoteAttCode);
- }
+ }
}
}
- }
- else
- {
+ } else {
// Any other attribute
$this->aFieldsList[$sAlias][$sAttCodeEx] = $oAttDef;
}
}
- }
- else
- {
+ } else {
// User defined list of attributes
- if (in_array($sAttCode, $aFields) || in_array($sAlias.'.'.$sAttCode, $aFields))
- {
+ if (in_array($sAttCode, $aFields) || in_array($sAlias.'.'.$sAttCode, $aFields)) {
$this->aFieldsList[$sAlias][$sAttCode] = $oAttDef;
}
}
}
- if ($bFieldsAdvanced)
- {
+ if ($bFieldsAdvanced) {
$this->aTableHeaders['id'] = '0';
}
- foreach($this->aFieldsList[$sAlias] as $sAttCodeEx => $oAttDef)
- {
+ foreach ($this->aFieldsList[$sAlias] as $sAttCodeEx => $oAttDef) {
$sLabel = $bLocalize ? MetaModel::GetLabel($sClassName, $sAttCodeEx, isset($aParams['showMandatoryFields'])) : $sAttCodeEx;
- if($oAttDef instanceof AttributeDateTime)
- {
+ if ($oAttDef instanceof AttributeDateTime) {
$this->aTableHeaders[$sLabel] = 'datetime';
- }
- else
- {
+ } else {
$this->aTableHeaders[$sLabel] = 'string';
}
}
}
}
}
-
diff --git a/application/exceptions/ApplicationException.php b/application/exceptions/ApplicationException.php
index 6a390a3f5..e9c7f59f2 100644
--- a/application/exceptions/ApplicationException.php
+++ b/application/exceptions/ApplicationException.php
@@ -1,4 +1,5 @@
aIssues) == 1) {
$sIssue = reset($this->aIssues);
- $sContent .= $sIssue;
+ $sContent .= $sIssue;
} else {
foreach ($this->aIssues as $sError) {
- $sContent .= " " . $sError . ", ";
+ $sContent .= " ".$sError.", ";
}
}
return $sContent;
}
-
public function getIssues()
{
return $this->aIssues;
diff --git a/application/exceptions/CoreException.php b/application/exceptions/CoreException.php
index 178b5397d..6751665aa 100644
--- a/application/exceptions/CoreException.php
+++ b/application/exceptions/CoreException.php
@@ -1,4 +1,5 @@
m_aContextData) > 0) {
$sMessage .= ": ";
- $aContextItems = array();
+ $aContextItems = [];
foreach ($this->m_aContextData as $sKey => $value) {
if (is_array($value)) {
- $aPairs = array();
+ $aPairs = [];
foreach ($value as $key => $val) {
if (is_array($val)) {
$aPairs[] = $key.'=>('.implode(', ', $val).')';
@@ -109,4 +110,4 @@ class CoreException extends Exception
{
return $this->m_aContextData;
}
-}
\ No newline at end of file
+}
diff --git a/application/exceptions/CorePortalInvalidActionRuleException.php b/application/exceptions/CorePortalInvalidActionRuleException.php
index 598fd3253..1b5015117 100644
--- a/application/exceptions/CorePortalInvalidActionRuleException.php
+++ b/application/exceptions/CorePortalInvalidActionRuleException.php
@@ -1,4 +1,5 @@
getMessage();
parent::__construct($sMessage, null, '', $oTwigException);
}
-}
\ No newline at end of file
+}
diff --git a/application/exceptions/CoreUnexpectedValue.php b/application/exceptions/CoreUnexpectedValue.php
index 78a3f8b4c..5dd6371a2 100644
--- a/application/exceptions/CoreUnexpectedValue.php
+++ b/application/exceptions/CoreUnexpectedValue.php
@@ -1,4 +1,5 @@
GetKey();
+ $aContextData[self::ENUM_PARAMS_OBJECT] = get_class($oObject).'::'.$oObject->GetKey();
$aContextData[self::ENUM_PARAMS_ATTCODE] = $sAttCode;
$aContextData[self::ENUM_PARAMS_ATTVALUE] = $oObject->Get($sAttCode);
$oCurrentUser = UserRights::GetUserObject();
if (false === is_null($oCurrentUser)) {
- $aContextData[self::ENUM_PARAMS_USER] = get_class($oCurrentUser) . '::' . $oCurrentUser->GetKey();
+ $aContextData[self::ENUM_PARAMS_USER] = get_class($oCurrentUser).'::'.$oCurrentUser->GetKey();
}
parent::__construct('Attribute pointing to an object that is either non existing or not readable by the current user', $aContextData, '', $oPrevious);
diff --git a/application/exceptions/InvalidPasswordAttributeOneWayPassword.php b/application/exceptions/InvalidPasswordAttributeOneWayPassword.php
index 9239f7363..19638a909 100644
--- a/application/exceptions/InvalidPasswordAttributeOneWayPassword.php
+++ b/application/exceptions/InvalidPasswordAttributeOneWayPassword.php
@@ -1,4 +1,5 @@
getCode();
$this->code = $oException->getCode();
$aContext['mysql_error'] = $oException->getMessage();
- } else if ($oMysqli != null) {
+ } elseif ($oMysqli != null) {
$aContext['mysql_errno'] = $oMysqli->errno;
$this->code = $oMysqli->errno;
$aContext['mysql_error'] = $oMysqli->error;
@@ -36,4 +37,4 @@ class MySQLException extends CoreException
error_reporting(0);
}
}
-}
\ No newline at end of file
+}
diff --git a/application/exceptions/mysql/MySQLHasGoneAwayException.php b/application/exceptions/mysql/MySQLHasGoneAwayException.php
index cb16e6840..b830a92c1 100644
--- a/application/exceptions/mysql/MySQLHasGoneAwayException.php
+++ b/application/exceptions/mysql/MySQLHasGoneAwayException.php
@@ -1,4 +1,5 @@
* @since 3.0.0 N°3588
*/
-class FindStylesheetObject{
-
+class FindStylesheetObject
+{
//file URIs
private $aStylesheetFileURIs;
@@ -64,7 +65,7 @@ class FindStylesheetObject{
return $this->aStylesheetFileURIs;
}
- public function GetLastModified() : int
+ public function GetLastModified(): int
{
return $this->iLastModified;
}
@@ -92,7 +93,8 @@ class FindStylesheetObject{
$this->sLastStyleSheetPath = $sStylesheetFilePath;
}
- public function AlreadyFetched(string $sStylesheetFilePath) : bool {
+ public function AlreadyFetched(string $sStylesheetFilePath): bool
+ {
return in_array($sStylesheetFilePath, $this->aAllStylesheetFilePaths);
}
@@ -111,4 +113,4 @@ class FindStylesheetObject{
{
$this->sLastStyleSheetPath = "";
}
-}
\ No newline at end of file
+}
diff --git a/application/forms.class.inc.php b/application/forms.class.inc.php
index 890475e4f..4cac5ea9c 100644
--- a/application/forms.class.inc.php
+++ b/application/forms.class.inc.php
@@ -1,9 +1,10 @@
aFieldSets = array();
+ $this->aFieldSets = [];
$this->sCurrentFieldSet = '';
$this->sScript = '';
$this->sReadyScript = '';
@@ -61,62 +62,55 @@ class DesignerForm
$this->sHierarchySelector = '';
$this->StartFieldSet($this->sCurrentFieldSet);
$this->bDisplayed = true;
- $this->aDefaultValues = array();
+ $this->aDefaultValues = [];
}
-
+
public function AddField(DesignerFormField $oField)
{
- if (!is_array($this->aFieldSets[$this->sCurrentFieldSet]))
- {
- $this->aFieldSets[$this->sCurrentFieldSet] = array();
+ if (!is_array($this->aFieldSets[$this->sCurrentFieldSet])) {
+ $this->aFieldSets[$this->sCurrentFieldSet] = [];
}
$this->aFieldSets[$this->sCurrentFieldSet][] = $oField;
$oField->SetForm($this);
}
-
+
public function StartFieldSet($sLabel)
{
$this->sCurrentFieldSet = $sLabel;
- if (!array_key_exists($this->sCurrentFieldSet, $this->aFieldSets))
- {
- $this->aFieldSets[$this->sCurrentFieldSet] = array();
+ if (!array_key_exists($this->sCurrentFieldSet, $this->aFieldSets)) {
+ $this->aFieldSets[$this->sCurrentFieldSet] = [];
}
}
-
+
public function Render($oP, $bReturnHTML = false)
{
$sFormId = $this->GetFormId();
- if ($this->oParentForm == null)
- {
+ if ($this->oParentForm == null) {
$sReturn = '';
}
- if($this->sScript != '')
- {
+ if ($this->sScript != '') {
$oP->add_script($this->sScript);
}
- if($this->sReadyScript != '')
- {
+ if ($this->sReadyScript != '') {
$oP->add_ready_script($this->sReadyScript);
}
- if ($bReturnHTML)
- {
+ if ($bReturnHTML) {
return $sReturn;
- }
- else
- {
+ } else {
$oP->add($sReturn);
}
}
-
+
public function GetFieldSets()
{
return $this->aFieldSets;
@@ -161,51 +149,50 @@ class DesignerForm
$this->sSubmitTo = $sSubmitToUrl;
$this->aSubmitParams = $aSubmitParams;
}
-
+
public function CopySubmitParams($oParentForm)
{
$this->sSubmitTo = $oParentForm->sSubmitTo;
$this->aSubmitParams = $oParentForm->aSubmitParams;
}
-
+
public function GetSubmitParams()
{
- return array( 'url' => $this->sSubmitTo, 'params' => $this->aSubmitParams);
+ return [ 'url' => $this->sSubmitTo, 'params' => $this->aSubmitParams];
}
-
+
/**
- * Helper to handle subforms hide/show
- */
+ * Helper to handle subforms hide/show
+ */
public function SetHierarchyPath($sHierarchy)
{
$this->sHierarchyPath = $sHierarchy;
}
-
+
/**
- * Helper to handle subforms hide/show
- */
+ * Helper to handle subforms hide/show
+ */
public function GetHierarchyPath()
{
return $this->sHierarchyPath;
}
-
+
/**
- * Helper to handle subforms hide/show
- */
+ * Helper to handle subforms hide/show
+ */
public function SetHierarchyParent($sHierarchy)
{
$this->sHierarchyParent = $sHierarchy;
}
-
+
/**
- * Helper to handle subforms hide/show
- */
+ * Helper to handle subforms hide/show
+ */
public function GetHierarchyParent()
{
return $this->sHierarchyParent;
}
-
-
+
public function RenderAsPropertySheet($oP, $bReturnHTML = false, $sNotifyParentSelector = null)
{
$sReturn = '';
@@ -220,12 +207,11 @@ class DesignerForm
$sHiddenFields = '';
foreach ($this->aFieldSets as $sLabel => $aFields) {
- $aDetails = array();
+ $aDetails = [];
if ($sLabel != '') {
$sReturn .= $this->StartRow().''.$sLabel.' '.$this->EndRow();
}
-
foreach ($aFields as $oField) {
$aRow = $oField->Render($oP, $sFormId, 'property');
if ($oField->IsVisible()) {
@@ -249,44 +235,37 @@ class DesignerForm
$sWidgetClass = $oField->GetWidgetClass();
$sJSExtraParams = '';
- if (count($oField->GetWidgetExtraParams()) > 0)
- {
- $aExtraParams = array();
- foreach($oField->GetWidgetExtraParams() as $key=> $value)
- {
+ if (count($oField->GetWidgetExtraParams()) > 0) {
+ $aExtraParams = [];
+ foreach ($oField->GetWidgetExtraParams() as $key => $value) {
$aExtraParams[] = "'$key': ".json_encode($value);
}
- $sJSExtraParams = ', '.implode(', ', $aExtraParams);
+ $sJSExtraParams = ', '.implode(', ', $aExtraParams);
}
$this->AddReadyScript(
-<<oParentForm == null)
- {
+
+ if ($this->oParentForm == null) {
$sFormId = $this->sFormId;
$sReturn .= '';
$sReturn .= '
';
$sReturn .= $sHiddenFields;
$sReturn .= '';
$sReturn .= '
'; // for the return of the submit operation
- }
- else
- {
+ } else {
$sReturn .= $sHiddenFields;
}
$this->AddReadyScript(
-<<sScript != '')
- {
+
+ if ($this->sScript != '') {
$oP->add_script($this->sScript);
}
- if($this->sReadyScript != '')
- {
+ if ($this->sReadyScript != '') {
$oP->add_ready_script($this->sReadyScript);
}
- if ($bReturnHTML)
- {
+ if ($bReturnHTML) {
return $sReturn;
- }
- else
- {
+ } else {
$oP->add($sReturn);
}
}
-
+
public function StartRow($sFieldId = null)
{
- if ($sFieldId != null)
- {
+ if ($sFieldId != null) {
return '';
}
return ' ';
}
-
+
public function EndRow()
{
return ' ';
}
-
+
public function RenderAsDialog($oPage, $sDialogId, $sDialogTitle, $iDialogWidth, $sOkButtonLabel, $sIntroduction = null, $bAutoOpen = true)
{
$this->SetPrefix('dlg_'); // To make sure that the controls have different IDs that the property sheet which may be displayed at the same time
-
+
$sDialogTitle = addslashes($sDialogTitle);
$sOkButtonLabel = addslashes($sOkButtonLabel);
$sCancelButtonLabel = Dict::S('UI:Button:Cancel');
$oPage->add("");
- if ($sIntroduction != null)
- {
+ if ($sIntroduction != null) {
$oPage->add('');
}
$this->Render($oPage);
$oPage->add('
');
-
+
$sAutoOpen = $bAutoOpen ? 'true' : 'false';
$oPage->add_ready_script(
-<<aFieldSets as $sLabel => $aFields)
- {
- foreach($aFields as $oField)
- {
+ foreach ($this->aFieldSets as $sLabel => $aFields) {
+ foreach ($aFields as $oField) {
/** @var \DesignerFormField $oField */
$oField->ReadParam($aValues);
}
}
return $aValues;
}
-
+
public function SetPrefix($sPrefix)
{
$this->sFormPrefix = $sPrefix;
}
-
+
public function GetPrefix()
{
- $sPrefix = '';
- if ($this->oParentForm != null)
- {
+ $sPrefix = '';
+ if ($this->oParentForm != null) {
$sPrefix = $this->oParentForm->GetPrefix();
}
return $sPrefix.$this->sFormPrefix;
@@ -416,89 +385,80 @@ EOF
{
$this->sFieldsSuffix = $sSuffix;
}
-
+
public function GetSuffix()
{
$sSuffix = '';
- if ($this->oParentForm != null)
- {
+ if ($this->oParentForm != null) {
$sSuffix = $this->oParentForm->GetSuffix();
}
return $sSuffix.$this->sFieldsSuffix;
}
-
+
public function SetReadOnly($bReadOnly = true)
{
$this->bReadOnly = $bReadOnly;
}
-
+
public function IsReadOnly()
{
- if ($this->oParentForm == null)
- {
+ if ($this->oParentForm == null) {
return $this->bReadOnly;
- }
- else
- {
+ } else {
return $this->oParentForm->IsReadOnly();
}
}
-
+
public function SetParamsContainer($sParamsContainer)
{
$this->sParamsContainer = $sParamsContainer;
}
-
+
public function GetParamsContainer()
{
- if ($this->oParentForm == null)
- {
+ if ($this->oParentForm == null) {
return $this->sParamsContainer;
- }
- else
- {
+ } else {
return $this->oParentForm->GetParamsContainer();
}
}
-
+
public function SetParentForm($oParentForm)
{
$this->oParentForm = $oParentForm;
}
-
+
public function SetDefaultValues($aDefaultValues)
{
- if (!is_array($aDefaultValues)) return;
-
- foreach($this->aFieldSets as $sLabel => $aFields)
- {
- foreach($aFields as $oField)
- {
+ if (!is_array($aDefaultValues)) {
+ return;
+ }
+
+ foreach ($this->aFieldSets as $sLabel => $aFields) {
+ foreach ($aFields as $oField) {
$oField->SetDefaultValueFrom($aDefaultValues);
}
}
}
-
+
public function GetDefaultValues()
{
return $this->aDefaultValues;
}
-
-
+
public function GetParentForm()
{
return $this->oParentForm;
}
-
+
public function GetFormId()
{
- if ($this->oParentForm)
- {
+ if ($this->oParentForm) {
$this->oParentForm->GetFormId();
}
return $this->sFormId;
}
-
+
public function SetDisplayed($bDisplayed)
{
$this->bDisplayed = $bDisplayed;
@@ -506,41 +466,38 @@ EOF
public function IsDisplayed()
{
- if ($this->oParentForm == null)
- {
+ if ($this->oParentForm == null) {
return $this->bDisplayed;
- }
- else
- {
+ } else {
return ($this->bDisplayed && $this->oParentForm->IsDisplayed());
}
}
-
+
public function AddScript($sScript)
{
$this->sScript .= $sScript;
}
-
+
public function AddReadyScript($sScript)
{
$this->sReadyScript .= $sScript;
}
-
+
public function GetFieldId($sCode)
{
return $this->GetPrefix().'attr_'.utils::GetSafeId($sCode.$this->GetSuffix());
}
-
+
public function GetFieldName($sCode)
{
return 'attr_'.$sCode.$this->GetSuffix();
}
-
+
public function GetParamName($sCode)
{
return 'attr_'.$sCode.$this->GetSuffix();
}
-
+
public function GetValidationArea($sId, $sContent = '')
{
return "$sContent ";
@@ -549,31 +506,33 @@ EOF
{
return $this->sAsyncActionClass;
}
-
+
public function FindField($sFieldCode)
{
$oFoundField = false;
- foreach($this->aFieldSets as $sLabel => $aFields)
- {
- foreach($aFields as $oField)
- {
+ foreach ($this->aFieldSets as $sLabel => $aFields) {
+ foreach ($aFields as $oField) {
$oFoundField = $oField->FindField($sFieldCode);
- if ($oFoundField !== false) break;
+ if ($oFoundField !== false) {
+ break;
+ }
+ }
+ if ($oFoundField !== false) {
+ break;
}
- if ($oFoundField !== false) break;
}
- return $oFoundField;
+ return $oFoundField;
}
}
class DesignerTabularForm extends DesignerForm
{
protected $aTable;
-
+
public function __construct()
{
parent::__construct();
- $this->aTable = array();
+ $this->aTable = [];
}
public function AddRow($aRow)
{
@@ -584,50 +543,37 @@ class DesignerTabularForm extends DesignerForm
{
return $this->Render($oP, $bReturnHTML);
}
-
+
public function Render($oP, $bReturnHTML = false)
{
$sReturn = '';
- if ($this->oParentForm == null)
- {
+ if ($this->oParentForm == null) {
$sFormId = $this->sFormId;
$sReturn = '