Commit 920bc275 authored by Andreas Fernandez's avatar Andreas Fernandez Committed by Christian Kuhn
Browse files

[CLEANUP] Fix case mismatch of functions / methods

Resolves: #75433
Releases: master
Change-Id: Ic73beb093efc5c0648d2ea6e66286b0a6b439e4e
Reviewed-on: https://review.typo3.org/47526

Reviewed-by: Wouter Wolters's avatarWouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Christian Kuhn's avatarChristian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn's avatarChristian Kuhn <lolli@schwarzbu.ch>
parent b522d7d3
......@@ -1113,7 +1113,7 @@ class ClickMenu
$isSel = '';
// Pseudo table name for use in the clipboard.
$table = '_FILE';
$uid = GeneralUtility::shortmd5($path);
$uid = GeneralUtility::shortMD5($path);
if ($this->clipObj->current === 'normal') {
$isSel = $this->clipObj->isSelected($table, $uid);
}
......
......@@ -427,7 +427,7 @@ class Clipboard
<td nowrap="nowrap" width="95%">' . $this->linkItemText(htmlspecialchars(GeneralUtility::fixed_lgd_cs($fileObject->getName(), $this->getBackendUser()->uc['titleLen'])), $fileObject->getName()) . ($pad == 'normal' ? ' <strong>(' . ($this->clipData['normal']['mode'] == 'copy' ? $this->clLabel('copy', 'cm') : $this->clLabel('cut', 'cm')) . ')</strong>' : '') . '&nbsp;' . $thumb . '</td>
<td nowrap="nowrap" class="col-control">
<div class="btn-group">
<a class="btn btn-default" href="#" onclick="' . htmlspecialchars(('top.launchView(' . GeneralUtility::quoteJSvalue($table) . ', ' . GeneralUtility::quoteJSvalue($v) . '); return false;')) . '"title="' . $this->clLabel('info', 'cm') . '">' . $this->iconFactory->getIcon('actions-document-info', Icon::SIZE_SMALL)->render() . '</a>' . '<a class="btn btn-default" href="' . htmlspecialchars($this->removeUrl('_FILE', GeneralUtility::shortmd5($v))) . '#clip_head" title="' . $this->clLabel('removeItem') . '">' . $this->iconFactory->getIcon('actions-selection-delete', Icon::SIZE_SMALL)->render() . '</a>
<a class="btn btn-default" href="#" onclick="' . htmlspecialchars(('top.launchView(' . GeneralUtility::quoteJSvalue($table) . ', ' . GeneralUtility::quoteJSvalue($v) . '); return false;')) . '"title="' . $this->clLabel('info', 'cm') . '">' . $this->iconFactory->getIcon('actions-document-info', Icon::SIZE_SMALL)->render() . '</a>' . '<a class="btn btn-default" href="' . htmlspecialchars($this->removeUrl('_FILE', GeneralUtility::shortMD5($v))) . '#clip_head" title="' . $this->clLabel('removeItem') . '">' . $this->iconFactory->getIcon('actions-selection-delete', Icon::SIZE_SMALL)->render() . '</a>
</div>
</td>
</tr>';
......@@ -606,7 +606,7 @@ class Clipboard
*/
public function selUrlFile($path, $copy = 0, $deselect = 0, $baseArray = array())
{
$CB = array('el' => array(rawurlencode('_FILE|' . GeneralUtility::shortmd5($path)) => $deselect ? '' : $path));
$CB = array('el' => array(rawurlencode('_FILE|' . GeneralUtility::shortMD5($path)) => $deselect ? '' : $path));
if ($copy) {
$CB['setCopyMode'] = 1;
}
......
......@@ -213,9 +213,9 @@ class TranslationConfigurationProvider
protected function getDefaultLanguageLabel(array $modSharedTSconfig)
{
if (strlen($modSharedTSconfig['properties']['defaultLanguageLabel'])) {
$defaultLanguageLabel = $modSharedTSconfig['properties']['defaultLanguageLabel'] . ' (' . $this->getLanguageService()->sl('LLL:EXT:lang/locallang_mod_web_list.xlf:defaultLanguage') . ')';
$defaultLanguageLabel = $modSharedTSconfig['properties']['defaultLanguageLabel'] . ' (' . $this->getLanguageService()->sL('LLL:EXT:lang/locallang_mod_web_list.xlf:defaultLanguage') . ')';
} else {
$defaultLanguageLabel = $this->getLanguageService()->sl('LLL:EXT:lang/locallang_mod_web_list.xlf:defaultLanguage');
$defaultLanguageLabel = $this->getLanguageService()->sL('LLL:EXT:lang/locallang_mod_web_list.xlf:defaultLanguage');
}
return $defaultLanguageLabel;
}
......
......@@ -172,7 +172,7 @@ class RenameFileController extends AbstractModule
// back button
if ($this->returnUrl) {
$backButton = $buttonBar->makeLinkButton()
->sethref($this->returnUrl)
->setHref($this->returnUrl)
->setTitle($this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.goBack'))
->setIcon($this->moduleTemplate->getIconFactory()->getIcon('actions-view-go-back', Icon::SIZE_SMALL));
$buttonBar->addButton($backButton);
......
......@@ -385,7 +385,7 @@ class ColorpickerController extends AbstractWizardController
*/
public function getIndex($im, $x, $y)
{
$rgb = ImageColorAt($im, $x, $y);
$rgb = imagecolorat($im, $x, $y);
$colorRgb = imagecolorsforindex($im, $rgb);
$index['r'] = dechex($colorRgb['red']);
$index['g'] = dechex($colorRgb['green']);
......
......@@ -44,7 +44,7 @@ class FlexFormContainerContainer extends AbstractContainer
$parameterArray = $this->data['parameterArray'];
// Every container adds its own part to the id prefix
$flexFormFieldIdentifierPrefix = $flexFormFieldIdentifierPrefix . '-' . GeneralUtility::shortMd5(uniqid('id', true));
$flexFormFieldIdentifierPrefix = $flexFormFieldIdentifierPrefix . '-' . GeneralUtility::shortMD5(uniqid('id', true));
$iconFactory = GeneralUtility::makeInstance(IconFactory::class);
$toggleIcons = '<span class="t3js-flex-control-toggle-icon-open" style="' . ($flexFormContainerElementCollapsed ? 'display: none;' : '') . '">'
......
......@@ -55,7 +55,7 @@ class FlexFormSectionContainer extends AbstractContainer
// Creating IDs for form fields:
// It's important that the IDs "cascade" - otherwise we can't dynamically expand the flex form
// because this relies on simple string substitution of the first parts of the id values.
$flexFormFieldIdentifierPrefix = $flexFormFieldIdentifierPrefix . '-' . GeneralUtility::shortMd5(uniqid('id', true));
$flexFormFieldIdentifierPrefix = $flexFormFieldIdentifierPrefix . '-' . GeneralUtility::shortMD5(uniqid('id', true));
// Render each existing container
foreach ($flexFormRowData as $flexFormContainerCounter => $existingSectionContainerData) {
......
......@@ -134,7 +134,7 @@ abstract class AbstractFormElement extends AbstractNode
$fieldChangeFunc = $PA['fieldChangeFunc'];
$item = $itemKinds[0];
$md5ID = 'ID' . GeneralUtility::shortmd5($itemName);
$md5ID = 'ID' . GeneralUtility::shortMD5($itemName);
$prefixOfFormElName = 'data[' . $table . '][' . $row['uid'] . '][' . $field . ']';
$flexFormPath = '';
if (GeneralUtility::isFirstPartOfStr($PA['itemFormElName'], $prefixOfFormElName)) {
......
......@@ -156,7 +156,7 @@ class CheckboxElement extends AbstractFormElement
*/
protected function checkBoxParams($itemName, $formElementValue, $checkbox, $checkboxesCount, $additionalJavaScript = '')
{
$elementName = 'document.editform[' . Generalutility::quoteJSvalue($itemName) . ']';
$elementName = 'document.editform[' . GeneralUtility::quoteJSvalue($itemName) . ']';
$checkboxPow = pow(2, $checkbox);
$onClick = $elementName . '.value=this.checked?(' . $elementName . '.value|' . $checkboxPow . '):('
. $elementName . '.value&' . (pow(2, $checkboxesCount) - 1 - $checkboxPow) . ');' . $additionalJavaScript;
......
......@@ -694,7 +694,7 @@ abstract class AbstractItemProvider
}
// Get all sheets and title
foreach ($flexForms as $extIdent => $extConf) {
$extTitle = $languageService->sl(trim($extConf['title']));
$extTitle = $languageService->sL(trim($extConf['title']));
// Get all fields in sheet
foreach ($extConf['ds']['sheets'] as $sheetName => $sheet) {
if (empty($sheet['ROOT']['el']) || !is_array($sheet['ROOT']['el'])) {
......
......@@ -60,7 +60,7 @@ class TcaInputPlaceholders implements FormDataProviderInterface
// Resolve placeholders from language files
if (StringUtility::beginsWith($fieldConfig['config']['placeholder'], 'LLL:')) {
$result['processedTca']['columns'][$fieldName]['config']['placeholder'] = $this->getLanguageService()->sl($fieldConfig['config']['placeholder']);
$result['processedTca']['columns'][$fieldName]['config']['placeholder'] = $this->getLanguageService()->sL($fieldConfig['config']['placeholder']);
}
// Remove empty placeholders
......
......@@ -256,7 +256,7 @@ class FormResultCompiler
$pageRenderer->loadRequireJsModule('TYPO3/CMS/Filelist/FileListLocalisation');
$pageRenderer->addInlineLanguagelabelFile(
$pageRenderer->addInlineLanguageLabelFile(
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('lang') . 'locallang_core.xlf',
'file_upload'
);
......
......@@ -463,7 +463,7 @@ class RecordHistory
// Re-write field names with labels
$tmpFieldList = explode(',', $entry['fieldlist']);
foreach ($tmpFieldList as $key => $value) {
$tmp = str_replace(':', '', $languageService->sl(BackendUtility::getItemLabel($entry['tablename'], $value), true));
$tmp = str_replace(':', '', $languageService->sL(BackendUtility::getItemLabel($entry['tablename'], $value), true));
if ($tmp) {
$tmpFieldList[$key] = $tmp;
} else {
......@@ -567,7 +567,7 @@ class RecordHistory
);
$lines[] = array(
'title' => ($rollbackUid ? $this->createRollbackLink(($table . ':' . $rollbackUid . ':' . $fN), $languageService->getLL('revertField', true), 2) : '') . '
' . $languageService->sl(BackendUtility::getItemLabel($table, $fN), true),
' . $languageService->sL(BackendUtility::getItemLabel($table, $fN), true),
'result' => str_replace('\n', PHP_EOL, str_replace('\r\n', '\n', $diffres))
);
}
......
......@@ -173,7 +173,7 @@ abstract class AbstractFunctionModule
$this->pObj = $pObj;
// Path of this script:
$reflector = new \ReflectionObject($this);
$this->thisPath = dirname($reflector->getFilename());
$this->thisPath = dirname($reflector->getFileName());
if (!@is_dir($this->thisPath)) {
throw new \RuntimeException('TYPO3 Fatal Error: Could not find path for class ' . get_class($this), 1381164687);
}
......
......@@ -481,7 +481,7 @@ abstract class AbstractRecordList
if ($launchViewParameter !== '') {
$htmlCode .= ' onclick="' . htmlspecialchars(('top.launchView(' . $launchViewParameter . '); return false;')) . '"';
}
$htmlCode .= ' title="' . htmlspecialchars($this->getLanguageService()->sl('LLL:EXT:backend/Resources/Private/Language/locallang.xlf:show_references') . ' (' . $references . ')') . '">';
$htmlCode .= ' title="' . htmlspecialchars($this->getLanguageService()->sL('LLL:EXT:backend/Resources/Private/Language/locallang.xlf:show_references') . ' (' . $references . ')') . '">';
$htmlCode .= $references;
$htmlCode .= '</a>';
}
......
......@@ -192,7 +192,7 @@ class ExtdirectTreeDataProvider extends \TYPO3\CMS\Backend\Tree\AbstractExtJsTre
'dropZoneElementRemoved' => $GLOBALS['LANG']->sL($file . 'tree.dropZoneElementRemoved', true),
'dropZoneElementRestored' => $GLOBALS['LANG']->sL($file . 'tree.dropZoneElementRestored', true),
'searchTermInfo' => $GLOBALS['LANG']->sL($file . 'tree.searchTermInfo', true),
'temporaryMountPointIndicatorInfo' => $GLOBALS['LANG']->sl($file . 'labels.temporaryDBmount', true),
'temporaryMountPointIndicatorInfo' => $GLOBALS['LANG']->sL($file . 'labels.temporaryDBmount', true),
'deleteDialogTitle' => $GLOBALS['LANG']->sL('LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:deleteItem', true),
'deleteDialogMessage' => $GLOBALS['LANG']->sL('LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:deleteWarning', true),
'recursiveDeleteDialogMessage' => $GLOBALS['LANG']->sL('LLL:EXT:backend/Resources/Private/Language/locallang_layout.xlf:recursiveDeleteWarning', true)
......
......@@ -219,7 +219,7 @@ class FolderTreeView extends AbstractTreeView
*/
public function getId($folderObject)
{
return GeneralUtility::md5Int($folderObject->getCombinedIdentifier());
return GeneralUtility::md5int($folderObject->getCombinedIdentifier());
}
/**
......
......@@ -119,7 +119,7 @@ class PermissionController extends ActionController
parent::initializeView($view);
$view->assign(
'previewUrl',
BackendUtility::viewonclick(
BackendUtility::viewOnClick(
$this->pageInfo['uid'], '',
BackendUtility::BEgetRootLine($this->pageInfo['uid'])
)
......
......@@ -421,7 +421,7 @@ class RedisBackend extends AbstractBackend implements TaggableBackendInterface
public function flush()
{
if ($this->connected) {
$this->redis->flushdb();
$this->redis->flushDB();
}
}
......
......@@ -1145,7 +1145,7 @@ class QueryGenerator
$out[] = '<option value=""></option>';
foreach ($GLOBALS['TCA'] as $tN => $value) {
if ($this->getBackendUserAuthentication()->check('tables_select', $tN)) {
$out[] = '<option value="' . htmlspecialchars($tN) . '"' . ($tN === $cur ? ' selected' : '') . '>' . htmlspecialchars($this->getLanguageService()->sl($GLOBALS['TCA'][$tN]['ctrl']['title'])) . '</option>';
$out[] = '<option value="' . htmlspecialchars($tN) . '"' . ($tN === $cur ? ' selected' : '') . '>' . htmlspecialchars($this->getLanguageService()->sL($GLOBALS['TCA'][$tN]['ctrl']['title'])) . '</option>';
}
}
$out[] = '</select>';
......
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