[TASK] BACK_PATH RecordList and friends 20/42320/7
authorWouter Wolters <typo3@wouterwolters.nl>
Thu, 6 Aug 2015 14:05:15 +0000 (16:05 +0200)
committerBenni Mack <benni@typo3.org>
Thu, 6 Aug 2015 18:20:00 +0000 (20:20 +0200)
Resolves: #68807
Releases: master
Change-Id: I018b1114a82146e2331a178f41c8bf48ee89cba4
Reviewed-on: http://review.typo3.org/42320
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Benni Mack <benni@typo3.org>
Tested-by: Benni Mack <benni@typo3.org>
35 files changed:
typo3/sysext/backend/Classes/Clipboard/Clipboard.php
typo3/sysext/backend/Classes/Controller/ContentElement/NewContentElementController.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/AbstractWizardController.php
typo3/sysext/backend/Classes/Controller/Wizard/ColorpickerController.php
typo3/sysext/backend/Classes/Controller/Wizard/RteController.php
typo3/sysext/backend/Classes/Controller/Wizard/TableController.php
typo3/sysext/backend/Classes/RecordList/AbstractRecordList.php
typo3/sysext/backend/Classes/Template/DocumentTemplate.php
typo3/sysext/backend/Classes/Tree/View/AbstractTreeView.php
typo3/sysext/backend/Classes/Tree/View/PagePositionMap.php
typo3/sysext/backend/Classes/Utility/BackendUtility.php
typo3/sysext/backend/Classes/View/PageLayoutView.php
typo3/sysext/compatibility6/Classes/Controller/Wizard/FormsController.php
typo3/sysext/filelist/Classes/Controller/FileListController.php
typo3/sysext/filelist/Classes/FileList.php
typo3/sysext/fluid/Classes/ViewHelpers/Be/TableListViewHelper.php
typo3/sysext/frontend/Classes/Controller/PageInformationController.php
typo3/sysext/impexp/Classes/Controller/ImportExportController.php
typo3/sysext/recordlist/Classes/Browser/ElementBrowser.php
typo3/sysext/recordlist/Classes/RecordList.php
typo3/sysext/recordlist/Classes/RecordList/AbstractDatabaseRecordList.php
typo3/sysext/recordlist/Classes/RecordList/DatabaseRecordList.php
typo3/sysext/rtehtmlarea/Classes/BrowseLinks.php
typo3/sysext/rtehtmlarea/Classes/SelectImage.php
typo3/sysext/scheduler/Classes/Controller/SchedulerModuleController.php
typo3/sysext/setup/Classes/Controller/SetupModuleController.php
typo3/sysext/sys_action/Classes/ActionTask.php
typo3/sysext/version/Classes/Controller/VersionModuleController.php
typo3/sysext/wizard_crpages/Classes/Controller/CreatePagesWizardModuleFunctionController.php
typo3/sysext/workspaces/Classes/Controller/PreviewController.php
typo3/sysext/workspaces/Classes/Controller/ReviewController.php

