'; } } - if ($row['CType'] == 'textpic' || $row['CType'] == 'image') { + if ($row['CType'] === 'textpic' || $row['CType'] === 'image') { if ($row['image']) { $out .= $this->thumbCode($row, 'tt_content', 'image') . '
'; if ($row['imagecaption']) { @@ -1583,7 +1582,6 @@ */ public function getResult($result, $table = 'tt_content') { // Initialize: - $editUidList = ''; $recs = array(); $nextTree = $this->nextThree; $c = 0; Index: typo3_src/typo3/sysext/core/Classes/Authentication/BackendUserAuthentication.php IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- typo3_src/typo3/sysext/core/Classes/Authentication/BackendUserAuthentication.php (revision 8dad992c4dee4c20356cb1a1ac8d0a8cc65adbc8) +++ typo3_src/typo3/sysext/core/Classes/Authentication/BackendUserAuthentication.php (revision ) @@ -363,7 +363,7 @@ * @todo Define visibility */ public function isAdmin() { - return is_array($this->user) && ($this->user['admin'] & 1) == 1; + return isset($this->user['admin']) && ($this->user['admin'] & 1) == 1; } /** @@ -612,13 +612,9 @@ * @todo Define visibility */ public function check($type, $value) { - if (isset($this->groupData[$type])) { - if ($this->isAdmin() || GeneralUtility::inList($this->groupData[$type], $value)) { - return TRUE; + return ((isset($this->groupData[$type])) && + ($this->isAdmin() || GeneralUtility::inList($this->groupData[$type], $value))); - } + } - } - return FALSE; - } /** * Checking the authMode of a select field with authMode set @@ -1138,7 +1134,7 @@ $TSConf = array('value' => NULL, 'properties' => NULL); $parts = GeneralUtility::trimExplode('.', $objectString, TRUE, 2); $key = $parts[0]; - if (strlen($key) > 0) { + if ($key !== '') { if (count($parts) > 1 && strlen($parts[1]) > 0) { // Go on, get the next level if (is_array($config[$key . '.'])) { Index: typo3_src/typo3/sysext/backend/Classes/RecordList/AbstractRecordList.php IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- typo3_src/typo3/sysext/backend/Classes/RecordList/AbstractRecordList.php (revision 8dad992c4dee4c20356cb1a1ac8d0a8cc65adbc8) +++ typo3_src/typo3/sysext/backend/Classes/RecordList/AbstractRecordList.php (revision ) @@ -43,6 +43,13 @@ */ abstract class AbstractRecordList { + /** + * Id + * + * @var int + */ + public $id; + // Used in this class: // default Max items shown /** @@ -174,16 +181,17 @@ * Returns a table-row with the content from the fields in the input data array. * OBS: $this->fieldArray MUST be set! (represents the list of fields to display) * - * @param integer $h Is an integer >=0 and denotes how tall a element is. Set to '0' makes a halv line, -1 = full line, set to 1 makes a 'join' and above makes 'line' + * @param integer $height Is an integer >=0 and denotes how tall a element is. Set to '0' makes a halv line, -1 = full line, set to 1 makes a 'join' and above makes 'line' * @param string $icon Is the
';
} else {
- for ($a = 0; $a < $h; $a++) {
+ for ($a = 0; $a < $height; ++$a) {
if (!$a) {
if ($icon) {
$out .= $icon;
}
- } else {
-
}
}
}
@@ -210,16 +216,14 @@
';
}
// Init rendering.
- $colsp = '';
- $lastKey = '';
- $c = 0;
- $ccount = 0;
+ $colsp = $lastKey = '';
+ $c = $ccount = 0;
// Traverse field array which contains the data to present:
foreach ($this->fieldArray as $vKey) {
if (isset($data[$vKey])) {
if ($lastKey) {
$cssClass = $this->addElement_tdCssClass[$lastKey];
- if ($this->oddColumnsCssClass && $ccount % 2 == 0) {
+ if ($this->oddColumnsCssClass && $ccount % 2 === 0) {
$cssClass = implode(' ', array($this->addElement_tdCssClass[$lastKey], $this->oddColumnsCssClass));
}
$out .= '
@@ -227,12 +231,12 @@
}
$lastKey = $vKey;
$c = 1;
- $ccount++;
+ ++$ccount;
} else {
if (!$lastKey) {
$lastKey = $vKey;
}
- $c++;
+ ++$c;
}
if ($c > 1) {
$colsp = ' colspan="' . $c . '"';
@@ -249,10 +253,8 @@
' . $this->thumbCode($row, $table, $thumbsCol); } $localizationMarkerClass = ''; - if (isset($GLOBALS['TCA'][$table]['ctrl']['languageField']) && $row[$GLOBALS['TCA'][$table]['ctrl']['languageField']] != 0 && $row[$GLOBALS['TCA'][$table]['ctrl']['transOrigPointerField']] != 0) { + if (isset($GLOBALS['TCA'][$table]['ctrl']['languageField']) && + $row[$GLOBALS['TCA'][$table]['ctrl']['languageField']] != 0 && + $row[$GLOBALS['TCA'][$table]['ctrl']['transOrigPointerField']] != 0) { // It's a translated record with a language parent $localizationMarkerClass = ' localization'; } - } elseif ($fCol == 'pid') { + } elseif ($fCol === 'pid') { $theData[$fCol] = $row[$fCol]; - } elseif ($fCol == '_PATH_') { + } elseif ($fCol === '_PATH_') { $theData[$fCol] = $this->recPath($row['pid']); - } elseif ($fCol == '_REF_') { + } elseif ($fCol === '_REF_') { $theData[$fCol] = $this->createReferenceHtml($table, $row['uid']); - } elseif ($fCol == '_CONTROL_') { + } elseif ($fCol === '_CONTROL_') { $theData[$fCol] = $this->makeControl($table, $row); - } elseif ($fCol == '_AFTERCONTROL_' || $fCol == '_AFTERREF_') { + } elseif ($fCol === '_AFTERCONTROL_' || $fCol === '_AFTERREF_') { $theData[$fCol] = ' '; - } elseif ($fCol == '_CLIPBOARD_') { + } elseif ($fCol === '_CLIPBOARD_') { $theData[$fCol] = $this->makeClip($table, $row); - } elseif ($fCol == '_LOCALIZATION_') { + } elseif ($fCol === '_LOCALIZATION_') { list($lC1, $lC2) = $this->makeLocalizationPanel($table, $row); $theData[$fCol] = $lC1; $theData[$fCol . 'b'] = $lC2; - } elseif ($fCol == '_LOCALIZATION_b') { - - } else { + } elseif ($fCol !== '_LOCALIZATION_b') { $tmpProc = BackendUtility::getProcessedValueExtra($table, $fCol, $row[$fCol], 100, $row['uid']); $theData[$fCol] = $this->linkUrlMail(htmlspecialchars($tmpProc), $row[$fCol]); if ($this->csvOutput) { @@ -688,7 +688,7 @@ } } // Reset the ID if it was overwritten - if (strlen($this->searchString)) { + if ($this->searchString !== '') { $this->id = $id_orig; } // Add row to CSV list: @@ -722,7 +722,7 @@ */ protected function getReferenceCount($tableName, $uid) { if (!isset($this->referenceCount[$tableName][$uid])) { - $numberOfReferences = $GLOBALS['TYPO3_DB']->exec_SELECTcountRows('*', 'sys_refindex', 'ref_table = ' . $GLOBALS['TYPO3_DB']->fullQuoteStr($tableName, 'sys_refindex') . ' AND ref_uid = ' . $uid . ' AND deleted = 0'); + $numberOfReferences = $GLOBALS['TYPO3_DB']->exec_SELECTcountRows('recuid', 'sys_refindex', 'ref_table = ' . $GLOBALS['TYPO3_DB']->fullQuoteStr($tableName, 'sys_refindex') . ' AND ref_uid = ' . $uid . ' AND deleted = 0'); $this->referenceCount[$tableName][$uid] = $numberOfReferences; } return $this->referenceCount[$tableName][$uid]; @@ -733,6 +733,8 @@ * * @param string $table Table name * @param array $currentIdList Array of the currently displayed uids of the table + * + * @throws \UnexpectedValueException * @return string Header table row * @access private * @see getTable() @@ -744,7 +746,7 @@ // Traverse the fields: foreach ($this->fieldArray as $fCol) { // Calculate users permissions to edit records in the table: - $permsEdit = $this->calcPerms & ($table == 'pages' ? 2 : 16); + $permsEdit = $this->calcPerms & ($table === 'pages' ? 2 : 16); switch ((string) $fCol) { case '_PATH_': // Path @@ -808,17 +810,17 @@ if (!$GLOBALS['TCA'][$table]['ctrl']['readOnly']) { // If new records can be created on this page, add links: if ($this->calcPerms & ($table == 'pages' ? 8 : 16) && $this->showNewRecLink($table)) { - if ($table == 'tt_content' && $this->newWizards) { + if ($table === 'tt_content' && $this->newWizards) { // If mod.web_list.newContentWiz.overrideWithExtension is set, use that extension's create new content wizard instead: $tmpTSc = BackendUtility::getModTSconfig($this->pageinfo['uid'], 'mod.web_list'); $tmpTSc = $tmpTSc['properties']['newContentWiz.']['overrideWithExtension']; $newContentWizScriptPath = $this->backPath . ExtensionManagementUtility::isLoaded($tmpTSc) ? ExtensionManagementUtility::extRelPath($tmpTSc) . 'mod1/db_new_content_el.php' : 'sysext/cms/layout/db_new_content_el.php'; $icon = '' . ($table == 'pages' ? IconUtility::getSpriteIcon('actions-page-new') : IconUtility::getSpriteIcon('actions-document-new')) . ''; } elseif ($table == 'pages' && $this->newWizards) { - $icon = '' . ($table == 'pages' ? IconUtility::getSpriteIcon('actions-page-new') : IconUtility::getSpriteIcon('actions-document-new')) . ''; + $icon = '' . ($table === 'pages' ? IconUtility::getSpriteIcon('actions-page-new') : IconUtility::getSpriteIcon('actions-document-new')) . ''; } else { $params = '&edit[' . $table . '][' . $this->id . ']=new'; - if ($table == 'pages_language_overlay') { + if ($table === 'pages_language_overlay') { $params .= '&overrideVals[pages_language_overlay][doktype]=' . (int)$this->pageRow['doktype']; } $icon = '' . ($table == 'pages' ? IconUtility::getSpriteIcon('actions-page-new') : IconUtility::getSpriteIcon('actions-document-new')) . ''; @@ -908,7 +910,6 @@ $returnContent = ''; // Show page selector if not all records fit into one page if ($totalPages > 1) { - $first = ($previous = ($next = ($last = ($reload = '')))); $listURL = $this->listURL('', $this->table); // 1 = first page $currentPage = floor(($this->firstElementNumber + 1) / $this->iLimit) + 1; @@ -992,6 +993,8 @@ * * @param string $table The table * @param array $row The record for which to make the control panel. + * + * @throws \UnexpectedValueException * @return string HTML table with the control panel (unless disabled) * @todo Define visibility */ @@ -1005,20 +1008,26 @@ } $cells = array(); // If the listed table is 'pages' we have to request the permission settings for each page: - if ($table == 'pages') { + $isPagesTable = FALSE; + if ($table === 'pages') { + $isPagesTable = TRUE; $localCalcPerms = $GLOBALS['BE_USER']->calcPerms(BackendUtility::getRecord('pages', $row['uid'])); } // This expresses the edit permissions for this particular element: - $permsEdit = $table == 'pages' && $localCalcPerms & 2 || $table != 'pages' && $this->calcPerms & 16; + $hasEditPermission = $isPagesTable && $localCalcPerms & 2 || !$isPagesTable && $this->calcPerms & 16; + $isTtContentTable = FALSE; + if ($table === 'tt_content') { + $isTtContentTable = TRUE; + } // "Show" link (only pages and tt_content elements) - if ($table == 'pages' || $table == 'tt_content') { + if ($isPagesTable || $isTtContentTable) { $cells['view'] = '' . IconUtility::getSpriteIcon('actions-document-view') . ''; @@ -1026,15 +1035,15 @@ $cells['view'] = $this->spaceIcon; } // "Edit" link: ( Only if permissions to edit the page-record of the content of the parent page ($this->id) - if ($permsEdit) { + if ($hasEditPermission) { $params = '&edit[' . $table . '][' . $row['uid'] . ']=edit'; $cells['edit'] = '' . ($GLOBALS['TCA'][$table]['ctrl']['readOnly'] ? IconUtility::getSpriteIcon('actions-document-open-read-only') : IconUtility::getSpriteIcon('actions-document-open')) . ''; } elseif (!$this->table) { $cells['edit'] = $this->spaceIcon; } // "Move" wizard link for pages/tt_content elements: - if ($table == 'tt_content' && $permsEdit || $table == 'pages') { - $cells['move'] = '' . ($table == 'tt_content' ? IconUtility::getSpriteIcon('actions-document-move') : IconUtility::getSpriteIcon('actions-page-move')) . ''; + if ($isTtContentTable && $hasEditPermission || $isPagesTable) { + $cells['move'] = '' . ($isTtContentTable ? IconUtility::getSpriteIcon('actions-document-move') : IconUtility::getSpriteIcon('actions-page-move')) . ''; } elseif (!$this->table) { $cells['move'] = $this->spaceIcon; } @@ -1045,7 +1054,7 @@ // If the table is NOT a read-only table, then show these links: if (!$GLOBALS['TCA'][$table]['ctrl']['readOnly']) { // "Revert" link (history/undo) - $cells['history'] = '' . IconUtility::getSpriteIcon('actions-document-history-open') . ''; + $cells['history'] = '' . IconUtility::getSpriteIcon('actions-document-history-open') . ''; // Versioning: if (ExtensionManagementUtility::isLoaded('version') && !ExtensionManagementUtility::isLoaded('workspaces')) { $vers = BackendUtility::selectVersionsOfRecord($table, $row['uid'], 'uid', $GLOBALS['BE_USER']->workspace, FALSE, $row); @@ -1061,24 +1070,24 @@ } } // "Edit Perms" link: - if ($table == 'pages' && $GLOBALS['BE_USER']->check('modules', 'web_perm') && ExtensionManagementUtility::isLoaded('perm')) { + if ($isPagesTable && $GLOBALS['BE_USER']->check('modules', 'web_perm') && ExtensionManagementUtility::isLoaded('perm')) { $cells['perms'] = '' . IconUtility::getSpriteIcon('status-status-locked') . ''; } elseif (!$this->table && $GLOBALS['BE_USER']->check('modules', 'web_perm')) { $cells['perms'] = $this->spaceIcon; } // "New record after" link (ONLY if the records in the table are sorted by a "sortby"-row or if default values can depend on previous record): if ($GLOBALS['TCA'][$table]['ctrl']['sortby'] || $GLOBALS['TCA'][$table]['ctrl']['useColumnsForDefaultValues']) { - if ($table != 'pages' && $this->calcPerms & 16 || $table == 'pages' && $this->calcPerms & 8) { + if (!$isPagesTable && $this->calcPerms & 16 || $isPagesTable && $this->calcPerms & 8) { if ($this->showNewRecLink($table)) { $params = '&edit[' . $table . '][' . -($row['_MOVE_PLH'] ? $row['_MOVE_PLH_uid'] : $row['uid']) . ']=new'; - $cells['new'] = '' . ($table == 'pages' ? IconUtility::getSpriteIcon('actions-page-new') : IconUtility::getSpriteIcon('actions-document-new')) . ''; + $cells['new'] = '' . ($isPagesTable ? IconUtility::getSpriteIcon('actions-page-new') : IconUtility::getSpriteIcon('actions-document-new')) . ''; } } } elseif (!$this->table) { $cells['new'] = $this->spaceIcon; } // "Up/Down" links - if ($permsEdit && $GLOBALS['TCA'][$table]['ctrl']['sortby'] && !$this->sortField && !$this->searchLevels) { + if ($hasEditPermission && $GLOBALS['TCA'][$table]['ctrl']['sortby'] && !$this->sortField && !$this->searchLevels) { if (isset($this->currentTable['prev'][$row['uid']])) { // Up $params = '&cmd[' . $table . '][' . $row['uid'] . '][move]=' . $this->currentTable['prev'][$row['uid']]; @@ -1099,19 +1108,19 @@ } // "Hide/Unhide" links: $hiddenField = $GLOBALS['TCA'][$table]['ctrl']['enablecolumns']['disabled']; - if ($permsEdit && $hiddenField && $GLOBALS['TCA'][$table]['columns'][$hiddenField] && (!$GLOBALS['TCA'][$table]['columns'][$hiddenField]['exclude'] || $GLOBALS['BE_USER']->check('non_exclude_fields', $table . ':' . $hiddenField))) { + if ($hasEditPermission && $hiddenField && $GLOBALS['TCA'][$table]['columns'][$hiddenField] && (!$GLOBALS['TCA'][$table]['columns'][$hiddenField]['exclude'] || $GLOBALS['BE_USER']->check('non_exclude_fields', $table . ':' . $hiddenField))) { if ($row[$hiddenField]) { $params = '&data[' . $table . '][' . $rowUid . '][' . $hiddenField . ']=0'; - $cells['hide'] = '' . IconUtility::getSpriteIcon('actions-edit-unhide') . ''; + $cells['hide'] = '' . IconUtility::getSpriteIcon('actions-edit-unhide') . ''; } else { $params = '&data[' . $table . '][' . $rowUid . '][' . $hiddenField . ']=1'; - $cells['hide'] = '' . IconUtility::getSpriteIcon('actions-edit-hide') . ''; + $cells['hide'] = '' . IconUtility::getSpriteIcon('actions-edit-hide') . ''; } } elseif (!$this->table) { $cells['hide'] = $this->spaceIcon; } // "Delete" link: - if ($table == 'pages' && $localCalcPerms & 4 || $table != 'pages' && $this->calcPerms & 16) { + if ($hasEditPermission) { // Check if the record version is in "deleted" state, because that will switch the action to "restore" if ($GLOBALS['BE_USER']->workspace > 0 && isset($row['t3ver_state']) && (int)$row['t3ver_state'] === 2) { $actionName = 'restore'; @@ -1146,7 +1155,7 @@ $cells['delete'] = $this->spaceIcon; } // "Levels" links: Moving pages into new levels... - if ($permsEdit && $table == 'pages' && !$this->searchLevels) { + if ($hasEditPermission && $isPagesTable && !$this->searchLevels) { // Up (Paste as the page right after the current parent page) if ($this->calcPerms & 8) { $params = '&cmd[' . $table . '][' . $row['uid'] . '][move]=' . -$this->id; @@ -1220,15 +1229,15 @@ $cells = array(); $cells['pasteAfter'] = ($cells['pasteInto'] = $this->spaceIcon); //enables to hide the copy, cut and paste icons for localized records - doesn't make much sense to perform these options for them - $isL10nOverlay = $this->localizationView && $table != 'pages_language_overlay' && $row[$GLOBALS['TCA'][$table]['ctrl']['transOrigPointerField']] != 0; + $isL10nOverlay = $this->localizationView && $table !== 'pages_language_overlay' && $row[$GLOBALS['TCA'][$table]['ctrl']['transOrigPointerField']] != 0; // Return blank, if disabled: // Whether a numeric clipboard pad is active or the normal pad we will see different content of the panel: // For the "Normal" pad: - if ($this->clipObj->current == 'normal') { + if ($this->clipObj->current === 'normal') { // Show copy/cut icons: $isSel = (string) $this->clipObj->isSelected($table, $row['uid']); - $cells['copy'] = $isL10nOverlay ? $this->spaceIcon : '' . (!$isSel == 'copy' ? IconUtility::getSpriteIcon('actions-edit-copy') : IconUtility::getSpriteIcon('actions-edit-copy-release')) . ''; - $cells['cut'] = $isL10nOverlay ? $this->spaceIcon : '' . (!$isSel == 'cut' ? IconUtility::getSpriteIcon('actions-edit-cut') : IconUtility::getSpriteIcon('actions-edit-cut-release')) . ''; + $cells['copy'] = $isL10nOverlay ? $this->spaceIcon : '' . (!$isSel === 'copy' ? IconUtility::getSpriteIcon('actions-edit-copy') : IconUtility::getSpriteIcon('actions-edit-copy-release')) . ''; + $cells['cut'] = $isL10nOverlay ? $this->spaceIcon : '' . (!$isSel === 'cut' ? IconUtility::getSpriteIcon('actions-edit-cut') : IconUtility::getSpriteIcon('actions-edit-cut-release')) . ''; } else { // For the numeric clipboard pads (showing checkboxes where one can select elements on/off) // Setting name of the element in ->CBnames array: @@ -1255,7 +1264,7 @@ } // Now, looking for elements in general: $elFromTable = $this->clipObj->elFromTable(''); - if ($table == 'pages' && count($elFromTable)) { + if ($table === 'pages' && count($elFromTable)) { $cells['pasteInto'] = '' . IconUtility::getSpriteIcon('actions-document-paste-into') . ''; } /** @@ -1442,15 +1451,15 @@ */ public function addSortLink($code, $field, $table) { // Certain circumstances just return string right away (no links): - if ($field == '_CONTROL_' || $field == '_LOCALIZATION_' || $field == '_CLIPBOARD_' || $field == '_REF_' || $this->disableSingleTableView) { + if ($field === '_CONTROL_' || $field === '_LOCALIZATION_' || $field === '_CLIPBOARD_' || $field === '_REF_' || $this->disableSingleTableView) { return $code; } // If "_PATH_" (showing record path) is selected, force sorting by pid field (will at least group the records!) - if ($field == '_PATH_') { + if ($field === '_PATH_') { $field = 'pid'; } // Create the sort link: - $sortUrl = $this->listURL('', -1, 'sortField,sortRev,table,firstElementNumber') . '&table=' . $table . '&sortField=' . $field . '&sortRev=' . ($this->sortRev || $this->sortField != $field ? 0 : 1); + $sortUrl = $this->listURL('', -1, 'sortField,sortRev,table,firstElementNumber') . '&table=' . $table . '&sortField=' . $field . '&sortRev=' . ($this->sortRev || $this->sortField !== $field ? 0 : 1); $sortArrow = $this->sortField === $field ? IconUtility::getSpriteIcon('status-status-sorting-' . ($this->sortRev ? 'desc' : 'asc')) : ''; // Return linked field: return '' . $code . $sortArrow . ''; @@ -1481,9 +1490,9 @@ */ public function showNewRecLink($table) { // No deny/allow tables are set: - if (!count($this->allowedNewTables) && !count($this->deniedNewTables)) { + if (empty($this->allowedNewTables) && empty($this->deniedNewTables)) { return TRUE; - } elseif (!in_array($table, $this->deniedNewTables) && (!count($this->allowedNewTables) || in_array($table, $this->allowedNewTables))) { + } elseif (!in_array($table, $this->deniedNewTables) && (empty($this->allowedNewTables) || in_array($table, $this->allowedNewTables))) { return TRUE; } else { return FALSE; Index: typo3_src/typo3/sysext/recordlist/Classes/RecordList/AbstractDatabaseRecordList.php IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- typo3_src/typo3/sysext/recordlist/Classes/RecordList/AbstractDatabaseRecordList.php (revision 8dad992c4dee4c20356cb1a1ac8d0a8cc65adbc8) +++ typo3_src/typo3/sysext/recordlist/Classes/RecordList/AbstractDatabaseRecordList.php (revision ) @@ -299,10 +299,11 @@ * @param string $search Search word, if any * @param integer $levels Number of levels to search down the page tree * @param integer $showLimit Limit of records to be listed. + * * @return void * @todo Define visibility */ - public function start($id, $table, $pointer, $search = '', $levels = '', $showLimit = 0) { + public function start($id, $table, $pointer, $search = '', $levels = 0, $showLimit = 0) { // Setting internal variables: // sets the parent id $this->id = (int)$id; @@ -312,10 +313,11 @@ } $this->firstElementNumber = $pointer; $this->searchString = trim($search); - $this->searchLevels = trim($levels); + // Set search levels: + $this->searchLevels = (int)$levels; $this->showLimit = \TYPO3\CMS\Core\Utility\MathUtility::forceIntegerInRange($showLimit, 0, 10000); // Setting GPvars: - $this->csvOutput = GeneralUtility::_GP('csv') ? TRUE : FALSE; + $this->csvOutput = (bool)GeneralUtility::_GP('csv'); $this->sortField = GeneralUtility::_GP('sortField'); $this->sortRev = GeneralUtility::_GP('sortRev'); $this->displayFields = GeneralUtility::_GP('displayFields'); @@ -334,8 +336,6 @@ if (isset($this->modTSconfig['properties']['itemsLimitSingleTable'])) { $this->itemsLimitSingleTable = \TYPO3\CMS\Core\Utility\MathUtility::forceIntegerInRange((int)$this->modTSconfig['properties']['itemsLimitSingleTable'], 1, 10000); } - // Set search levels: - $searchLevels = (int)$this->searchLevels; $this->perms_clause = $GLOBALS['BE_USER']->getPagePermsClause(1); // This will hide records from display - it has nothing todo with user rights!! if ($pidList = $GLOBALS['BE_USER']->getTSConfigVal('options.hideRecords.pages')) { @@ -360,11 +360,11 @@ \TYPO3\CMS\Core\Utility\HttpUtility::redirect($returnUrl); } } - if ($searchLevels > 0) { - $allowedMounts = $this->getSearchableWebmounts($this->id, $searchLevels, $this->perms_clause); + if ($this->searchLevels > 0) { + $allowedMounts = $this->getSearchableWebmounts($this->id, $this->searchLevels, $this->perms_clause); $pidList = implode(',', $GLOBALS['TYPO3_DB']->cleanIntArray($allowedMounts)); $this->pidSelect = 'pid IN (' . $pidList . ')'; - } elseif ($searchLevels < 0) { + } elseif ($this->searchLevels < 0) { // Search everywhere $this->pidSelect = '1=1'; } else { @@ -391,16 +391,16 @@ foreach ($GLOBALS['TCA'] as $tableName => $value) { // Checking if the table should be rendered: // Checks that we see only permitted/requested tables: - if ((!$this->table || $tableName == $this->table) && (!$this->tableList || GeneralUtility::inList($this->tableList, $tableName)) && $GLOBALS['BE_USER']->check('tables_select', $tableName)) { + if ((!$this->table || $tableName === $this->table) && (!$this->tableList || GeneralUtility::inList($this->tableList, $tableName)) && $GLOBALS['BE_USER']->check('tables_select', $tableName)) { // Don't show table if hidden by TCA ctrl section - $hideTable = $GLOBALS['TCA'][$tableName]['ctrl']['hideTable'] ? TRUE : FALSE; + $hideTable = (bool)$GLOBALS['TCA'][$tableName]['ctrl']['hideTable']; // Don't show table if hidden by pageTSconfig mod.web_list.hideTables if (in_array($tableName, GeneralUtility::trimExplode(',', $this->hideTables))) { $hideTable = TRUE; } // Override previous selection if table is enabled or hidden by TSconfig TCA override mod.web_list.table if (isset($this->tableTSconfigOverTCA[$tableName . '.']['hideTable'])) { - $hideTable = $this->tableTSconfigOverTCA[$tableName . '.']['hideTable'] ? TRUE : FALSE; + $hideTable = (bool)$this->tableTSconfigOverTCA[$tableName . '.']['hideTable']; } if ($hideTable) { continue; @@ -446,7 +446,7 @@ * @return string HTML for the search box * @todo Define visibility */ - public function getSearchBox($formFields = 1) { + public function getSearchBox($formFields = TRUE) { // Setting form-elements, if applicable: $formElements = array('', ''); if ($formFields) { @@ -475,7 +475,7 @@