[TASK] Improve usability of EXT:impexp 80/45880/2
authorGeorg Ringer <georg.ringer@gmail.com>
Thu, 14 Jan 2016 10:40:47 +0000 (11:40 +0100)
committerMarkus Klein <markus.klein@typo3.org>
Thu, 14 Jan 2016 12:04:47 +0000 (13:04 +0100)
Improve usability at:
- Use public url instead of combined identifier to show the upload folder
- Don't show a warning if the empty value is selected of extension dependencies

Change-Id: I365d0a3192393a25ebbb85af27df9246c677fba8
Resolves: #72695
Releases: master, 7.6
Reviewed-on: https://review.typo3.org/45880
Reviewed-by: Markus Klein <markus.klein@typo3.org>
Tested-by: Markus Klein <markus.klein@typo3.org>
typo3/sysext/impexp/Classes/Controller/ImportExportController.php
typo3/sysext/impexp/Classes/ImportExport.php

index 88515f6..421445b 100644 (file)
@@ -973,7 +973,7 @@ class ImportExportController extends BaseScriptClass
         $opt['xml'] = $this->lang->getLL('makesavefo_xml');
         $fileName = '';
         if ($saveFolder) {
-            $fileName = sprintf($this->lang->getLL('makesavefo_filenameSavedInS', true), $saveFolder->getCombinedIdentifier())
+            $fileName = sprintf($this->lang->getLL('makesavefo_filenameSavedInS', true), $saveFolder->getPublicUrl())
                 . '<br/>
                                                <input type="text" name="tx_impexp[filename]" value="'
                 . htmlspecialchars($inData['filename']) . '" /><br/>';
@@ -1069,7 +1069,7 @@ class ImportExportController extends BaseScriptClass
                                        </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)) .
+                        . sprintf($this->lang->getLL('importdata_fromPathS', true), $path ? $path->getPublicUrl() : $this->lang->getLL('importdata_no_accessible_file_mount', true)) .
                         $noCompressorAvailable . '
                                        </td>
                                </tr>';
index 9646e09..47fe0c3 100644 (file)
@@ -3462,7 +3462,7 @@ class ImportExport
         // Check extension dependencies:
         if (is_array($this->dat['header']['extensionDependencies'])) {
             foreach ($this->dat['header']['extensionDependencies'] as $extKey) {
-                if (!ExtensionManagementUtility::isLoaded($extKey)) {
+                if (!empty($extKey) && !ExtensionManagementUtility::isLoaded($extKey)) {
                     $this->error('DEPENDENCY: The extension with key "' . $extKey . '" must be installed!');
                 }
             }