Commit 09cbaf2d authored by Claus Due's avatar Claus Due Committed by Wouter Wolters
Browse files

[TASK] Fix CGL errors

Change-Id: Ibd5f4905f273921a1377a6c2113f69ba4063c4b2
Resolves: #71612
Releases: master
Reviewed-on: https://review.typo3.org/44740


Reviewed-by: Benni Mack's avatarBenni Mack <benni@typo3.org>
Tested-by: Benni Mack's avatarBenni Mack <benni@typo3.org>
Reviewed-by: Wouter Wolters's avatarWouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters's avatarWouter Wolters <typo3@wouterwolters.nl>
parent b97bf023
......@@ -578,11 +578,12 @@ class ShortcutToolbarItem implements ToolbarItemInterface
$resourceFactory = ResourceFactory::getInstance();
$resource = $resourceFactory->getObjectFromCombinedIdentifier($queryParameters['id']);
$shortcutName = trim($shortcutNamePrepend . ' ' . $resource->getName());
} catch (ResourceDoesNotExistException $e) {}
} catch (ResourceDoesNotExistException $e) {
}
} else {
// Lookup the title of this page and use it as default description
$pageId = (int)($shortcut['pid'] ?: ($shortcut['recordid'] ?: $this->getLinkedPageId($url)));
$page = FALSE;
$page = false;
if ($pageId) {
$page = BackendUtility::getRecord('pages', $pageId);
}
......
......@@ -94,8 +94,8 @@ class BackendLayoutWizardController extends AbstractModule
'moduleUrl',
BackendUtility::getModuleUrl(
'help_CshmanualCshmanual',
array (
'tx_cshmanual_help_cshmanualcshmanual' => array (
array(
'tx_cshmanual_help_cshmanualcshmanual' => array(
'controller' => 'Help',
'action' => 'detail'
)
......
......@@ -179,6 +179,4 @@ class ElementHistoryController extends AbstractModule
{
return $GLOBALS['BE_USER'];
}
}
......@@ -1244,7 +1244,7 @@ class EditDocumentController extends AbstractModule
);
}
if (!in_array((int)$this->pageinfo['doktype'], $excludeDokTypes, true)
|| isset($pagesTSconfig['TCEMAIN.']['preview.'][$this->firstEl['table'].'.']['previewPageId'])
|| isset($pagesTSconfig['TCEMAIN.']['preview.'][$this->firstEl['table'] . '.']['previewPageId'])
) {
$saveAndOpenButton = $buttonBar->makeInputButton()
->setTitle($lang->sL('LLL:EXT:lang/locallang_core.xlf:rm.saveDocShow', true))
......@@ -1617,7 +1617,6 @@ class EditDocumentController extends AbstractModule
$menuItem->setActive(true);
}
$languageMenu->addMenuItem($menuItem);
}
}
$this->moduleTemplate->getDocHeaderComponent()->getMenuRegistry()->addMenu($languageMenu);
......
......@@ -187,7 +187,6 @@ class EditFileController extends AbstractModule
<input type="hidden" name="redirect" value="' . htmlspecialchars($hValue) . '" />
</div>
<br />';
} catch (\Exception $e) {
$code .= sprintf(
$this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:file_edit.php.coundNot'),
......@@ -289,7 +288,6 @@ class EditFileController extends AbstractModule
->setModuleName('file_edit')
->setGetVariables(['target']);
$buttonBar->addButton($shortButton);
}
/**
......
......@@ -26,7 +26,6 @@ use Psr\Http\Message\ServerRequestInterface;
*/
class RenameFileController extends AbstractModule
{
/**
* Name of the filemount
*
......@@ -125,7 +124,6 @@ class RenameFileController extends AbstractModule
'RenameFileInlineJavaScript',
'function backToList() {top.goToModule("file_FilelistList");}'
);
}
/**
......
......@@ -31,7 +31,6 @@ use Psr\Http\Message\ServerRequestInterface;
*/
class ReplaceFileController extends AbstractModule
{
/**
* Document template object
*
......
......@@ -31,7 +31,6 @@ use TYPO3\CMS\Recordlist\Tree\View\DummyLinkParameterProvider;
*/
class FileSystemNavigationFrameController
{
/**
* Content accumulates in this variable.
*
......
......@@ -405,7 +405,6 @@ class FormInlineAjaxController
}
$jsonArray['scriptCall'][] = 'inline.fadeAndRemove(' . GeneralUtility::quoteJSvalue($nameObjectForeignTable . '-' . $transOrigPointerField . '_div') . ');';
}
}
// Tell JS to add new HTML of one or multiple (localize all) records to DOM
if (!empty($jsonArray['data'])) {
......@@ -768,7 +767,7 @@ class FormInlineAjaxController
if (!isset($parts[2]) || strpos($parts[2], ':') === false) {
throw new \UnexpectedValueException(
'DOM Object ID' . $domObjectId. 'does not contain required information '
'DOM Object ID' . $domObjectId . 'does not contain required information '
. 'to extract inline field configuration.',
1446996136
);
......
......@@ -25,8 +25,8 @@ use TYPO3\CMS\Recordlist\Controller\AbstractLinkBrowserController;
/**
* Extended controller for link browser
*/
class LinkBrowserController extends AbstractLinkBrowserController {
class LinkBrowserController extends AbstractLinkBrowserController
{
/**
* Initialize $this->currentLinkParts
*
......@@ -161,5 +161,4 @@ class LinkBrowserController extends AbstractLinkBrowserController {
}
return (int)$pageId;
}
}
......@@ -297,4 +297,4 @@ class LocalizationController
{
return $GLOBALS['TYPO3_DB'];
}
}
\ No newline at end of file
}
......@@ -49,7 +49,6 @@ use TYPO3\CMS\Recordlist\RecordList;
*/
class PageLayoutController
{
/**
* Page Id for which to make the listing
*
......@@ -670,7 +669,6 @@ class PageLayoutController
$this->makeButtons($this->MOD_SETTINGS['function'] == 0 ? 'quickEdit' : '');
// Create LanguageMenu
$this->makeLanguageMenu();
} else {
$this->moduleTemplate->addJavaScriptCode(
'mainJsFunctions',
......@@ -812,7 +810,7 @@ class PageLayoutController
}
$redirect = ($uidVal == 'new' ? BackendUtility::getModuleUrl(
$this->moduleName,
['id' => $this->id,'new_unique_uid' => $new_unique_uid,'returnUrl' => $this->returnUrl]
['id' => $this->id, 'new_unique_uid' => $new_unique_uid, 'returnUrl' => $this->returnUrl]
) : $this->R_URI);
$panel .= '
<input type="hidden" name="_serialNumber" value="' . md5(microtime()) . '" />
......@@ -1220,7 +1218,6 @@ class PageLayoutController
->setIcon($this->iconFactory->getIcon('actions-document-history-open', Icon::SIZE_SMALL));
$this->buttonBar->addButton($historyButton, ButtonBar::BUTTON_POSITION_LEFT, 3);
}
}
}
}
......
......@@ -165,7 +165,8 @@ class TableController extends AbstractWizardController
. '<div>' . $this->tableWizard() . '</div>';
} else {
$this->content .= '<h2>' . $this->getLanguageService()->getLL('table_title', true) . '</h2>'
. '<div><span class="text-danger">' . $this->getLanguageService()->getLL('table_noData', true) . '</span></div>';;
. '<div><span class="text-danger">' . $this->getLanguageService()->getLL('table_noData', true) . '</span></div>';
;
}
$this->content .= '</form>';
// Setting up the buttons and markers for docHeader
......
......@@ -104,5 +104,4 @@ class TabsContainer extends AbstractContainer
{
return $GLOBALS['LANG'];
}
}
......@@ -26,7 +26,6 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
*/
class SelectTreeElement extends AbstractFormElement
{
/**
* Default height of the tree in pixels.
*
......
......@@ -22,7 +22,6 @@ use TYPO3\CMS\Core\Utility\ArrayUtility;
*/
class InlineOverrideChildTca implements FormDataProviderInterface
{
/**
* Inline parent TCA may override some TCA of children.
*
......
......@@ -22,7 +22,6 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
*/
class TcaColumnsProcessCommon implements FormDataProviderInterface
{
/**
* Determine which common fields are in use and add those to the list of
* columns that must be processed by the next data providers. Common fields
......
......@@ -436,7 +436,6 @@ class TcaFlexProcess implements FormDataProviderInterface
} else {
$tcaNewColumns[$dataStructureSheetElementName] = $dataStructureSheetElementDefinition;
}
} // End of single element handling
}
......
......@@ -30,7 +30,6 @@ use TYPO3\CMS\Core\Imaging\IconFactory;
*/
class MetaInformation
{
/**
* The recordArray.
* Typically this is a page record
......
......@@ -35,7 +35,6 @@ use TYPO3\CMS\Fluid\View\StandaloneView;
*/
class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRecordList
{
/**
* If TRUE, users/groups are shown in the page info box.
*
......@@ -221,14 +220,13 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe
$pageRenderer->addInlineLanguageLabelFile('EXT:backend/Resources/Private/Language/locallang_layout.xlf');
$pageRenderer->loadRequireJsModule('TYPO3/CMS/Backend/Tooltip');
$pageRenderer->loadRequireJsModule('TYPO3/CMS/Backend/Localization');
}
/*****************************************
*
* Renderings
*
*****************************************/
*****************************************/
/**
* Adds the code of a single table
*
......@@ -840,7 +838,7 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe
*
* Generic listing of items
*
**********************************/
**********************************/
/**
* Creates a standard list of elements from a table.
*
......@@ -1043,7 +1041,7 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe
*
* Additional functions; Pages
*
**********************************/
**********************************/
/**
* Adds pages-rows to an array, selecting recursively in the page tree.
*
......@@ -1162,7 +1160,7 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe
*
* Additional functions; Content Elements
*
**********************************/
**********************************/
/**
* Draw header for a content element column:
*
......@@ -1375,7 +1373,7 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe
// NOTE: end-tag for <div class="t3-page-ce-body"> is in getTable_tt_content()
return '<div class="t3-page-ce-header ' . ($allowDragAndDrop ? 't3-page-ce-header-draggable t3js-page-ce-draghandle' : '') . '">
<div class="t3-page-ce-header-icons-left">' . implode('', $additionalIcons) . '</div>
<div class="t3-page-ce-header-icons-right">' . ($out ? '<div class="btn-toolbar">' .$out . '</div>' : '') . '</div>
<div class="t3-page-ce-header-icons-right">' . ($out ? '<div class="btn-toolbar">' . $out . '</div>' : '') . '</div>
</div>
<div class="t3-page-ce-body">';
}
......@@ -1627,7 +1625,7 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe
foreach ($uidList as $uid) {
$uid = (int)$uid;
$record = BackendUtility::getRecord($table, $uid, 'title');
$content .= '<br>' . $record['title'] . ' (' .$uid. ')';
$content .= '<br>' . $record['title'] . ' (' . $uid . ')';
}
return $content;
}
......@@ -1801,7 +1799,7 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe
// If any languages are left, make selector:
if (count($langSelItems) > 1) {
$url = BackendUtility::getModuleUrl('record_edit', array(
'edit[pages_language_overlay]['. $id . ']' => 'new',
'edit[pages_language_overlay][' . $id . ']' => 'new',
'overrideVals[pages_language_overlay][doktype]' => (int)$this->pageRecord['doktype'],
'returnUrl' => GeneralUtility::getIndpEnv('REQUEST_URI')
));
......@@ -1846,7 +1844,7 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe
*
* Various helper functions
*
********************************/
********************************/
/**
* Initializes the clipboard for generating paste links
......@@ -2050,7 +2048,7 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe
*
* External renderings
*
*****************************************/
*****************************************/
/**
* Creates a menu of the tables that can be listed by this function
......@@ -2092,7 +2090,7 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe
// ... and to the internal array, activeTables we also add table icon and title (for use elsewhere)
$title = $this->getLanguageService()->sL($GLOBALS['TCA'][$tName]['ctrl']['title'], true)
. ': ' . $c . ' ' . $this->getLanguageService()->getLL('records', true);
$this->activeTables[$tName] = '<span title="' . $title. '">'
$this->activeTables[$tName] = '<span title="' . $title . '">'
. $this->iconFactory->getIconForRecord($tName, array(), Icon::SIZE_SMALL)->render()
. '</span>'
. '&nbsp;' . $this->getLanguageService()->sL($GLOBALS['TCA'][$tName]['ctrl']['title'], true);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment