[TASK] Cleanup CSH calls 87/33987/4
authorBenjamin Mack <benni@typo3.org>
Tue, 11 Nov 2014 15:50:13 +0000 (16:50 +0100)
committerWouter Wolters <typo3@wouterwolters.nl>
Thu, 13 Nov 2014 14:07:42 +0000 (15:07 +0100)
Due to a BackendUtility cleanup
there were some methods related to help
texts that were broken and unstructured.

Additionally, some methods are deprecated
for removal as they haven't been used since
TYPO3 CMS 4.5.

Resolves: #62864
Releases: master
Change-Id: I3e51e25d74b282aa698df493fa4f87a54d87f823
Reviewed-on: http://review.typo3.org/33987
Reviewed-by: Christian Buelter <buelter@kennziffer.com>
Tested-by: Christian Buelter <buelter@kennziffer.com>
Reviewed-by: Frank Nägler <typo3@naegler.net>
Tested-by: Frank Nägler <typo3@naegler.net>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
34 files changed:
typo3/sysext/backend/Classes/Controller/ContentElement/ElementHistoryController.php
typo3/sysext/backend/Classes/Controller/ContentElement/MoveElementController.php
typo3/sysext/backend/Classes/Controller/ContentElement/NewContentElementController.php
typo3/sysext/backend/Classes/Controller/EditDocumentController.php
typo3/sysext/backend/Classes/Controller/File/CreateFolderController.php
typo3/sysext/backend/Classes/Controller/File/EditFileController.php
typo3/sysext/backend/Classes/Controller/File/FileUploadController.php
typo3/sysext/backend/Classes/Controller/File/RenameFileController.php
typo3/sysext/backend/Classes/Controller/FileSystemNavigationFrameController.php
typo3/sysext/backend/Classes/Controller/NewRecordController.php
typo3/sysext/backend/Classes/Controller/PageLayoutController.php
typo3/sysext/backend/Classes/Controller/PageTreeNavigationController.php
typo3/sysext/backend/Classes/Controller/Wizard/FormsController.php
typo3/sysext/backend/Classes/Controller/Wizard/TableController.php
typo3/sysext/backend/Classes/Utility/BackendUtility.php
typo3/sysext/backend/Classes/View/PageLayoutView.php
typo3/sysext/core/Documentation/Changelog/master/Deprecation-62864-HelpTextIcon.rst [new file with mode: 0644]
typo3/sysext/filelist/Classes/Controller/FileListController.php
typo3/sysext/fluid/Classes/ViewHelpers/Be/Buttons/CshViewHelper.php
typo3/sysext/form/Classes/View/Wizard/WizardView.php
typo3/sysext/frontend/Classes/Controller/PageInformationController.php
typo3/sysext/frontend/Classes/Controller/TranslationStatusController.php
typo3/sysext/func/Classes/Controller/PageFunctionsController.php
typo3/sysext/impexp/Classes/Controller/ImportExportController.php
typo3/sysext/info/Classes/Controller/InfoModuleController.php
typo3/sysext/info_pagetsconfig/Classes/Controller/InfoPageTyposcriptConfigController.php
typo3/sysext/linkvalidator/Classes/Report/LinkValidatorReport.php
typo3/sysext/perm/Classes/Controller/PermissionModuleController.php
typo3/sysext/recordlist/Classes/RecordList/DatabaseRecordList.php
typo3/sysext/recycler/Classes/Controller/RecyclerModuleController.php
typo3/sysext/setup/Classes/Controller/SetupModuleController.php
typo3/sysext/taskcenter/Classes/Controller/TaskModuleController.php
typo3/sysext/wizard_crpages/Classes/Controller/CreatePagesWizardModuleFunctionController.php
typo3/sysext/wizard_sortpages/Classes/View/SortPagesWizardModuleFunction.php

index da90726..dd9203c 100644 (file)
@@ -101,7 +101,7 @@ class ElementHistoryController {
                        'back' => ''
                );
                // CSH
-               $buttons['csh'] = \TYPO3\CMS\Backend\Utility\BackendUtility::cshItem('xMOD_csh_corebe', 'history_log', $GLOBALS['BACK_PATH'], '', TRUE);
+               $buttons['csh'] = \TYPO3\CMS\Backend\Utility\BackendUtility::cshItem('xMOD_csh_corebe', 'history_log');
                // Start history object
                $historyObj = GeneralUtility::makeInstance(\TYPO3\CMS\Backend\History\RecordHistory::class);
                if ($historyObj->returnUrl) {
index 4cf3784..1b15771 100644 (file)
@@ -246,9 +246,9 @@ class MoveElementController {
                );
                if ($this->page_id) {
                        if ((string)$this->table == 'pages') {
-                               $buttons['csh'] = BackendUtility::cshItem('xMOD_csh_corebe', 'move_el_pages', $GLOBALS['BACK_PATH'], '', TRUE);
+                               $buttons['csh'] = BackendUtility::cshItem('xMOD_csh_corebe', 'move_el_pages');
                        } elseif ((string)$this->table == 'tt_content') {
-                               $buttons['csh'] = BackendUtility::cshItem('xMOD_csh_corebe', 'move_el_cs', $GLOBALS['BACK_PATH'], '', TRUE);
+                               $buttons['csh'] = BackendUtility::cshItem('xMOD_csh_corebe', 'move_el_cs');
                        }
                        if ($this->R_URI) {
                                $buttons['back'] = '<a href="' . htmlspecialchars($this->R_URI) . '" class="typo3-goBack" title="' . $GLOBALS['LANG']->getLL('goBack', TRUE) . '">' . IconUtility::getSpriteIcon('actions-view-go-back') . '</a>';
index 556a693..d0b07b7 100644 (file)
@@ -312,7 +312,7 @@ class NewContentElementController {
                        'back' => ''
                );
                if ($this->id && $this->access) {
-                       $buttons['csh'] = BackendUtility::cshItem('xMOD_csh_corebe', 'new_ce', $GLOBALS['BACK_PATH'], '', TRUE);
+                       $buttons['csh'] = BackendUtility::cshItem('xMOD_csh_corebe', 'new_ce');
                        if ($this->R_URI) {
                                $buttons['back'] = '<a href="' . htmlspecialchars($this->R_URI) . '" class="typo3-goBack" title="' . $GLOBALS['LANG']->getLL('goBack', TRUE) . '">' . IconUtility::getSpriteIcon('actions-view-go-back') . '</a>';
                        }
index a183001..c48fa73 100644 (file)
@@ -1052,7 +1052,7 @@ class EditDocumentController {
                        }
                }
                // add the CSH icon
-               $buttons['csh'] = BackendUtility::cshItem('xMOD_csh_corebe', 'TCEforms', $GLOBALS['BACK_PATH'], '', TRUE);
+               $buttons['csh'] = BackendUtility::cshItem('xMOD_csh_corebe', 'TCEforms');
                $buttons['shortcut'] = $this->shortCutLink();
                $buttons['open_in_new_window'] = $this->openInNewWindowLink();
                return $buttons;
index 5785fc3..9ac8803 100644 (file)
@@ -184,7 +184,7 @@ class CreateFolderController {
                                </div>
                                ';
                        // CSH:
-                       $code .= BackendUtility::cshItem('xMOD_csh_corebe', 'file_newfolder', $GLOBALS['BACK_PATH'], '<br />');
+                       $code .= BackendUtility::cshItem('xMOD_csh_corebe', 'file_newfolder', NULL, '<br />');
                        $pageContent .= $code;
                        // Add spacer:
                        $pageContent .= $this->doc->spacer(10);
@@ -220,7 +220,7 @@ class CreateFolderController {
                                </div>
                                ';
                        // CSH:
-                       $code .= BackendUtility::cshItem('xMOD_csh_corebe', 'file_newfile', $GLOBALS['BACK_PATH'], '<br />');
+                       $code .= BackendUtility::cshItem('xMOD_csh_corebe', 'file_newfile', NULL, '<br />');
                        $pageContent .= $this->doc->section($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:file_newfolder.php.newfile'), $code);
                        $pageContent .= $this->doc->sectionEnd();
                        $pageContent .= '</form>';
index 93494f3..4fb52fc 100644 (file)
@@ -221,7 +221,7 @@ class EditFileController {
        public function getButtons() {
                $buttons = array();
                // CSH button
-               $buttons['csh'] = BackendUtility::cshItem('xMOD_csh_corebe', 'file_edit', $GLOBALS['BACK_PATH'], '', TRUE);
+               $buttons['csh'] = BackendUtility::cshItem('xMOD_csh_corebe', 'file_edit');
                // Save button
                $theIcon = IconUtility::getSpriteIcon('actions-document-save');
                $buttons['SAVE'] = '<a href="#" onclick="document.editform.submit();" title="' . $GLOBALS['LANG']->makeEntities($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:file_edit.php.submit', TRUE)) . '">' . $theIcon . '</a>';
index 485ff95..3f108fb 100644 (file)
@@ -125,7 +125,7 @@ class FileUploadController {
                $pageContent = $this->doc->header($GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:file_upload.php.pagetitle')) . $this->doc->section('', $form);
                // Header Buttons
                $docHeaderButtons = array(
-                       'csh' => BackendUtility::cshItem('xMOD_csh_corebe', 'file_upload', $GLOBALS['BACK_PATH']),
+                       'csh' => BackendUtility::cshItem('xMOD_csh_corebe', 'file_upload'),
                        'back' => ''
                );
                $markerArray = array(
index 26638c7..318d211 100644 (file)
@@ -162,7 +162,7 @@ class RenameFileController {
                $docHeaderButtons = array(
                        'back' => ''
                );
-               $docHeaderButtons['csh'] = BackendUtility::cshItem('xMOD_csh_corebe', 'file_rename', $GLOBALS['BACK_PATH']);
+               $docHeaderButtons['csh'] = BackendUtility::cshItem('xMOD_csh_corebe', 'file_rename');
                // Back
                if ($this->returnUrl) {
                        $docHeaderButtons['back'] = '<a href="' . htmlspecialchars(\TYPO3\CMS\Core\Utility\GeneralUtility::linkThisUrl($this->returnUrl)) . '" class="typo3-goBack" title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:labels.goBack', TRUE) . '">' . \TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIcon('actions-view-go-back') . '</a>';
index 117d9a0..6c0c9dd 100644 (file)
@@ -201,7 +201,7 @@ class FileSystemNavigationFrameController {
                // Refresh
                $buttons['refresh'] = '<a href="' . htmlspecialchars(GeneralUtility::getIndpEnv('REQUEST_URI')) . '">' . IconUtility::getSpriteIcon('actions-system-refresh') . '</a>';
                // CSH
-               $buttons['csh'] = str_replace('typo3-csh-inline', 'typo3-csh-inline show-right', \TYPO3\CMS\Backend\Utility\BackendUtility::cshItem('xMOD_csh_corebe', 'filetree', $GLOBALS['BACK_PATH']));
+               $buttons['csh'] = str_replace('typo3-csh-inline', 'typo3-csh-inline show-right', \TYPO3\CMS\Backend\Utility\BackendUtility::cshItem('xMOD_csh_corebe', 'filetree'));
                return $buttons;
        }
 
index a2b3c7c..275e8a8 100644 (file)
@@ -284,11 +284,11 @@ class NewRecordController {
                                $buttons['new_page'] = '<a href="' . htmlspecialchars(GeneralUtility::linkThisScript(array('pagesOnly' => '1'))) . '" title="' . $GLOBALS['LANG']->sL('LLL:EXT:cms/layout/locallang.xlf:newPage', TRUE) . '">' . IconUtility::getSpriteIcon('actions-page-new') . '</a>';
                        }
                        // CSH
-                       $buttons['csh'] = BackendUtility::cshItem('xMOD_csh_corebe', 'new_regular', $GLOBALS['BACK_PATH'], '', TRUE);
+                       $buttons['csh'] = BackendUtility::cshItem('xMOD_csh_corebe', 'new_regular');
                } elseif ($this->showNewRecLink('pages')) {
                        // Pages only wizard
                        // CSH
-                       $buttons['csh'] = BackendUtility::cshItem('xMOD_csh_corebe', 'new_pages', $GLOBALS['BACK_PATH'], '', TRUE);
+                       $buttons['csh'] = BackendUtility::cshItem('xMOD_csh_corebe', 'new_pages');
                }
                // Back
                if ($this->R_URI) {
index 43799e0..4d70ae8 100644 (file)
@@ -631,7 +631,7 @@ class PageLayoutController {
                                'history_record' => '',
                                'edit_language' => ''
                        );
-                       $this->markers['CSH'] = BackendUtility::cshItem($this->descrTable, '', $GLOBALS['BACK_PATH'], '', TRUE);
+                       $this->markers['CSH'] = '';
                        $this->markers['TOP_FUNCTION_MENU'] = '';
                        $this->markers['LANGSELECTOR'] = '';
                        $this->markers['CONTENT'] = $body;
@@ -882,7 +882,7 @@ class PageLayoutController {
                        $posMap->cur_sys_language = $this->current_sys_language;
                        $HTMLcode = '';
                        // CSH:
-                       $HTMLcode .= BackendUtility::cshItem($this->descrTable, 'quickEdit_selElement', $GLOBALS['BACK_PATH'], '|<br />');
+                       $HTMLcode .= BackendUtility::cshItem($this->descrTable, 'quickEdit_selElement', NULL, '|<br />');
                        $HTMLcode .= $posMap->printContentElementColumns($this->id, $this->eRParts[1], $this->colPosList, $this->MOD_SETTINGS['tt_content_showHidden'], $this->R_URI);
                        $content .= $this->doc->spacer(20);
                        $content .= $this->doc->section($GLOBALS['LANG']->getLL('CEonThisPage'), $HTMLcode, 0, 1);
@@ -1157,9 +1157,9 @@ class PageLayoutController {
 
                        // Add CSH (Context Sensitive Help) icon to tool bar
                        if ($function == 'quickEdit') {
-                               $buttons['csh'] = BackendUtility::cshItem($this->descrTable, 'quickEdit', $GLOBALS['BACK_PATH'], '', TRUE, 'margin-top: 0px; margin-bottom: 0px;');
+                               $buttons['csh'] = BackendUtility::cshItem($this->descrTable, 'quickEdit');
                        } else {
-                               $buttons['csh'] = BackendUtility::cshItem($this->descrTable, 'columns_' . $this->MOD_SETTINGS['function'], $GLOBALS['BACK_PATH'], '', TRUE, 'margin-top: 0px; margin-bottom: 0px;');
+                               $buttons['csh'] = BackendUtility::cshItem($this->descrTable, 'columns_' . $this->MOD_SETTINGS['function']);
                        }
                        if ($function == 'quickEdit') {
                                // Save record
index eadd567..51ac5a9 100644 (file)
@@ -253,7 +253,7 @@ class PageTreeNavigationController {
                // Refresh
                $buttons['refresh'] = '<a href="' . htmlspecialchars(GeneralUtility::getIndpEnv('REQUEST_URI')) . '" title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:labels.refresh', TRUE) . '">' . IconUtility::getSpriteIcon('actions-system-refresh') . '</a>';
                // CSH
-               $buttons['csh'] = str_replace('typo3-csh-inline', 'typo3-csh-inline show-right', BackendUtility::cshItem('xMOD_csh_corebe', 'pagetree', $GLOBALS['BACK_PATH'], '', TRUE));
+               $buttons['csh'] = str_replace('typo3-csh-inline', 'typo3-csh-inline show-right', BackendUtility::cshItem('xMOD_csh_corebe', 'pagetree'));
                // Filter
                if ($this->hasFilterBox) {
                        $buttons['filter'] = '<a href="#" id="tree-toolbar-filter-item">' . IconUtility::getSpriteIcon('actions-system-tree-search-open', array('title' => $GLOBALS['LANG']->sL('LLL:EXT:cms/layout/locallang.xlf:labels.filter', TRUE))) . '</a>';
index 8527fbf..e8527c2 100644 (file)
@@ -238,9 +238,9 @@ class FormsController {
                );
                if ($this->P['table'] && $this->P['field'] && $this->P['uid']) {
                        // CSH
-                       $buttons['csh'] = BackendUtility::cshItem('xMOD_csh_corebe', 'wizard_forms_wiz', $GLOBALS['BACK_PATH'], '');
+                       $buttons['csh'] = BackendUtility::cshItem('xMOD_csh_corebe', 'wizard_forms_wiz');
                        // CSH Buttons
-                       $buttons['csh_buttons'] = BackendUtility::cshItem('xMOD_csh_corebe', 'wizard_forms_wiz_buttons', $GLOBALS['BACK_PATH'], '');
+                       $buttons['csh_buttons'] = BackendUtility::cshItem('xMOD_csh_corebe', 'wizard_forms_wiz_buttons');
                        // Close
                        $buttons['close'] = '<a href="#" onclick="' . htmlspecialchars(('jumpToUrl(unescape(\'' . rawurlencode(GeneralUtility::sanitizeLocalUrl($this->P['returnUrl'])) . '\')); return false;')) . '">' . IconUtility::getSpriteIcon('actions-document-close', array('title' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:rm.closeDoc', TRUE))) . '</a>';
                        // Save
@@ -503,7 +503,7 @@ class FormsController {
                        $tRows[] = '
                                <tr>
                                        <td colspan="2" class="bgColor2">&nbsp;</td>
-                                       <td colspan="2" class="bgColor2"><strong>' . $GLOBALS['LANG']->getLL('forms_special_eform', TRUE) . ':</strong>' . BackendUtility::cshItem('xMOD_csh_corebe', 'wizard_forms_wiz_formmail_info', $GLOBALS['BACK_PATH'], '') . '</td>
+                                       <td colspan="2" class="bgColor2"><strong>' . $GLOBALS['LANG']->getLL('forms_special_eform', TRUE) . ':</strong>' . BackendUtility::cshItem('xMOD_csh_corebe', 'wizard_forms_wiz_formmail_info') . '</td>
                                </tr>';
                        // "FORM type":
                        $tRows[] = '
index fc6207f..241f321 100644 (file)
@@ -182,9 +182,9 @@ class TableController {
                );
                if ($this->P['table'] && $this->P['field'] && $this->P['uid']) {
                        // CSH
-                       $buttons['csh'] = BackendUtility::cshItem('xMOD_csh_corebe', 'wizard_table_wiz', $GLOBALS['BACK_PATH'], '');
+                       $buttons['csh'] = BackendUtility::cshItem('xMOD_csh_corebe', 'wizard_table_wiz');
                        // CSH Buttons
-                       $buttons['csh_buttons'] = BackendUtility::cshItem('xMOD_csh_corebe', 'wizard_table_wiz_buttons', $GLOBALS['BACK_PATH'], '');
+                       $buttons['csh_buttons'] = BackendUtility::cshItem('xMOD_csh_corebe', 'wizard_table_wiz_buttons');
                        // Close
                        $buttons['close'] = '<a href="#" onclick="' . htmlspecialchars(('jumpToUrl(unescape(\'' . rawurlencode(GeneralUtility::sanitizeLocalUrl($this->P['returnUrl'])) . '\')); return false;')) . '">' . IconUtility::getSpriteIcon('actions-document-close', array('title' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:rm.closeDoc', TRUE))) . '</a>';
                        // Save
index c5aebe5..331d468 100644 (file)
@@ -2465,8 +2465,10 @@ class BackendUtility {
         * @param string $BACK_PATH UNUSED
         * @param bool $force Force display of icon no matter BE_USER setting for help
         * @return string HTML content for a help icon/text
+        * @deprecated since TYPO3 CMS 7, will be removed in TYPO3 CMS 8, use cshItem() instead
         */
        static public function helpTextIcon($table, $field, $BACK_PATH = '', $force = FALSE) {
+               GeneralUtility::logDeprecatedFunction();
                if (
                        is_array($GLOBALS['TCA_DESCR'][$table]) && is_array($GLOBALS['TCA_DESCR'][$table]['columns'][$field])
                        && (isset(static::getBackendUserAuthentication()->uc['edit_showFieldHelp']) || $force)
@@ -2516,7 +2518,7 @@ class BackendUtility {
         * @param string $table Table name
         * @param string $field Field name
         * @return string HTML content for help text
-        * @see wrapInHelp()
+        * @see cshItem()
         */
        static public function helpText($table, $field) {
                $helpTextArray = self::helpTextArray($table, $field);
@@ -2589,19 +2591,17 @@ class BackendUtility {
         *
         * @param string $table Table name ('_MOD_'+module name)
         * @param string $field Field name (CSH locallang main key)
-        * @param string $BACK_PATH Back path
+        * @param string $BACK_PATH Back path, not needed anymore, don't use
         * @param string $wrap Wrap code for icon-mode, splitted by "|". Not used for full-text mode.
         * @return string HTML content for help text
         * @see helpTextIcon()
         */
-       static public function cshItem($table, $field, $BACK_PATH, $wrap = '') {
-               if (!static::getBackendUserAuthentication()->uc['edit_showFieldHelp']) {
-                       return '';
-               }
+       static public function cshItem($table, $field, $BACK_PATH = NULL, $wrap = '') {
                static::getLanguageService()->loadSingleTableDescription($table);
-               if (is_array($GLOBALS['TCA_DESCR'][$table])) {
-                       // Creating CSH icon and short description:
-                       $output = self::helpTextIcon($table, $field, $BACK_PATH);
+               if (is_array($GLOBALS['TCA_DESCR'][$table])
+                       && is_array($GLOBALS['TCA_DESCR'][$table]['columns'][$field])) {
+                       // Creating short description
+                       $output = self::wrapInHelp($table, $field);
                        if ($output && $wrap) {
                                $wrParts = explode('|', $wrap);
                                $output = $wrParts[0] . $output . $wrParts[1];
index 2c9bb75..357fbdc 100644 (file)
@@ -378,7 +378,7 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe
                        // Start table:
                        $this->oddColumnsCssClass = '';
                        // CSH:
-                       $out = BackendUtility::cshItem($this->descrTable, ('func_' . $pKey), $GLOBALS['BACK_PATH']) . '
+                       $out = BackendUtility::cshItem($this->descrTable, ('func_' . $pKey)) . '
                                <table class="t3-table typo3-page-pages">' .
                                        '<thead>' .
                                                $this->addelement(1, '', $theData) .
@@ -651,7 +651,7 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe
                                        $out .= $grid . '</table></div>';
                                }
                                // CSH:
-                               $out .= BackendUtility::cshItem($this->descrTable, 'columns_multi', $GLOBALS['BACK_PATH']);
+                               $out .= BackendUtility::cshItem($this->descrTable, 'columns_multi');
                        }
                        // If language mode, then make another presentation:
                        // Notice that THIS presentation will override the value of $out!
@@ -739,7 +739,7 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe
                                                </table>
                                        </div>';
                                // CSH:
-                               $out .= BackendUtility::cshItem($this->descrTable, 'language_list', $GLOBALS['BACK_PATH']);
+                               $out .= BackendUtility::cshItem($this->descrTable, 'language_list');
                        }
                } else {
                        // SINGLE column mode (columns shown beneath each other):
@@ -844,7 +844,7 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe
                                                ' . $out . '
                                        </table>';
                                // CSH:
-                               $out .= BackendUtility::cshItem($this->descrTable, 'columns_single', $GLOBALS['BACK_PATH']);
+                               $out .= BackendUtility::cshItem($this->descrTable, 'columns_single');
                        } else {
                                $out = '<br/><br/>' . $this->getPageLayoutController()->doc->icons(1)
                                        . 'Sorry, you cannot view a single language in this localization mode (Default Language Binding is enabled)<br/><br/>';
@@ -902,7 +902,7 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe
                                        <tr>
                                                <td>' . implode('</td>
                                                <td>', $bArray) . '</td>
-                                               <td>' . BackendUtility::cshItem($this->descrTable, 'button_panel', $GLOBALS['BACK_PATH']) . '</td>
+                                               <td>' . BackendUtility::cshItem($this->descrTable, 'button_panel') . '</td>
                                        </tr>
                                </table>
                                <br />
diff --git a/typo3/sysext/core/Documentation/Changelog/master/Deprecation-62864-HelpTextIcon.rst b/typo3/sysext/core/Documentation/Changelog/master/Deprecation-62864-HelpTextIcon.rst
new file mode 100644 (file)
index 0000000..08f8d7a
--- /dev/null
@@ -0,0 +1,24 @@
+=============================================================
+Deprecation: #62864 - BackendUtility->helpTextIcon deprecated
+=============================================================
+
+Description
+===========
+
+The function helpTextIcon in BackendUtility is deprecated.
+
+Impact
+======
+
+The core does not use this functionality anymore.
+
+
+Affected installations
+======================
+
+All installations which use the function helpTextIcon.
+
+Migration
+=========
+
+Use BackendUtility::cshItem instead.
index 5d3f5a8..987e3a4 100644 (file)
@@ -374,7 +374,7 @@ class FileListController {
                                // Set clipboard:
                                if ($this->MOD_SETTINGS['clipBoard']) {
                                        $pageContent .= $this->filelist->clipObj->printClipboard();
-                                       $pageContent .= BackendUtility::cshItem('xMOD_csh_corebe', 'filelist_clipboard', $GLOBALS['BACK_PATH']);
+                                       $pageContent .= BackendUtility::cshItem('xMOD_csh_corebe', 'filelist_clipboard');
                                }
                        }
                        $markerArray = array(
@@ -447,7 +447,7 @@ class FileListController {
                        $buttons['shortcut'] = $this->doc->makeShortcutIcon('pointer,id,target,table', implode(',', array_keys($this->MOD_MENU)), $this->MCONF['name']);
                }
                // FileList Module CSH:
-               $buttons['csh'] = BackendUtility::cshItem('xMOD_csh_corebe', 'filelist_module', $GLOBALS['BACK_PATH'], '', TRUE);
+               $buttons['csh'] = BackendUtility::cshItem('xMOD_csh_corebe', 'filelist_module');
                // Upload button (only if upload to this directory is allowed)
                if ($this->folderObject && $this->folderObject->getStorage()->checkUserActionPermission('add', 'File') && $this->folderObject->checkActionPermission('write')) {
                        $buttons['upload'] = '<a href="' . htmlspecialchars($GLOBALS['BACK_PATH']
@@ -475,4 +475,4 @@ class FileListController {
                return $buttons;
        }
 
-}
\ No newline at end of file
+}
index 6a91893..cc7203a 100644 (file)
@@ -60,7 +60,7 @@ class CshViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Be\AbstractBackendViewH
                        $moduleName = $currentRequest->getPluginName();
                        $table = '_MOD_' . $moduleName;
                }
-               $cshButton = \TYPO3\CMS\Backend\Utility\BackendUtility::cshItem($table, $field, $GLOBALS['BACK_PATH'], '', $iconOnly, $styleAttributes);
+               $cshButton = \TYPO3\CMS\Backend\Utility\BackendUtility::cshItem($table, $field);
                return '<div class="docheader-csh">' . $cshButton . '</div>';
        }
 }
index 5b00f86..171f102 100644 (file)
@@ -319,9 +319,9 @@ class WizardView extends \TYPO3\CMS\Form\View\Wizard\AbstractWizardView {
                        'reload' => ''
                );
                // CSH
-               $buttons['csh'] = BackendUtility::cshItem('xMOD_csh_corebe', 'wizard_forms_wiz', $GLOBALS['BACK_PATH'], '');
+               $buttons['csh'] = BackendUtility::cshItem('xMOD_csh_corebe', 'wizard_forms_wiz');
                // CSH Buttons
-               $buttons['csh_buttons'] = BackendUtility::cshItem('xMOD_csh_corebe', 'wizard_forms_wiz_buttons', $GLOBALS['BACK_PATH'], '');
+               $buttons['csh_buttons'] = BackendUtility::cshItem('xMOD_csh_corebe', 'wizard_forms_wiz_buttons');
                // Close
                $getPostVariables = \TYPO3\CMS\Core\Utility\GeneralUtility::_GP('P');
                $buttons['close'] = '<a href="#" onclick="' . htmlspecialchars(('jumpToUrl(unescape(\'' . rawurlencode(\TYPO3\CMS\Core\Utility\GeneralUtility::sanitizeLocalUrl($getPostVariables['returnUrl'])) . '\')); return false;')) . '">' . \TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIcon('actions-document-close', array(
index 15c9af4..107727f 100644 (file)
@@ -69,7 +69,7 @@ class PageInformationController extends \TYPO3\CMS\Backend\Module\AbstractFuncti
                $dblist->generateList();
                // CSH
                $theOutput = $this->pObj->doc->header($GLOBALS['LANG']->sL('LLL:EXT:cms/web_info/locallang.xlf:page_title'));
-               $theOutput .= $this->pObj->doc->section('', BackendUtility::cshItem($dblist->descrTable, 'pagetree_overview', $GLOBALS['BACK_PATH'], '|<br />') . $h_func . $dblist->HTMLcode, 0, 1);
+               $theOutput .= $this->pObj->doc->section('', BackendUtility::cshItem($dblist->descrTable, 'pagetree_overview', NULL, '|<br />') . $h_func . $dblist->HTMLcode, 0, 1);
                // Additional footer content
                $footerContentHook = $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['cms/web_info/class.tx_cms_webinfo.php']['drawFooterHook'];
                if (is_array($footerContentHook)) {
index 29ea257..c67011b 100644 (file)
@@ -63,7 +63,7 @@ class TranslationStatusController extends \TYPO3\CMS\Backend\Module\AbstractFunc
                        $h_func .= BackendUtility::getFuncMenu($this->pObj->id, 'SET[lang]', $this->pObj->MOD_SETTINGS['lang'], $this->pObj->MOD_MENU['lang']);
                        $theOutput .= $h_func;
                        // Add CSH:
-                       $theOutput .= BackendUtility::cshItem('_MOD_web_info', 'lang', $GLOBALS['BACK_PATH'], '|<br />');
+                       $theOutput .= BackendUtility::cshItem('_MOD_web_info', 'lang', NULL, '|<br />');
                        // Showing the tree:
                        // Initialize starting point of page tree:
                        $treeStartingPoint = (int)$this->pObj->id;
index 442df36..65ce1c8 100644 (file)
@@ -127,7 +127,7 @@ class PageFunctionsController extends \TYPO3\CMS\Backend\Module\BaseScriptClass
                        'shortcut' => ''
                );
                // CSH
-               $buttons['csh'] = BackendUtility::cshItem('_MOD_web_func', '', $GLOBALS['BACK_PATH'], '', TRUE);
+               $buttons['csh'] = BackendUtility::cshItem('_MOD_web_func', '');
                if ($this->id && is_array($this->pageinfo)) {
                        // View page
                        $buttons['view'] = '<a href="#" '
index 0448cd4..4c2d0ee 100644 (file)
@@ -517,7 +517,7 @@ class ImportExportController extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
                        $row[] = '
                                <tr class="tableheader bgColor5">
                                        <td colspan="2">' . $this->lang->getLL('makeconfig_exportPagetreeConfiguration', TRUE)
-                                               . BackendUtility::cshItem('xMOD_tx_impexp', 'pageTreeCfg', $GLOBALS['BACK_PATH'], '') . '</td>
+                                               . BackendUtility::cshItem('xMOD_tx_impexp', 'pageTreeCfg') . '</td>
                                </tr>';
                        $row[] = '
                                <tr class="bgColor4">
@@ -528,7 +528,7 @@ class ImportExportController extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
                        $row[] = '
                                <tr class="bgColor4">
                                        <td><strong>' . $this->lang->getLL('makeconfig_tree', TRUE) . '</strong>'
-                                               . BackendUtility::cshItem('xMOD_tx_impexp', 'pageTreeDisplay', $GLOBALS['BACK_PATH'], '') . '</td>
+                                               . BackendUtility::cshItem('xMOD_tx_impexp', 'pageTreeDisplay') . '</td>
                                        <td>' . ($this->treeHTML ?: $this->lang->getLL('makeconfig_noTreeExportedOnly', TRUE)) . '</td>
                                </tr>';
                        $opt = array(
@@ -544,13 +544,13 @@ class ImportExportController extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
                        $row[] = '
                                <tr class="bgColor4">
                                        <td><strong>' . $this->lang->getLL('makeconfig_levels', TRUE) . '</strong>'
-                                               . BackendUtility::cshItem('xMOD_tx_impexp', 'pageTreeMode', $GLOBALS['BACK_PATH'], '') . '</td>
+                                               . BackendUtility::cshItem('xMOD_tx_impexp', 'pageTreeMode') . '</td>
                                        <td>' . $this->renderSelectBox('tx_impexp[pagetree][levels]', $inData['pagetree']['levels'], $opt) . '</td>
                                </tr>';
                        $row[] = '
                                <tr class="bgColor4">
                                        <td><strong>' . $this->lang->getLL('makeconfig_includeTables', TRUE) . '</strong>'
-                                               . BackendUtility::cshItem('xMOD_tx_impexp', 'pageTreeRecordLimit', $GLOBALS['BACK_PATH'], '') . '</td>
+                                               . BackendUtility::cshItem('xMOD_tx_impexp', 'pageTreeRecordLimit') . '</td>
                                        <td>' . $this->tableSelector('tx_impexp[pagetree][tables]', $inData['pagetree']['tables'], 'pages') . '<br/>
                                                ' . $this->lang->getLL('makeconfig_maxNumberOfRecords', TRUE) . '<br/>
                                                <input type="text" name="tx_impexp[pagetree][maxNumber]" value="'
@@ -563,7 +563,7 @@ class ImportExportController extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
                        $row[] = '
                                <tr class="tableheader bgColor5">
                                        <td colspan="2">' . $this->lang->getLL('makeconfig_exportSingleRecord', TRUE)
-                                               . BackendUtility::cshItem('xMOD_tx_impexp', 'singleRecord', $GLOBALS['BACK_PATH'], '') . '</td>
+                                               . BackendUtility::cshItem('xMOD_tx_impexp', 'singleRecord') . '</td>
                                </tr>';
                        foreach ($inData['record'] as $ref) {
                                $rParts = explode(':', $ref);
@@ -607,13 +607,13 @@ class ImportExportController extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
                        $row[] = '
                        <tr class="bgColor4">
                                <td><strong>' . $this->lang->getLL('makeconfig_tablePids', TRUE) . '</strong>'
-                                       . BackendUtility::cshItem('xMOD_tx_impexp', 'tableList', $GLOBALS['BACK_PATH'], '') . '</td>
+                                       . BackendUtility::cshItem('xMOD_tx_impexp', 'tableList') . '</td>
                                <td>' . $tblList . '</td>
                        </tr>';
                        $row[] = '
                                <tr class="bgColor4">
                                        <td><strong>' . $this->lang->getLL('makeconfig_maxNumberOfRecords', TRUE)
-                                               . BackendUtility::cshItem('xMOD_tx_impexp', 'tableListMaxNumber', $GLOBALS['BACK_PATH'], '') . '</strong></td>
+                                               . BackendUtility::cshItem('xMOD_tx_impexp', 'tableListMaxNumber') . '</strong></td>
                                        <td>
                                                <input type="text" name="tx_impexp[listCfg][maxNumber]" value="'
                                                . htmlspecialchars($inData['listCfg']['maxNumber']) . '"' . $this->doc->formWidth(10) . ' /><br/>
@@ -628,14 +628,14 @@ class ImportExportController extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
                $row[] = '
                                <tr class="bgColor4">
                                        <td><strong>' . $this->lang->getLL('makeconfig_includeRelationsToTables', TRUE) . '</strong>'
-                                               . BackendUtility::cshItem('xMOD_tx_impexp', 'inclRelations', $GLOBALS['BACK_PATH'], '') . '</td>
+                                               . BackendUtility::cshItem('xMOD_tx_impexp', 'inclRelations') . '</td>
                                        <td>' . $this->tableSelector('tx_impexp[external_ref][tables]', $inData['external_ref']['tables']) . '</td>
                                </tr>';
                // Add static relation selector:
                $row[] = '
                                <tr class="bgColor4">
                                        <td><strong>' . $this->lang->getLL('makeconfig_useStaticRelationsFor', TRUE) . '</strong>'
-                                               . BackendUtility::cshItem('xMOD_tx_impexp', 'staticRelations', $GLOBALS['BACK_PATH'], '') . '</td>
+                                               . BackendUtility::cshItem('xMOD_tx_impexp', 'staticRelations') . '</td>
                                        <td>' . $this->tableSelector('tx_impexp[external_static][tables]', $inData['external_static']['tables']) . '<br/>
                                                <label for="checkShowStaticRelations">' . $this->lang->getLL('makeconfig_showStaticRelations', TRUE)
                                                        . '</label> <input type="checkbox" name="tx_impexp[showStaticRelations]" id="checkShowStaticRelations" value="1"'
@@ -659,7 +659,7 @@ class ImportExportController extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
                $row[] = '
                                <tr class="bgColor4">
                                        <td><strong>' . $this->lang->getLL('makeconfig_excludeElements', TRUE) . '</strong>'
-                                               . BackendUtility::cshItem('xMOD_tx_impexp', 'excludedElements', $GLOBALS['BACK_PATH'], '') . '</td>
+                                               . BackendUtility::cshItem('xMOD_tx_impexp', 'excludedElements') . '</td>
                                        <td>' . $excludeHiddenFields . '
                                        ' . $excludedElements . '
                                        </td>
@@ -693,7 +693,7 @@ class ImportExportController extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
                                <tr class="bgColor4">
                                        <td><label for="checkExcludeHTMLfileResources"><strong>'
                                                . $this->lang->getLL('makeadvanc_excludeHtmlCssFile', TRUE)     . '</strong></label>'
-                                               . BackendUtility::cshItem('xMOD_tx_impexp', 'htmlCssResources', $GLOBALS['BACK_PATH'], '') . '</td>
+                                               . BackendUtility::cshItem('xMOD_tx_impexp', 'htmlCssResources') . '</td>
                                        <td><input type="checkbox" name="tx_impexp[excludeHTMLfileResources]" id="checkExcludeHTMLfileResources" value="1"'
                                                . ($inData['excludeHTMLfileResources'] ? ' checked="checked"' : '') . ' /></td>
                                </tr>';
@@ -719,7 +719,7 @@ class ImportExportController extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
                $row[] = '
                                <tr class="bgColor4">
                                        <td><strong>' . $this->lang->getLL('makeadvanc_selectExtensionsThatThe', TRUE) . '</strong>'
-                                               . BackendUtility::cshItem('xMOD_tx_impexp', 'extensionDependencies', $GLOBALS['BACK_PATH'], '') . '</td>
+                                               . BackendUtility::cshItem('xMOD_tx_impexp', 'extensionDependencies') . '</td>
                                        <td>' . $this->extensionSelector('tx_impexp[extension_dep]', $inData['extension_dep']) . '</td>
                                </tr>';
                // Add buttons:
@@ -760,7 +760,7 @@ class ImportExportController extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
                $row[] = '
                                <tr class="bgColor4">
                                        <td><strong>' . $this->lang->getLL('makesavefo_presets', TRUE) . '</strong>'
-                                               . BackendUtility::cshItem('xMOD_tx_impexp', 'presets', $GLOBALS['BACK_PATH'], '') . '</td>
+                                               . BackendUtility::cshItem('xMOD_tx_impexp', 'presets') . '</td>
                                        <td>
                                                ' . $this->lang->getLL('makesavefo_selectPreset', TRUE) . '<br/>
                                                ' . $this->renderSelectBox('preset[select]', '', $opt) . '
@@ -800,7 +800,7 @@ class ImportExportController extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
                $row[] = '
                                <tr class="bgColor4">
                                        <td><strong>' . $this->lang->getLL('makesavefo_metaData', TRUE) . '</strong>'
-                                               . BackendUtility::cshItem('xMOD_tx_impexp', 'metadata', $GLOBALS['BACK_PATH'], '') . '</td>
+                                               . BackendUtility::cshItem('xMOD_tx_impexp', 'metadata') . '</td>
                                        <td>
                                                        ' . $this->lang->getLL('makesavefo_title', TRUE) . ' <br/>
                                                        <input type="text" name="tx_impexp[meta][title]" value="' . htmlspecialchars($inData['meta']['title']) . '"' . $this->doc->formWidth(30) . ' /><br/>
@@ -835,7 +835,7 @@ class ImportExportController extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
                $row[] = '
                                <tr class="bgColor4">
                                        <td><strong>' . $this->lang->getLL('makesavefo_fileFormat', TRUE) . '</strong>'
-                                               . BackendUtility::cshItem('xMOD_tx_impexp', 'fileFormat', $GLOBALS['BACK_PATH'], '') . '</td>
+                                               . BackendUtility::cshItem('xMOD_tx_impexp', 'fileFormat') . '</td>
                                        <td>' . $this->renderSelectBox('tx_impexp[filetype]', $inData['filetype'], $opt) . '<br/>
                                                ' . $this->lang->getLL('makesavefo_maxSizeOfFiles', TRUE) . '<br/>
                                                <input type="text" name="tx_impexp[maxFileSize]" value="'
@@ -908,7 +908,7 @@ class ImportExportController extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
                                : '';
                        $row[] = '<tr class="bgColor4">
                                <td><strong>' . $this->lang->getLL('importdata_file', TRUE) . '</strong>'
-                                       . BackendUtility::cshItem('xMOD_tx_impexp', 'importFile', $GLOBALS['BACK_PATH'], '') . '</td>
+                                       . BackendUtility::cshItem('xMOD_tx_impexp', 'importFile') . '</td>
                                <td>' . $this->renderSelectBox('tx_impexp[file]', $inData['file'], $selectOptions) . '<br />'
                                        . sprintf($this->lang->getLL('importdata_fromPathS', TRUE), $path ? $path->getCombinedIdentifier() : $this->lang->getLL('importdata_no_accessible_file_mount', TRUE)) .
                                $noCompressorAvailable . '</td>
@@ -918,7 +918,7 @@ class ImportExportController extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
                                </tr>';
                        $row[] = '<tr class="bgColor4">
                                <td><strong>' . $this->lang->getLL('importdata_update', TRUE) . '</strong>'
-                                       . BackendUtility::cshItem('xMOD_tx_impexp', 'update', $GLOBALS['BACK_PATH'], '') . '</td>
+                                       . BackendUtility::cshItem('xMOD_tx_impexp', 'update') . '</td>
                                <td>
                                        <input type="checkbox" name="tx_impexp[do_update]" id="checkDo_update" value="1"'
                                                . ($inData['do_update'] ? ' checked="checked"' : '') . ' />
@@ -947,7 +947,7 @@ class ImportExportController extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
                                : '';
                        $row[] = '<tr class="bgColor4">
                                <td><strong>' . $this->lang->getLL('importdata_options', TRUE) . '</strong>'
-                                       . BackendUtility::cshItem('xMOD_tx_impexp', 'options', $GLOBALS['BACK_PATH'], '') . '</td>
+                                       . BackendUtility::cshItem('xMOD_tx_impexp', 'options') . '</td>
                                <td>
                                        <input type="checkbox" name="tx_impexp[notShowDiff]" id="checkNotShowDiff" value="1"'
                                                . ($inData['notShowDiff'] ? ' checked="checked"' : '') . ' />
@@ -968,13 +968,13 @@ class ImportExportController extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
                                : '<input type="submit" name="tx_impexp[new_import]" value="' . $this->lang->getLL('importdata_newImport', TRUE) . '" />';
                        $row[] = '<tr class="bgColor4">
                                <td><strong>' . $this->lang->getLL('importdata_action', TRUE) . '</strong>'
-                                       . BackendUtility::cshItem('xMOD_tx_impexp', 'action', $GLOBALS['BACK_PATH'], '') . '</td>
+                                       . BackendUtility::cshItem('xMOD_tx_impexp', 'action') . '</td>
                                <td>' . $newImport . '
                                        <input type="hidden" name="tx_impexp[action]" value="import" /></td>
                                </tr>';
                        $row[] = '<tr class="bgColor4">
                                <td><strong>' . $this->lang->getLL('importdata_enableLogging', TRUE) . '</strong>'
-                                       . BackendUtility::cshItem('xMOD_tx_impexp', 'enableLogging', $GLOBALS['BACK_PATH'], '') . '</td>
+                                       . BackendUtility::cshItem('xMOD_tx_impexp', 'enableLogging') . '</td>
                                <td>
                                        <input type="checkbox" name="tx_impexp[enableLogging]" id="checkEnableLogging" value="1"'
                                                . ($inData['enableLogging'] ? ' checked="checked"' : '') . ' />
@@ -1000,7 +1000,7 @@ class ImportExportController extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
                                        </tr>';
                                $row[] = '<tr class="bgColor4">
                                                <td>' . $this->lang->getLL('importdata_browse', TRUE)
-                                                       . BackendUtility::cshItem('xMOD_tx_impexp', 'upload', $GLOBALS['BACK_PATH'], '') . '</td>
+                                                       . BackendUtility::cshItem('xMOD_tx_impexp', 'upload') . '</td>
                                                <td>
 
                                                                <input type="file" name="upload_1"' . $this->doc->formWidth(35) . ' size="40" />
index dd226f0..4c3521b 100644 (file)
@@ -149,7 +149,7 @@ class InfoModuleController extends BaseScriptClass {
                        'shortcut' => ''
                );
                // CSH
-               $buttons['csh'] = BackendUtility::cshItem('_MOD_web_info', '', $GLOBALS['BACK_PATH'], '', TRUE);
+               $buttons['csh'] = BackendUtility::cshItem('_MOD_web_info', '');
                // View page
                $buttons['view'] = '<a href="#" ' .
                        'onclick="' . htmlspecialchars(
index 1a1e7c8..d281f6c 100644 (file)
@@ -109,7 +109,7 @@ class InfoPageTyposcriptConfigController extends \TYPO3\CMS\Backend\Module\Abstr
                        } else {
                                $editIcon = '';
                        }
-                       $theOutput .= $this->pObj->doc->section('', BackendUtility::cshItem(('_MOD_' . $GLOBALS['MCONF']['name']), 'tsconfig_edit', $GLOBALS['BACK_PATH'], '|<br />') . $menu . '
+                       $theOutput .= $this->pObj->doc->section('', BackendUtility::cshItem(('_MOD_' . $GLOBALS['MCONF']['name']), 'tsconfig_edit', NULL, '|<br />') . $menu . '
                                        <br /><br />
 
                                        <!-- Edit fields: -->
@@ -176,7 +176,7 @@ class InfoPageTyposcriptConfigController extends \TYPO3\CMS\Backend\Module\Abstr
                                $modTSconfig = array();
                        }
 
-                       $csh = BackendUtility::cshItem('_MOD_' . $GLOBALS['MCONF']['name'], 'tsconfig_hierarchy', $GLOBALS['BACK_PATH'], '|<br />');
+                       $csh = BackendUtility::cshItem('_MOD_' . $GLOBALS['MCONF']['name'], 'tsconfig_hierarchy', NULL, '|<br />');
                        $tree = $tmpl->ext_getObjTree($modTSconfig, '', '', '', '', $this->pObj->MOD_SETTINGS['tsconf_alphaSort']);
 
                        $theOutput .= $this->pObj->doc->section(
index a3711d8..ba5f0ce 100644 (file)
@@ -636,7 +636,7 @@ class LinkValidatorReport extends \TYPO3\CMS\Backend\Module\AbstractFunctionModu
         */
        protected function getDocHeaderButtons() {
                $buttons = array(
-                       'csh' => BackendUtility::cshItem('_MOD_web_func', '', $GLOBALS['BACK_PATH']),
+                       'csh' => BackendUtility::cshItem('_MOD_web_func', ''),
                        'shortcut' => $this->getShortcutButton(),
                        'save' => ''
                );
index 4359071..84de54d 100644 (file)
@@ -246,7 +246,7 @@ class PermissionModuleController {
                        }
 
                        $docHeaderButtons = $this->getButtons();
-                       $markers['CSH'] = $this->docHeaderButtons['csh'];
+                       $markers['CSH'] = '';
                        $markers['FUNC_MENU'] = BackendUtility::getFuncMenu($this->id, 'SET[mode]', $this->MOD_SETTINGS['mode'], $this->MOD_MENU['mode']);
                        $markers['CONTENT'] = $this->content;
 
@@ -277,12 +277,9 @@ class PermissionModuleController {
         */
        protected function getButtons() {
                $buttons = array(
-                       'csh' => '',
                        'view' => '',
                        'shortcut' => ''
                );
-               // CSH
-               $buttons['csh'] = BackendUtility::cshItem('_MOD_web_info', '', $GLOBALS['BACK_PATH'], '', TRUE);
                // View page
                $buttons['view'] = '<a href="#" onclick="' . htmlspecialchars(BackendUtility::viewonclick($this->pageinfo['uid'], $GLOBALS['BACK_PATH'], BackendUtility::BEgetRootLine($this->pageinfo['uid']))) . '" title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:labels.showPage', TRUE) . '">' . IconUtility::getSpriteIcon('actions-document-view') . '</a>';
                // Shortcut
@@ -418,7 +415,7 @@ class PermissionModuleController {
                $this->content .= $this->doc->section($GLOBALS['LANG']->getLL('permissions'), $code, TRUE);
 
                // CSH for permissions setting
-               $this->content .= BackendUtility::cshItem('xMOD_csh_corebe', 'perm_module_setting', $GLOBALS['BACK_PATH'], '<br /><br />');
+               $this->content .= BackendUtility::cshItem('xMOD_csh_corebe', 'perm_module_setting', NULL, '<br /><br />');
 
                // Adding help text:
                if ($GLOBALS['BE_USER']->uc['helpText']) {
@@ -559,7 +556,7 @@ class PermissionModuleController {
                $this->content .= $this->doc->section('', $code);
 
                // CSH for permissions setting
-               $this->content .= BackendUtility::cshItem('xMOD_csh_corebe', 'perm_module', $GLOBALS['BACK_PATH'], '<br />|');
+               $this->content .= BackendUtility::cshItem('xMOD_csh_corebe', 'perm_module', NULL, '<br />|');
 
                // Creating legend table:
                $legendText = '<strong>' . $GLOBALS['LANG']->getLL('1', TRUE) . '</strong>: ' . $GLOBALS['LANG']->getLL('1_t', TRUE);
index b8afdd0..dd89f49 100644 (file)
@@ -204,11 +204,11 @@ class DatabaseRecordList extends AbstractDatabaseRecordList {
                $localCalcPerms = $GLOBALS['BE_USER']->calcPerms($this->pageRow);
                // CSH
                if ((string)$this->id === '') {
-                       $buttons['csh'] = BackendUtility::cshItem('xMOD_csh_corebe', 'list_module_noId', $GLOBALS['BACK_PATH'], '', TRUE);
+                       $buttons['csh'] = BackendUtility::cshItem('xMOD_csh_corebe', 'list_module_noId');
                } elseif (!$this->id) {
-                       $buttons['csh'] = BackendUtility::cshItem('xMOD_csh_corebe', 'list_module_root', $GLOBALS['BACK_PATH'], '', TRUE);
+                       $buttons['csh'] = BackendUtility::cshItem('xMOD_csh_corebe', 'list_module_root');
                } else {
-                       $buttons['csh'] = BackendUtility::cshItem('xMOD_csh_corebe', 'list_module', $GLOBALS['BACK_PATH'], '', TRUE);
+                       $buttons['csh'] = BackendUtility::cshItem('xMOD_csh_corebe', 'list_module');
                }
                if (isset($this->id)) {
                        // View Exclude doktypes 254,255 Configuration:
index f5b4a40..b68c2af 100644 (file)
@@ -251,7 +251,7 @@ class RecyclerModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass
         */
        protected function getDocHeaderButtons() {
                $buttons = array(
-                       'csh' => BackendUtility::cshItem('_MOD_web_func', '', $GLOBALS['BACK_PATH']),
+                       'csh' => BackendUtility::cshItem('_MOD_web_func', ''),
                        'shortcut' => $this->getShortcutButton(),
                        'save' => ''
                );
@@ -312,4 +312,4 @@ class RecyclerModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass
                }
                return $data;
        }
-}
\ No newline at end of file
+}
index 5c5627c..f84edc8 100644 (file)
@@ -417,7 +417,7 @@ class SetupModuleController {
                        'save' => '',
                        'shortcut' => ''
                );
-               $buttons['csh'] = BackendUtility::cshItem('_MOD_user_setup', '', $GLOBALS['BACK_PATH'], '|', TRUE);
+               $buttons['csh'] = BackendUtility::cshItem('_MOD_user_setup', '');
                $buttons['save'] = \TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIcon('actions-document-save', array('html' => '<input type="image" name="data[save]" class="c-inputButton" src="clear.gif" title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:rm.saveDoc', TRUE) . '" />'));
                if ($GLOBALS['BE_USER']->mayMakeShortcut()) {
                        $buttons['shortcut'] = $this->doc->makeShortcutIcon('', '', $this->MCONF['name']);
index 4ada386..cb77519 100644 (file)
@@ -313,7 +313,7 @@ class TaskModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
         */
        protected function getButtons() {
                $buttons = array(
-                       'csh' => \TYPO3\CMS\Backend\Utility\BackendUtility::cshItem('_MOD_web_func', '', $GLOBALS['BACK_PATH']),
+                       'csh' => \TYPO3\CMS\Backend\Utility\BackendUtility::cshItem('_MOD_web_func', ''),
                        'shortcut' => '',
                        'open_new_window' => $this->openInNewWindow()
                );
index d26b230..811b315 100644 (file)
@@ -153,7 +153,7 @@ class CreatePagesWizardModuleFunctionController extends \TYPO3\CMS\Backend\Modul
                        $theCode .= GeneralUtility::makeInstance(\TYPO3\CMS\Core\Messaging\FlashMessage::class, '', $GLOBALS['LANG']->getLL('wiz_newPages_errorMsg1'), \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR)->render();
                }
                // CSH
-               $theCode .= BackendUtility::cshItem('_MOD_web_func', 'tx_wizardcrpages', $GLOBALS['BACK_PATH'], '<br />|');
+               $theCode .= BackendUtility::cshItem('_MOD_web_func', 'tx_wizardcrpages', NULL, '<br />|');
                $out = $this->pObj->doc->header($GLOBALS['LANG']->getLL('wiz_crMany'));
                $out .= $this->pObj->doc->section('', $theCode, FALSE, TRUE);
                return $out;
index b671d0e..339c1a5 100644 (file)
@@ -96,7 +96,7 @@ class SortPagesWizardModuleFunction extends \TYPO3\CMS\Backend\Module\AbstractFu
                                $theCode .= $flashMessage->render();
                        }
                        // CSH:
-                       $theCode .= BackendUtility::cshItem('_MOD_web_func', 'tx_wizardsortpages', $GLOBALS['BACK_PATH'], '<br />|');
+                       $theCode .= BackendUtility::cshItem('_MOD_web_func', 'tx_wizardsortpages', NULL, '<br />|');
                        $out .= $this->pObj->doc->section('', $theCode, FALSE, TRUE);
                } else {
                        $out .= $this->pObj->doc->section('', 'Sorry, this function is not available in the current draft workspace!', FALSE, TRUE, 1);
@@ -122,4 +122,4 @@ class SortPagesWizardModuleFunction extends \TYPO3\CMS\Backend\Module\AbstractFu
                ) . '" onclick="return confirm(' . GeneralUtility::quoteJSvalue($GLOBALS['LANG']->getLL('wiz_changeOrder_msg1')) . ')">' . htmlspecialchars($title) . '</a>';
        }
 
-}
\ No newline at end of file
+}