index 304b8b3..7efd6a8 100644 (file)
@@ -66,11 +66,6 @@ class Clipboard {
        public $current = '';
 
        /**
-        * @var string
-        */
-       public $backPath = '';
-
-       /**
         * @var int
         */
        public $lockToNormal = 0;
@@ -93,7 +88,6 @@ class Clipboard {
         * @return void
         */
        public function initializeClipboard() {
-               $this->backPath = $GLOBALS['BACK_PATH'];
                // Get data
                $clipData = $this->getBackendUser()->getModuleData('clipboard', $this->getBackendUser()->getTSConfigVal('options.saveClipboard') ? '' : 'ses');
                // NumberTabs
@@ -529,7 +523,7 @@ class Clipboard {
                                $str = '<span class="text-muted">' . $str . '</span>';
                        } else {
                                if (ExtensionManagementUtility::isLoaded('filelist')) {
-                                       $str = '<a href="' . htmlspecialchars(($this->backPath . BackendUtility::getModuleUrl('file_list') . '&id=' . dirname($rec))) . '">' . $str . '</a>';
+                                       $str = '<a href="' . htmlspecialchars(BackendUtility::getModuleUrl('file_list', array('id' => dirname($rec)))) . '">' . $str . '</a>';
                                }
                        }
                }
index 3dad5a8..8edcfdd 100644 (file)
@@ -164,7 +164,6 @@ class NewContentElementController {
                        // Init position map object:
                        $posMap = GeneralUtility::makeInstance(\TYPO3\CMS\Backend\Tree\View\ContentCreationPagePositionMap::class);
                        $posMap->cur_sys_language = $this->sys_language;
-                       $posMap->backPath = $GLOBALS['BACK_PATH'];
                        // If a column is pre-set:
                        if (isset($this->colPos)) {
                                if ($this->uid_pid < 0) {
@@ -249,7 +248,7 @@ class NewContentElementController {
                                                        <a href="#" onclick="' . htmlspecialchars($aOnClick) . '">
                                                                ' . $content . '
                                                                <div class="media-left">
-                                                                       <img' . IconUtility::skinImg($this->doc->backPath, $icon) . ' alt="" />
+                                                                       <img' . IconUtility::skinImg('', $icon) . ' alt="" />
                                                                </div>
                                                                <div class="media-body">
                                                                        <strong>' . htmlspecialchars($wInfo['title']) . '</strong>' .
index 6b77d39..09c658a 100644 (file)
@@ -45,11 +45,6 @@ class FileSystemNavigationFrameController {
         */
        public $doc;
 
-       /**
-        * @var string
-        */
-       public $backPath;
-
        // Internal, static: GPvar:
        /**
         * @var string
@@ -86,8 +81,6 @@ class FileSystemNavigationFrameController {
         * @return void
         */
        protected function init() {
-               // Setting backPath
-               $this->backPath = $GLOBALS['BACK_PATH'];
                // Setting GPvars:
                $this->currentSubScript = GeneralUtility::_GP('currentSubScript');
                $this->cMR = GeneralUtility::_GP('cMR');
index cb078f1..8f46cea 100644 (file)
@@ -314,7 +314,7 @@ class NewRecordController {
                                $excludeDokTypes = array(PageRepository::DOKTYPE_RECYCLER, PageRepository::DOKTYPE_SYSFOLDER, PageRepository::DOKTYPE_SPACER);
                        }
                        if (!in_array((int)$this->pageinfo['doktype'], $excludeDokTypes, TRUE)) {
-                               $buttons['view'] = '<a href="#" onclick="' . htmlspecialchars(BackendUtility::viewOnClick($this->pageinfo['uid'], $this->doc->backPath, BackendUtility::BEgetRootLine($this->pageinfo['uid']))) . '" title="' . $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.showPage', TRUE) . '">' . IconUtility::getSpriteIcon('actions-document-view') . '</a>';
+                               $buttons['view'] = '<a href="#" onclick="' . htmlspecialchars(BackendUtility::viewOnClick($this->pageinfo['uid'], '', BackendUtility::BEgetRootLine($this->pageinfo['uid']))) . '" title="' . $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.showPage', TRUE) . '">' . IconUtility::getSpriteIcon('actions-document-view') . '</a>';
                        }
                }
                return $buttons;
index 4b10e23..4fc3335 100755 (executable)
@@ -157,13 +157,6 @@ class PageLayoutController {
        public $doc;
 
        /**
-        * Back path of the module
-        *
-        * @var string
-        */
-       public $backPath;
-
-       /**
         * "Pseudo" Description -table name
         *
         * @var string
@@ -316,7 +309,6 @@ class PageLayoutController {
                // Setting module configuration / page select clause
                $this->MCONF = $GLOBALS['MCONF'];
                $this->perms_clause = $this->getBackendUser()->getPagePermsClause(1);
-               $this->backPath = $GLOBALS['BACK_PATH'];
                // Get session data
                $sessionData = $this->getBackendUser()->getSessionData(RecordList::class);
                $this->search_field = !empty($sessionData['search_field']) ? $sessionData['search_field'] : '';
@@ -941,7 +933,6 @@ class PageLayoutController {
                // Select element matrix:
                if ($this->eRParts[0] == 'tt_content' && MathUtility::canBeInterpretedAsInteger($this->eRParts[1])) {
                        $posMap = GeneralUtility::makeInstance(ContentLayoutPagePositionMap::class);
-                       $posMap->backPath = $GLOBALS['BACK_PATH'];
                        $posMap->cur_sys_language = $this->current_sys_language;
                        $HTMLcode = '';
                        // CSH:
@@ -962,7 +953,6 @@ class PageLayoutController {
        public function renderListContent() {
                /** @var $dbList \TYPO3\CMS\Backend\View\PageLayoutView */
                $dbList = GeneralUtility::makeInstance(PageLayoutView::class);
-               $dbList->backPath = $GLOBALS['BACK_PATH'];
                $dbList->thumbs = $this->imagemode;
                $dbList->no_noWrap = 1;
                $dbList->descrTable = $this->descrTable;
index 051406a..de26e43 100644 (file)
@@ -59,11 +59,6 @@ class PageTreeNavigationController {
        /**
         * @var string
         */
-       public $backPath;
-
-       /**
-        * @var string
-        */
        public $currentSubScript;
 
        /**
@@ -101,8 +96,6 @@ class PageTreeNavigationController {
         * @return void
         */
        protected function init() {
-               // Setting backPath
-               $this->backPath = $GLOBALS['BACK_PATH'];
                // Setting GPvars:
                $this->cMR = (bool)GeneralUtility::_GP('cMR');
                $this->currentSubScript = GeneralUtility::_GP('currentSubScript');
index a6c71df..e4a1062 100644 (file)
@@ -76,15 +76,6 @@ class AbstractWizardController {
        }
 
        /**
-        * Returns the backpath
-        *
-        * @return string
-        */
-       protected function getBackPath() {
-               return $GLOBALS['BACK_PATH'];
-       }
-
-       /**
         * Returns an instance of DocumentTemplate
         *
         * @return DocumentTemplate
index 00376c5..16f35f1 100644 (file)
@@ -160,7 +160,6 @@ class ColorpickerController extends AbstractWizardController {
                }
                // Initialize document object:
                $this->doc = GeneralUtility::makeInstance(DocumentTemplate::class);
-               $this->doc->backPath = $this->getBackPath();
                $this->doc->JScode = $this->doc->wrapScriptTags('
                        function checkReference() {     //
                                if (parent.opener && parent.opener.document && parent.opener.document.' . $this->formName . ' && parent.opener.document.' . $this->formName . '["' . $this->fieldName . '"]) {
index 00ddc54..0256d44 100644 (file)
@@ -93,7 +93,6 @@ class RteController extends AbstractWizardController {
                $this->MCONF['name'] = 'wizard_rte';
                // Starting the document template object:
                $this->doc = GeneralUtility::makeInstance(DocumentTemplate::class);
-               $this->doc->backPath = $this->getBackPath();
                $this->doc->setModuleTemplate('EXT:backend/Resources/Private/Templates/wizard_rte.html');
                // Need to NOT have the page wrapped in DIV since if we do that we destroy
                // the feature that the RTE spans the whole height of the page!!!
index 4016d59..e1f8b99 100644 (file)
@@ -129,7 +129,6 @@ class TableController extends AbstractWizardController {
                $this->inputStyle = isset($this->TABLECFG['textFields']) ? (bool)$this->TABLECFG['textFields'] : TRUE;
                // Document template object:
                $this->doc = GeneralUtility::makeInstance(DocumentTemplate::class);
-               $this->doc->backPath = $this->getBackPath();
                $this->doc->setModuleTemplate('EXT:backend/Resources/Private/Templates/wizard_table.html');
                // Setting form tag:
                list($rUri) = explode('#', GeneralUtility::getIndpEnv('REQUEST_URI'));
index 796dcfd..14d0e3f 100644 (file)
@@ -62,11 +62,6 @@ abstract class AbstractRecordList {
        public $oddColumnsCssClass = '';
 
        /**
-        * @var string
-        */
-       public $backPath = '';
-
-       /**
         * Decides the columns shown. Filled with values that refers to the keys of the data-array. $this->fieldArray[0] is the title column.
         *
         * @var array
index a02df85..17a972c 100644 (file)
@@ -40,13 +40,6 @@ class DocumentTemplate {
 
        // Vars you typically might want to/should set from outside after making instance of this class:
        /**
-        * 'backPath' pointing back to the PATH_typo3
-        *
-        * @var string
-        */
-       public $backPath = '';
-
-       /**
         * This can be set to the HTML-code for a formtag.
         * Useful when you need a form to span the whole page; Inserted exactly after the body-tag.
         *
@@ -529,17 +522,17 @@ function jumpToUrl(URL) {
         * If the BE_USER has access to Web>List then a link to that module is shown as well (with return-url)
         *
         * @param int $id The page id
-        * @param string $backPath The current "BACK_PATH" (the back relative to the typo3/ directory)
+        * @param string $_ @deprecated since TYPO3 CMS 7, will be removed in TYPO3 CMS 8
         * @return string HTML string with linked icon(s)
         */
-       public function viewPageIcon($id, $backPath) {
+       public function viewPageIcon($id, $_ = '') {
                // If access to Web>List for user, then link to that module.
                $str = BackendUtility::getListViewLink(array(
                        'id' => $id,
                        'returnUrl' => GeneralUtility::getIndpEnv('REQUEST_URI')
                ), $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:labels.showList'));
                // Make link to view page
-               $str .= '<a href="#" onclick="' . htmlspecialchars(BackendUtility::viewOnClick($id, $backPath, BackendUtility::BEgetRootLine($id))) . '" title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:labels.showPage', TRUE) . '">' . IconUtility::getSpriteIcon('actions-document-view') . '</a>';
+               $str .= '<a href="#" onclick="' . htmlspecialchars(BackendUtility::viewOnClick($id, '', BackendUtility::BEgetRootLine($id))) . '" title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xlf:labels.showPage', TRUE) . '">' . IconUtility::getSpriteIcon('actions-document-view') . '</a>';
                return $str;
        }
 
@@ -549,7 +542,7 @@ function jumpToUrl(URL) {
         *
         * @param string $params is a set of GET params to send to tce_db.php. Example: "&cmd[tt_content][123][move]=456" or "&data[tt_content][123][hidden]=1&data[tt_content][123][title]=Hello%20World
         * @param string|int $redirectUrl Redirect URL, default is to use GeneralUtility::getIndpEnv('REQUEST_URI'), -1 means to generate an URL for JavaScript using T3_THIS_LOCATION
-        * @return string URL to tce_db.php + parameters (backpath is taken from $this->backPath)
+        * @return string URL to BackendUtility::getModuleUrl('tce_db') + parameters
         * @see \TYPO3\CMS\Backend\Utility\BackendUtility::editOnClick()
         */
        public function issueCommand($params, $redirectUrl = '') {
@@ -588,10 +581,7 @@ function jumpToUrl(URL) {
                if (is_array($row) && $row['uid']) {
                        $iconImgTag = IconUtility::getSpriteIconForRecord($table, $row, array('title' => htmlspecialchars($path)));
                        $title = strip_tags(BackendUtility::getRecordTitle($table, $row));
-                       $viewPage = $noViewPageIcon ? '' : $this->viewPageIcon($row['uid'], $this->backPath);
-                       if ($table == 'pages') {
-                               $path .= ' - ' . BackendUtility::titleAttribForPages($row, '', 0);
-                       }
+                       $viewPage = $noViewPageIcon ? '' : $this->viewPageIcon($row['uid']);
                } else {
                        $iconImgTag = IconUtility::getSpriteIcon('apps-pagetree-page-domain', array('title' => htmlspecialchars($path)));
                        $title = $GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename'];
@@ -786,7 +776,6 @@ function jumpToUrl(URL) {
                                }
                        }
                }
-               $this->pageRenderer->backPath = $this->backPath;
                // alternative template for Header and Footer
                if ($this->pageHeaderFooterTemplateFile) {
                        $file = GeneralUtility::getFileAbsFileName($this->pageHeaderFooterTemplateFile, TRUE);
@@ -828,7 +817,7 @@ function jumpToUrl(URL) {
                // add docstyles
                $this->docStyle();
                if ($this->extDirectStateProvider) {
-                       $this->pageRenderer->addJsFile($this->backPath . 'sysext/backend/Resources/Public/JavaScript/ExtDirect.StateProvider.js');
+                       $this->pageRenderer->addJsFile('sysext/backend/Resources/Public/JavaScript/ExtDirect.StateProvider.js');
                }
                // Add jsCode for overriding the console with a debug panel connection
                $this->pageRenderer->addJsInlineCode('consoleOverrideWithDebugPanel', 'if (typeof top.Ext === "object") {
@@ -867,7 +856,7 @@ function jumpToUrl(URL) {
                // Note: please do not reference "bootstrap" outside of the TYPO3 Core (not in your own extensions)
                // as this is preliminary as long as Twitter bootstrap does not support AMD modules
                // this logic will be changed once Twitter bootstrap 4 is included
-               $this->pageRenderer->addJsFile($this->backPath . 'sysext/core/Resources/Public/JavaScript/Contrib/bootstrap/bootstrap.js');
+               $this->pageRenderer->addJsFile('sysext/core/Resources/Public/JavaScript/Contrib/bootstrap/bootstrap.js');
 
                // hook for additional headerData
                if (isset($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['typo3/template.php']['preHeaderRenderHook'])) {
@@ -1116,10 +1105,10 @@ function jumpToUrl(URL) {
                $this->inDocStylesArray = array();
 
                if ($this->styleSheetFile) {
-                       $this->pageRenderer->addCssFile($this->backPath . $this->styleSheetFile);
+                       $this->pageRenderer->addCssFile($this->styleSheetFile);
                }
                if ($this->styleSheetFile2) {
-                       $this->pageRenderer->addCssFile($this->backPath . $this->styleSheetFile2);
+                       $this->pageRenderer->addCssFile($this->styleSheetFile2);
                }
 
                if ($inDocStyles !== '') {
@@ -1127,7 +1116,7 @@ function jumpToUrl(URL) {
                }
 
                if ($this->styleSheetFile_post) {
-                       $this->pageRenderer->addCssFile($this->backPath . $this->styleSheetFile_post);
+                       $this->pageRenderer->addCssFile($this->styleSheetFile_post);
                }
        }
 
@@ -1141,12 +1130,7 @@ function jumpToUrl(URL) {
         * @return void
         */
        public function addStyleSheet($key, $href, $title = '', $relation = 'stylesheet') {
-               if (strpos($href, '://') !== FALSE || $href[0] === '/') {
-                       $file = $href;
-               } else {
-                       $file = $this->backPath . $href;
-               }
-               $this->pageRenderer->addCssFile($file, $relation, 'screen', $title);
+               $this->pageRenderer->addCssFile($href, $relation, 'screen', $title);
        }
 
        /**
@@ -1470,15 +1454,14 @@ function jumpToUrl(URL) {
        }
 
        /**
-        * Includes a javascript library that exists in the core /typo3/ directory. The
-        * backpath is automatically applied
+        * Includes a javascript library that exists in the core /typo3/ directory
         *
         * @param string $lib: Library name. Call it with the full path like "sysext/core/Resources/Public/JavaScript/QueryGenerator.js" to load it
         * @return void
         */
        public function loadJavascriptLib($lib) {
                // @todo: maybe we can remove this one as well
-               $this->pageRenderer->addJsFile($this->backPath . $lib);
+               $this->pageRenderer->addJsFile($lib);
        }
 
        /**
@@ -1673,7 +1656,7 @@ function jumpToUrl(URL) {
                if (GeneralUtility::isFirstPartOfStr($filename, 'EXT:')) {
                        $filename = GeneralUtility::getFileAbsFileName($filename, TRUE, TRUE);
                } elseif (!GeneralUtility::isAbsPath($filename)) {
-                       $filename = GeneralUtility::resolveBackPath($this->backPath . $filename);
+                       $filename = GeneralUtility::resolveBackPath($filename);
                } elseif (!GeneralUtility::isAllowedAbsPath($filename)) {
                        $filename = '';
                }
@@ -1955,7 +1938,7 @@ function jumpToUrl(URL) {
        * @return string
        */
        protected function getBackendFavicon() {
-               return $GLOBALS['TBE_STYLES']['favicon'] ?: $this->backPath . 'sysext/backend/Resources/Public/Icons/favicon.ico';
+               return $GLOBALS['TBE_STYLES']['favicon'] ?: 'sysext/backend/Resources/Public/Icons/favicon.ico';
        }
 
 }
index 8d1cf80..ff5dfc3 100644 (file)
@@ -166,13 +166,6 @@ abstract class AbstractTreeView {
        public $domIdPrefix = 'row';
 
        /**
-        * Back path for icons
-        *
-        * @var string
-        */
-       public $backPath;
-
-       /**
         * If TRUE, HTML code is also accumulated in ->tree array during rendering of the tree.
         * If 2, then also the icon prefix code (depthData) is stored
         *
@@ -288,7 +281,6 @@ abstract class AbstractTreeView {
 
        /**
         * Initialize the tree class. Needs to be overwritten
-        * Will set ->fieldsArray, ->backPath and ->clause
         *
         * @param string Record WHERE clause
         * @param string Record ORDER BY field
@@ -297,8 +289,6 @@ abstract class AbstractTreeView {
        public function init($clause = '', $orderByFields = '') {
                // Setting BE_USER by default
                $this->BE_USER = $GLOBALS['BE_USER'];
-               // Setting backpath.
-               $this->backPath = $GLOBALS['BACK_PATH'];
                // Setting clause
                if ($clause) {
                        $this->clause = $clause;
index 4c8b745..6f54e2d 100644 (file)
@@ -36,11 +36,6 @@ class PagePositionMap {
         */
        public $dontPrintPageInsertIcons = 0;
 
-       /**
-        * @var string
-        */
-       public $backPath = '';
-
        // How deep the position page tree will go.
        /**
         * @var int
index 5db2703..d8e2f4d 100755 (executable)
@@ -1639,7 +1639,7 @@ class BackendUtility {
         * @param bool $linkInfoPopup Whether to wrap with a link opening the info popup
         * @return string Thumbnail image tag.
         */
-       static public function thumbCode($row, $table, $field, $backPath, $thumbScript = '', $uploaddir = NULL, $abs = 0, $tparams = '', $size = '', $linkInfoPopup = TRUE) {
+       static public function thumbCode($row, $table, $field, $backPath = '', $thumbScript = '', $uploaddir = NULL, $abs = 0, $tparams = '', $size = '', $linkInfoPopup = TRUE) {
                // Check and parse the size parameter
                $size = trim($size);
                $sizeParts = array(64, 64);
@@ -2782,13 +2782,13 @@ class BackendUtility {
         * REMEMBER to always htmlspecialchar() content in href-properties to ampersands get converted to entities (XHTML requirement and XSS precaution)
         *
         * @param string $params Parameters sent along to EditDocumentController. This requires a much more details description which you must seek in Inside TYPO3s documentation of the FormEngine API. And example could be '&edit[pages][123] = edit' which will show edit form for page record 123.
-        * @param string $backPath (unused)
+        * @param string $_ (unused)
         * @param string $requestUri An optional returnUrl you can set - automatically set to REQUEST_URI.
         *
         * @return string
         * @see \TYPO3\CMS\Backend\Template\DocumentTemplate::issueCommand()
         */
-       static public function editOnClick($params, $backPath = '', $requestUri = '') {
+       static public function editOnClick($params, $_ = '', $requestUri = '') {
                if ($requestUri == -1) {
                        $returnUrl = 'T3_THIS_LOCATION';
                } else {
index 3ec681c..15313ad 100644 (file)
@@ -523,7 +523,7 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe
                                                                        '&returnUrl=' . rawurlencode(GeneralUtility::getIndpEnv('REQUEST_URI'))) . ';';
                                                        } else {
                                                                $params = '&edit[tt_content][' . -$row['uid'] . ']=new';
-                                                               $onClick = BackendUtility::editOnClick($params, $this->backPath);
+                                                               $onClick = BackendUtility::editOnClick($params);
                                                        }
                                                        $singleElementHTML .= '
                                                                <a href="#" onclick="' . htmlspecialchars($onClick) . '" title="'
@@ -672,7 +672,7 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe
                                // "View page" icon is added:
                                $viewLink = '';
                                if (!VersionState::cast($this->getPageLayoutController()->pageinfo['t3ver_state'])->equals(VersionState::DELETE_PLACEHOLDER)) {
-                                       $onClick = BackendUtility::viewOnClick($this->id, $this->backPath, BackendUtility::BEgetRootLine($this->id), '', '', ('&L=' . $lP));
+                                       $onClick = BackendUtility::viewOnClick($this->id, '', BackendUtility::BEgetRootLine($this->id), '', '', ('&L=' . $lP));
                                        $viewLink = '<a href="#" onclick="' . htmlspecialchars($onClick) . '" title="' . $this->getLanguageService()->sL('LLL:EXT:lang/locallang_core.xlf:labels.showPage', TRUE) . '">' . IconUtility::getSpriteIcon('actions-document-view') . '</a>';
                                }
                                // Language overlay page header:
@@ -2046,7 +2046,7 @@ class PageLayoutView extends \TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRe
         * @return string HTML for thumbnails, if any.
         */
        public function getThumbCodeUnlinked($row, $table, $field) {
-               return BackendUtility::thumbCode($row, $table, $field, $this->backPath, '', NULL, 0, '', '', FALSE);
+               return BackendUtility::thumbCode($row, $table, $field, '', '', NULL, 0, '', '', FALSE);
        }
 
        /**
index b7c6168..02ece6f 100644 (file)
@@ -182,7 +182,6 @@ class FormsController extends \TYPO3\CMS\Backend\Controller\Wizard\AbstractWizar
                $this->xmlStorage = $this->P['params']['xmlOutput'];
                // Document template object:
                $this->doc = GeneralUtility::makeInstance(\TYPO3\CMS\Backend\Template\DocumentTemplate::class);
-               $this->doc->backPath = $this->getBackPath();
                $this->doc->setModuleTemplate('EXT:compatibility6/Resources/Private/Templates/Wizard/Forms.html');
                // Setting form tag:
                list($rUri) = explode('#', GeneralUtility::getIndpEnv('REQUEST_URI'));
index c803644..f1aa7ec 100644 (file)
@@ -283,7 +283,6 @@ class FileListController {
 
                        // Create filelisting object
                        $this->filelist = GeneralUtility::makeInstance(FileList::class);
-                       $this->filelist->backPath = $GLOBALS['BACK_PATH'];
                        // Apply predefined values for hidden checkboxes
                        // Set predefined value for DisplayBigControlPanel:
                        $backendUser = $this->getBackendUser();
index c7b04e9..75590c6 100644 (file)
@@ -572,7 +572,7 @@ class FileList extends AbstractRecordList {
         * @return string HTML
         */
        public function linkWrapDir($title, Folder $folderObject) {
-               $href = $this->backPath . $this->script . '&id=' . rawurlencode($folderObject->getCombinedIdentifier());
+               $href = $this->script . '&id=' . rawurlencode($folderObject->getCombinedIdentifier());
                $onclick = ' onclick="' . htmlspecialchars(('top.document.getElementsByName("navigation")[0].contentWindow.Tree.highlightActiveItem("file","folder' . GeneralUtility::md5int($folderObject->getCombinedIdentifier()) . '_"+top.fsMod.currentBank)')) . '"';
                // Sometimes $code contains plain HTML tags. In such a case the string should not be modified!
                if ((string)$title === strip_tags($title)) {
@@ -608,7 +608,7 @@ class FileList extends AbstractRecordList {
 
        /**
         * Returns list URL; This is the URL of the current script with id and imagemode parameters, that's all.
-        * The URL however is not relative (with the backpath), otherwise GeneralUtility::sanitizeLocalUrl() would say that
+        * The URL however is not relative, otherwise GeneralUtility::sanitizeLocalUrl() would say that
         * the URL would be invalid
         *
         * @return string URL
@@ -695,7 +695,7 @@ class FileList extends AbstractRecordList {
                                                                                'justLocalized' => 'sys_file_metadata:' . $metaDataRecord['uid'] . ':' . $languageId,
                                                                                'returnUrl' => $this->listURL()
                                                                        ];
-                                                                       $returnUrl = BackendUtility::getModuleUrl('record_edit', $parameters, $this->backPath) . BackendUtility::getUrlToken('editRecord');
+                                                                       $returnUrl = BackendUtility::getModuleUrl('record_edit', $parameters) . BackendUtility::getUrlToken('editRecord');
                                                                        $href = $GLOBALS['SOBE']->doc->issueCommand(
                                                                                '&cmd[sys_file_metadata][' . $metaDataRecord['uid'] . '][localize]=' . $languageId,
                                                                                $returnUrl
@@ -799,7 +799,7 @@ class FileList extends AbstractRecordList {
                        $params = '&SET[sort]=' . $col . '&SET[reverse]=0';
                        $sortArrow = '';
                }
-               $href = GeneralUtility::resolveBackPath(($GLOBALS['BACK_PATH'] . $this->script)) . '&id=' . rawurlencode($folderIdentifier) . $params;
+               $href = GeneralUtility::resolveBackPath($this->script) . '&id=' . rawurlencode($folderIdentifier) . $params;
                return '<a href="' . htmlspecialchars($href) . '">' . $code . ' ' . $sortArrow . '</a>';
        }
 
index 5309a73..e67bb5e 100644 (file)
@@ -81,7 +81,6 @@ class TableListViewHelper extends \TYPO3\CMS\Fluid\ViewHelpers\Be\AbstractBacken
                $pageinfo = \TYPO3\CMS\Backend\Utility\BackendUtility::readPageAccess(\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('id'), $GLOBALS['BE_USER']->getPagePermsClause(1));
                /** @var $dblist \TYPO3\CMS\Recordlist\RecordList\DatabaseRecordList */
                $dblist = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Recordlist\RecordList\DatabaseRecordList::class);
-               $dblist->backPath = $GLOBALS['BACK_PATH'];
                $dblist->pageRow = $pageinfo;
                if ($readOnly === FALSE) {
                        $dblist->calcPerms = $GLOBALS['BE_USER']->calcPerms($pageinfo);
index 18fa241..430e087 100644 (file)
@@ -53,7 +53,6 @@ class PageInformationController extends \TYPO3\CMS\Backend\Module\AbstractFuncti
        public function main() {
                $dblist = GeneralUtility::makeInstance(PageLayoutView::class);
                $dblist->descrTable = '_MOD_' . $GLOBALS['MCONF']['name'];
-               $dblist->backPath = $GLOBALS['BACK_PATH'];
                $dblist->thumbs = 0;
                $dblist->script = BackendUtility::getModuleUrl('web_info');
                $dblist->showIcon = 0;
index cff48df..35a8249 100644 (file)
@@ -167,7 +167,7 @@ class ImportExportController extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
                                        // View
                                        $onClick = BackendUtility::viewOnClick(
                                                $this->pageinfo['uid'],
-                                               $this->doc->backPath,
+                                               '',
                                                BackendUtility::BEgetRootLine($this->pageinfo['uid'])
                                        );
                                        $title = $this->lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.showPage', TRUE);
@@ -1120,7 +1120,7 @@ class ImportExportController extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
                                                // Check that the image really is an image and not a malicious PHP script...
                                                if (getimagesize($fileName)) {
                                                        // Create icon tag:
-                                                       $iconTag = '<img src="' . $this->doc->backPath . '../' . PathUtility::stripPathSitePrefix($fileName)
+                                                       $iconTag = '<img src="../' . PathUtility::stripPathSitePrefix($fileName)
                                                                . '" ' . $import->dat['header']['thumbnail']['imgInfo'][3]
                                                                . ' vspace="5" style="border: solid black 1px;" alt="" />';
                                                        $trow[] = '<tr class="bgColor4">
index 03a51ad..865ab54 100755 (executable)
@@ -1716,7 +1716,6 @@ class ElementBrowser {
                        $dbList = GeneralUtility::makeInstance(ElementBrowserRecordList::class);
                }
                $dbList->thisScript = $this->thisScript;
-               $dbList->backPath = $GLOBALS['BACK_PATH'];
                $dbList->thumbs = 0;
                $dbList->localizationView = 1;
                $dbList->setIsEditable(FALSE);
index d52e9fc..8e3f42d 100644 (file)
@@ -304,7 +304,6 @@ class RecordList {
                // Initialize the dblist object:
                /** @var $dblist RecordList\DatabaseRecordList */
                $dblist = GeneralUtility::makeInstance(RecordList\DatabaseRecordList::class);
-               $dblist->backPath = $GLOBALS['BACK_PATH'];
                $dblist->script = BackendUtility::getModuleUrl('web_list');
                $dblist->calcPerms = $calcPerms;
                $dblist->thumbs = $backendUser->uc['thumbnailsByDefault'];
index 1b57d0f..c5448c2 100644 (file)
@@ -610,7 +610,7 @@ class AbstractDatabaseRecordList extends AbstractRecordList {
         * @return string HTML for thumbnails, if any.
         */
        public function thumbCode($row, $table, $field) {
-               return BackendUtility::thumbCode($row, $table, $field, $this->backPath);
+               return BackendUtility::thumbCode($row, $table, $field);
        }
 
        /**
@@ -1042,7 +1042,7 @@ class AbstractDatabaseRecordList extends AbstractRecordList {
                        $localizedRecord = $this->getDatabaseConnection()->exec_SELECTgetSingleRow('uid', $table, $GLOBALS['TCA'][$table]['ctrl']['languageField'] . '=' . (int)$language . ' AND ' . $GLOBALS['TCA'][$table]['ctrl']['transOrigPointerField'] . '=' . (int)$orig_uid . BackendUtility::deleteClause($table) . BackendUtility::versioningPlaceholderClause($table));
                        if (is_array($localizedRecord)) {
                                // Create parameters and finally run the classic page module for creating a new page translation
-                               $url = substr($this->listURL(), strlen($this->backPath));
+                               $url = $this->listURL();
                                $editUserAccountUrl = BackendUtility::getModuleUrl(
                                        'record_edit',
                                        array(
index 2987844..b4b7439 100644 (file)
@@ -240,7 +240,7 @@ class DatabaseRecordList extends AbstractDatabaseRecordList {
                                );
                        }
                        if (!in_array($this->pageRow['doktype'], $noViewDokTypes)) {
-                               $onClick = htmlspecialchars(BackendUtility::viewOnClick($this->id, $this->backPath, BackendUtility::BEgetRootLine($this->id)));
+                               $onClick = htmlspecialchars(BackendUtility::viewOnClick($this->id, '', BackendUtility::BEgetRootLine($this->id)));
                                $buttons['view'] = '<a href="#" onclick="' . $onClick . '" title="'
                                        . $lang->sL('LLL:EXT:lang/locallang_core.xlf:labels.showPage', TRUE) . '">'
                                        . IconUtility::getSpriteIcon('actions-document-view') . '</a>';
@@ -968,7 +968,7 @@ class DatabaseRecordList extends AbstractDatabaseRecordList {
                                                                $tmpTSc = BackendUtility::getModTSconfig($this->pageinfo['uid'], 'mod.web_list');
                                                                $tmpTSc = $tmpTSc['properties']['newContentWiz.']['overrideWithExtension'];
                                                                $newContentWizScriptPath = ExtensionManagementUtility::isLoaded($tmpTSc)
-                                                                       ? $this->backPath . ExtensionManagementUtility::extRelPath($tmpTSc) . 'mod1/db_new_content_el.php?id=' . $this->id
+                                                                       ? ExtensionManagementUtility::extRelPath($tmpTSc) . 'mod1/db_new_content_el.php?id=' . $this->id
                                                                        : BackendUtility::getModuleUrl('new_content_element', array('id' => $this->id));
 
                                                                $onClick = 'return jumpExt(' . GeneralUtility::quoteJSvalue($newContentWizScriptPath) . ');';
@@ -1215,7 +1215,7 @@ class DatabaseRecordList extends AbstractDatabaseRecordList {
                                . htmlspecialchars(
                                        BackendUtility::viewOnClick(
                                                ($table === 'tt_content' ? $this->id : $row['uid']),
-                                               $this->backPath,
+                                               '',
                                                '',
                                                ($table === 'tt_content' ? '#' . $row['uid'] : '')
                                        )
@@ -1240,7 +1240,7 @@ class DatabaseRecordList extends AbstractDatabaseRecordList {
                $this->addActionToCellGroup($cells, $viewBigAction, 'viewBig');
                // "Move" wizard link for pages/tt_content elements:
                if ($permsEdit && ($table === 'tt_content' || $table === 'pages')) {
-                       $onClick = 'return jumpExt(\'' . $this->backPath . BackendUtility::getModuleUrl('move_element') . '&table=' . $table . '&uid=' . $row['uid'] . '\');';
+                       $onClick = 'return jumpExt(\'' . BackendUtility::getModuleUrl('move_element') . '&table=' . $table . '&uid=' . $row['uid'] . '\');';
                        $linkTitleLL = $this->getLanguageService()->getLL('move_' . ($table === 'tt_content' ? 'record' : 'page'), TRUE);
                        $spriteIcon = $table === 'tt_content' ? 'actions-document-move' : 'actions-page-move';
                        $moveAction = '<a class="btn btn-default" href="#" onclick="' . htmlspecialchars($onClick) . '" title="' . $linkTitleLL . '">' . IconUtility::getSpriteIcon($spriteIcon) . '</a>';
@@ -1250,7 +1250,7 @@ class DatabaseRecordList extends AbstractDatabaseRecordList {
                if ($this->isEditable($table)) {
                        // "Revert" link (history/undo)
                        $moduleUrl = BackendUtility::getModuleUrl('record_history', array('element' => $table . ':' . $row['uid']));
-                       $onClick = 'return jumpExt(' . GeneralUtility::quoteJSvalue($this->backPath . $moduleUrl) . ',\'#latest\');';
+                       $onClick = 'return jumpExt(' . GeneralUtility::quoteJSvalue($moduleUrl) . ',\'#latest\');';
                        $historyAction = '<a class="btn btn-default" href="#" onclick="' . htmlspecialchars($onClick) . '" title="'
                                . $this->getLanguageService()->getLL('history', TRUE) . '">'
                                . IconUtility::getSpriteIcon('actions-document-history-open') . '</a>';
@@ -1264,7 +1264,7 @@ class DatabaseRecordList extends AbstractDatabaseRecordList {
                                        if (count($vers) > 1) {
                                                $versionIcon = count($vers) - 1;
                                        }
-                                       $href = $this->backPath . BackendUtility::getModuleUrl('web_txversionM1', array(
+                                       $href = BackendUtility::getModuleUrl('web_txversionM1', array(
                                                'table' => $table, 'uid' => $row['uid']
                                        ));
                                        $versionAction = '<a class="btn btn-default" href="' . htmlspecialchars($href) . '" title="'
@@ -1620,7 +1620,7 @@ class DatabaseRecordList extends AbstractDatabaseRecordList {
                        $lNew = '';
                        foreach ($this->pageOverlays as $lUid_OnPage => $lsysRec) {
                                if ($this->isEditable($table) && !isset($translations['translations'][$lUid_OnPage]) && $this->getBackendUserAuthentication()->checkLanguageAccess($lUid_OnPage)) {
-                                       $url = substr($this->listURL(), strlen($this->backPath));
+                                       $url = $this->listURL();
                                        $href = $this->getModule()->doc->issueCommand(
                                                '&cmd[' . $table . '][' . $row['uid'] . '][localize]=' . $lUid_OnPage,
                                                $url . '&justLocalized=' . rawurlencode($table . ':' . $row['uid'] . ':' . $lUid_OnPage)
index ce6b20d..638ee39 100644 (file)
@@ -139,7 +139,7 @@ class BrowseLinks extends ElementBrowser {
                $this->doc->getContextMenuCode();
                // Apply the same styles as those of the base script
                $this->doc->bodyTagId = 'typo3-browse-links-php';
-               $this->getPageRenderer()->addCssFile($this->doc->backPath . \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath('t3skin') . 'rtehtmlarea/htmlarea.css');
+               $this->getPageRenderer()->addCssFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath('t3skin') . 'rtehtmlarea/htmlarea.css');
                // Add attributes to body tag. Note: getBodyTagAdditions will invoke the hooks
                $this->doc->bodyTagAdditions = $this->getBodyTagAdditions();
                $this->getPageRenderer()->loadRequireJsModule('TYPO3/CMS/Backend/LegacyTree', 'function(Tree) {
index 4a1d07e..12f3583 100644 (file)
@@ -152,7 +152,7 @@ class SelectImage extends ElementBrowser {
                        SelectImage.RTEtsConfigParams = ' . GeneralUtility::quoteJSvalue(rawurlencode($this->RTEtsConfigParams)) . ';
                        SelectImage.bparams = ' . GeneralUtility::quoteJSvalue($this->bparams) . ';
                }');
-               $this->getPageRenderer()->addCssFile($this->doc->backPath . ExtensionManagementUtility::extRelPath('t3skin') . 'rtehtmlarea/htmlarea.css');
+               $this->getPageRenderer()->addCssFile(ExtensionManagementUtility::extRelPath('t3skin') . 'rtehtmlarea/htmlarea.css');
                $this->doc->getContextMenuCode();
        }
 
index d6525e6..b223965 100644 (file)
@@ -34,13 +34,6 @@ use TYPO3\CMS\Scheduler\Task\AbstractTask;
 class SchedulerModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
 
        /**
-        * Back path to typo3 main dir
-        *
-        * @var string
-        */
-       public $backPath;
-
-       /**
         * Array containing submitted data when editing or adding a task
         *
         * @var array
@@ -95,7 +88,6 @@ class SchedulerModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClas
                $this->MCONF = array(
                        'name' => $this->moduleName,
                );
-               $this->backPath = $GLOBALS['BACK_PATH'];
                $this->cshKey = '_MOD_' . $this->moduleName;
                $this->backendTemplatePath = ExtensionManagementUtility::extPath('scheduler') . 'Resources/Private/Templates/Backend/SchedulerModule/';
                $this->view = GeneralUtility::makeInstance(\TYPO3\CMS\Fluid\View\StandaloneView::class);
@@ -117,7 +109,6 @@ class SchedulerModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClas
                // Initialize document
                $this->doc = GeneralUtility::makeInstance(\TYPO3\CMS\Backend\Template\DocumentTemplate::class);
                $this->doc->setModuleTemplate(ExtensionManagementUtility::extPath('scheduler') . 'Resources/Private/Templates/Module.html');
-               $this->doc->backPath = $this->backPath;
                $this->doc->bodyTagId = 'typo3-mod-php';
                $this->doc->bodyTagAdditions = 'class="tx_scheduler_mod1"';
 
index e7a63dd..a397f92 100644 (file)
@@ -323,7 +323,6 @@ class SetupModuleController {
                }
                // Create instance of object for output of data
                $this->doc = GeneralUtility::makeInstance(\TYPO3\CMS\Backend\Template\DocumentTemplate::class);
-               $this->doc->backPath = $GLOBALS['BACK_PATH'];
                $this->doc->setModuleTemplate('EXT:setup/Resources/Private/Templates/setup.html');
                $this->doc->form = '<form action="' . BackendUtility::getModuleUrl('user_setup') . '" method="post" name="usersetup" enctype="multipart/form-data">';
                $this->doc->addStyleSheet('module', 'sysext/setup/Resources/Public/Css/styles.css');
index aec5a7e..55d30ea 100644 (file)
@@ -776,7 +776,6 @@ class ActionTask implements \TYPO3\CMS\Taskcenter\TaskInterface {
                        // Initialize the dblist object:
                        $dblist = GeneralUtility::makeInstance(\TYPO3\CMS\SysAction\ActionList::class);
                        $dblist->script = GeneralUtility::getIndpEnv('REQUEST_URI');
-                       $dblist->backPath = $GLOBALS['BACK_PATH'];
                        $dblist->calcPerms = $this->getBackendUser()->calcPerms($this->pageinfo);
                        $dblist->thumbs = $this->getBackendUser()->uc['thumbnailsByDefault'];
                        $dblist->returnUrl = $this->taskObject->returnUrl;
@@ -853,10 +852,7 @@ class ActionTask implements \TYPO3\CMS\Taskcenter\TaskInterface {
                        if ($dblist->HTMLcode) {
                                // Making field select box (when extended view for a single table is enabled):
                                if ($dblist->table) {
-                                       $tmpBackpath = $GLOBALS['BACK_PATH'];
-                                       $GLOBALS['BACK_PATH'] = '';
                                        $content .= $dblist->fieldSelectBox($dblist->table);
-                                       $GLOBALS['BACK_PATH'] = $tmpBackpath;
                                }
                        }
                } else {
index 7219d89..22f7c00 100644 (file)
@@ -482,12 +482,12 @@ class VersionModuleController extends \TYPO3\CMS\Backend\Module\BaseScriptClass
                        $adminLink .= '<a href="#" onclick="top.loadEditId(' . $row['uid'] . ');top.goToModule(\'' . $pageModule . '\'); return false;">' . IconUtility::getSpriteIcon('actions-page-open') . '</a>';
                        $adminLink .= '<a href="#" onclick="top.loadEditId(' . $row['uid'] . ');top.goToModule(\'web_list\'); return false;">' . IconUtility::getSpriteIcon('actions-system-list-open') . '</a>';
                        // "View page" icon is added:
-                       $adminLink .= '<a href="#" onclick="' . htmlspecialchars(BackendUtility::viewOnClick($row['uid'], $this->doc->backPath, BackendUtility::BEgetRootLine($row['uid']))) . '">' . IconUtility::getSpriteIcon('actions-document-view') . '</a>';
+                       $adminLink .= '<a href="#" onclick="' . htmlspecialchars(BackendUtility::viewOnClick($row['uid'], '', BackendUtility::BEgetRootLine($row['uid']))) . '">' . IconUtility::getSpriteIcon('actions-document-view') . '</a>';
                } else {
                        if ($row['pid'] == -1) {
                                $getVars = '&ADMCMD_vPrev[' . rawurlencode(($table . ':' . $row['t3ver_oid'])) . ']=' . $row['uid'];
                                // "View page" icon is added:
-                               $adminLink .= '<a href="#" onclick="' . htmlspecialchars(BackendUtility::viewOnClick($row['_REAL_PID'], $this->doc->backPath, BackendUtility::BEgetRootLine($row['_REAL_PID']), '', '', $getVars)) . '">' . IconUtility::getSpriteIcon('actions-document-view') . '</a>';
+                               $adminLink .= '<a href="#" onclick="' . htmlspecialchars(BackendUtility::viewOnClick($row['_REAL_PID'], '', BackendUtility::BEgetRootLine($row['_REAL_PID']), '', '', $getVars)) . '">' . IconUtility::getSpriteIcon('actions-document-view') . '</a>';
                        }
                }
                return $adminLink;
index 044bae2..257c876 100644 (file)
@@ -40,11 +40,6 @@ class CreatePagesWizardModuleFunctionController extends \TYPO3\CMS\Backend\Modul
        protected $pagesTsConfig = array();
 
        /**
-        * @var string
-        */
-       protected $backPath = '';
-
-       /**
         * The type select HTML
         */
        protected $typeSelectHtml = '';
@@ -59,7 +54,6 @@ class CreatePagesWizardModuleFunctionController extends \TYPO3\CMS\Backend\Modul
                $theCode = '';
                $this->tsConfig = BackendUtility::getPagesTSconfig($this->pObj->id);
                $this->pagesTsConfig = isset($this->tsConfig['TCEFORM.']['pages.']) ? $this->tsConfig['TCEFORM.']['pages.'] : array();
-               $this->backPath = $GLOBALS['BACK_PATH'];
 
                // Create new pages here?
                $pageRecord = BackendUtility::getRecord('pages', $this->pObj->id, 'uid', ' AND ' . $this->getBackendUser()->getPagePermsClause(8));
@@ -263,7 +257,7 @@ class CreatePagesWizardModuleFunctionController extends \TYPO3\CMS\Backend\Modul
                        foreach ($items as $item) {
                                $label = $this->getLanguageService()->sL($item[0], TRUE);
                                $value = $item[1];
-                               $icon = (!empty($item[2]) ? '<img src="' . IconUtility::skinImg($this->backPath, 'gfx/' . $item[2], '', 1) . '" />' : '');
+                               $icon = (!empty($item[2]) ? '<img src="' . IconUtility::skinImg('', 'gfx/' . $item[2], '', 1) . '" />' : '');
                                $groupContent .= '<option value="' . htmlspecialchars($value) . '" data-icon="' . htmlspecialchars($icon) . '">' . $label . '</option>';
                        }
                        $groupLabel = $this->getLanguageService()->sL($groupLabel, TRUE);
index 06bddb7..957a40a 100644 (file)
@@ -53,8 +53,8 @@ class PreviewController extends AbstractController {
                ));
                $states = $GLOBALS['BE_USER']->uc['moduleData']['Workspaces']['States'];
                $this->pageRenderer->addInlineSetting('Workspaces', 'States', $states);
-               $this->pageRenderer->addJsFile($this->backPath . 'sysext/backend/Resources/Public/JavaScript/notifications.js');
-               $this->pageRenderer->addJsFile($this->backPath . 'sysext/backend/Resources/Public/JavaScript/iframepanel.js');
+               $this->pageRenderer->addJsFile('sysext/backend/Resources/Public/JavaScript/notifications.js');
+               $this->pageRenderer->addJsFile('sysext/backend/Resources/Public/JavaScript/iframepanel.js');
                $resourcePathJavaScript = ExtensionManagementUtility::extRelPath('workspaces') . 'Resources/Public/JavaScript/';
                $jsFiles = array(
                        'Ext.ux.plugins.TabStripContainer.js',
index b120e44..0403322 100644 (file)
@@ -146,9 +146,9 @@ class ReviewController extends AbstractController {
                $this->pageRenderer->addExtDirectCode(array(
                        'TYPO3.Workspaces'
                ));
-               $this->pageRenderer->addJsFile($this->backPath . 'sysext/backend/Resources/Public/JavaScript/extjs/ux/Ext.grid.RowExpander.js');
-               $this->pageRenderer->addJsFile($this->backPath . 'sysext/backend/Resources/Public/JavaScript/extjs/ux/Ext.app.SearchField.js');
-               $this->pageRenderer->addJsFile($this->backPath . 'sysext/backend/Resources/Public/JavaScript/extjs/ux/Ext.ux.FitToParent.js');
+               $this->pageRenderer->addJsFile('sysext/backend/Resources/Public/JavaScript/extjs/ux/Ext.grid.RowExpander.js');
+               $this->pageRenderer->addJsFile('sysext/backend/Resources/Public/JavaScript/extjs/ux/Ext.app.SearchField.js');
+               $this->pageRenderer->addJsFile('sysext/backend/Resources/Public/JavaScript/extjs/ux/Ext.ux.FitToParent.js');
                $resourcePath = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath('workspaces') . 'Resources/Public/JavaScript/';
 
                // @todo Integrate additional stylesheet resources