Follow-up to #16267 catch empty language selection, init soap with empty credentials...
authorSteffen Kamper <info@sk-typo3.de>
Thu, 2 Dec 2010 00:25:30 +0000 (00:25 +0000)
committerSteffen Kamper <info@sk-typo3.de>
Thu, 2 Dec 2010 00:25:30 +0000 (00:25 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@9745 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/sysext/em/classes/class.tx_em_extensionmanager.php
typo3/sysext/em/classes/connection/class.tx_em_connection_extdirectserver.php
typo3/sysext/em/classes/connection/class.tx_em_connection_extdirectsoap.php
typo3/sysext/em/ext_tables.php

index 0e90f1e..ba592a1 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,7 @@
 
 2010-12-01  Steffen Kamper  <steffen@typo3.org>
 
+       * Follow-up to #16267 catch empty language selection
        * Fixed bug #16267 Add functions to provide mocks for makeInstance (Thanks to Oliver Klee)
        * Added Feature #16642: New extension manager part 2: Add ExtJs Module
        * Follow-up to #16234: ExtDirect Dataprovider for user settings
index 8c9a753..fc0ab63 100644 (file)
@@ -148,7 +148,7 @@ class tx_em_ExtensionManager {
                $settings = $this->parentObject->MOD_SETTINGS;
                $settings['siteUrl'] = t3lib_div::getIndpEnv('TYPO3_SITE_URL');
                $settings['backPath'] = $this->parentObject->doc->backPath;
-               $settings['hasCredentials'] = ($settings['fe_u'] !== '' && $settings['fe_p'] !== '');
+               $settings['hasCredentials'] = (isset($settings['fe_u']) && isset($settings['fe_p']) && $settings['fe_u'] !== '' && $settings['fe_p'] !== '');
                $settings['scriptLink'] = $this->parentObject->script;
 
                // TODO add mirrors to sys_ter record and delete from settings
index 61ebcb0..192c1af 100644 (file)
@@ -612,7 +612,7 @@ class tx_em_Connection_ExtDirectServer {
                                'label' => $label,
                                'lang' => $language,
                                'cls' => $cls,
-                               'selected' => in_array($language, $selected) ? 1 : 0
+                               'selected' => is_array($selected) && in_array($language, $selected) ? 1 : 0
                        );
                }
                return array(
index a3eb86c..1b6e187 100644 (file)
@@ -64,7 +64,7 @@ class tx_em_Connection_ExtDirectSoap {
                /** @var $repository tx_em_Repository */
                $this->repository = t3lib_div::makeInstance('tx_em_Repository', $this->settings['selectedRepository']);
 
-               if ($this->settings['fe_u'] && $this->settings['fe_p']) {
+               if (isset($this->settings['fe_u']) && isset($this->settings['fe_p']) && $this->settings['fe_u'] !== '' && $this->settings['fe_p'] !== '' ) {
                        $this->setAccountData($this->settings['fe_u'], $this->settings['fe_p']);
                }
 
@@ -189,7 +189,7 @@ class tx_em_Connection_ExtDirectSoap {
                                'username' => $this->settings['fe_u']
                        )
                );
-               $result = @$this->soapCall('getExtensionKeys', $params);
+               $result = $this->soapCall('getExtensionKeys', $params);
                $data = $this->addUploads($result['extensionKeyData']);
 
                if ($result['simpleResult']['resultCode'] == 10000 && $data !== NULL) {
index 5f8c020..17b79c7 100644 (file)
@@ -4,7 +4,7 @@ if (!defined ('TYPO3_MODE')) {
 }
 
 if (TYPO3_MODE === 'BE') {
-       t3lib_extMgm::addModule('tools', 'em', 'after:layout', t3lib_extMgm::extPath($_EXTKEY) . 'classes/');
+       t3lib_extMgm::addModule('tools', 'em', '', t3lib_extMgm::extPath($_EXTKEY) . 'classes/');
                // register Ext.Direct
        $TYPO3_CONF_VARS['SC_OPTIONS']['ExtDirect']['TYPO3.EM.ExtDirect'] = t3lib_extMgm::extPath($_EXTKEY) . 'classes/connection/class.tx_em_connection_extdirectserver.php:tx_em_Connection_ExtDirectServer';
        $TYPO3_CONF_VARS['SC_OPTIONS']['ExtDirect']['TYPO3.EMSOAP.ExtDirect'] = t3lib_extMgm::extPath($_EXTKEY) . 'classes/connection/class.tx_em_connection_extdirectsoap.php:tx_em_Connection_ExtDirectSoap';