@@ -79,8 +79,7 @@ |
||
| 79 | 79 | if( copy( $item, $target ) === false ) { |
| 80 | 80 | throw new \RuntimeException( sprintf( 'Unable to copy file "%1$s"', $item ) ); |
| 81 | 81 | } |
| 82 | - } |
|
| 83 | - else |
|
| 82 | + } else |
|
| 84 | 83 | { |
| 85 | 84 | self::createDirectory( $target ); |
| 86 | 85 | } |
@@ -23,7 +23,7 @@ |
||
| 23 | 23 | /** |
| 24 | 24 | * Creates new translation objects. |
| 25 | 25 | * |
| 26 | - * @param array $i18nPaths Paths to the translation directories |
|
| 26 | + * @param array $i18nPaths Paths to the translation directories |
|
| 27 | 27 | * @param array $langIds List of two letter ISO language IDs |
| 28 | 28 | * @param array $local List of local translation entries overwriting the standard ones |
| 29 | 29 | * @return array List of translation objects implementing MW_Translation_Interface |
@@ -79,13 +79,11 @@ discard block |
||
| 79 | 79 | $groups[] = $entry['title']; |
| 80 | 80 | } |
| 81 | 81 | $helper = new \Aimeos\MW\View\Helper\Access\Standard( $view, $groups ); |
| 82 | - } |
|
| 83 | - else |
|
| 82 | + } else |
|
| 84 | 83 | { |
| 85 | 84 | $helper = new \Aimeos\MW\View\Helper\Access\All( $view ); |
| 86 | 85 | } |
| 87 | - } |
|
| 88 | - else |
|
| 86 | + } else |
|
| 89 | 87 | { |
| 90 | 88 | if( $GLOBALS['TSFE']->loginUser == 1 ) { |
| 91 | 89 | $helper = new \Aimeos\MW\View\Helper\Access\Standard( $view, $GLOBALS['TSFE']->fe_user->groupData['title'] ); |
@@ -275,8 +273,7 @@ discard block |
||
| 275 | 273 | { |
| 276 | 274 | $i18n = \Aimeos\Aimeos\Base::getI18n( array( $langid ), $local ); |
| 277 | 275 | $translation = $i18n[$langid]; |
| 278 | - } |
|
| 279 | - else |
|
| 276 | + } else |
|
| 280 | 277 | { |
| 281 | 278 | $translation = new \Aimeos\MW\Translation\None( 'en' ); |
| 282 | 279 | } |
@@ -326,8 +323,7 @@ discard block |
||
| 326 | 323 | } |
| 327 | 324 | |
| 328 | 325 | $url = new \Aimeos\MW\View\Helper\Url\Typo3( $view, $uriBuilder, $fixed ); |
| 329 | - } |
|
| 330 | - else |
|
| 326 | + } else |
|
| 331 | 327 | { |
| 332 | 328 | $url = new \Aimeos\MW\View\Helper\Url\T3Cli( $view, $uriBuilder, $fixed ); |
| 333 | 329 | } |
@@ -142,15 +142,18 @@ discard block |
||
| 142 | 142 | return $fcn( $context ); |
| 143 | 143 | } |
| 144 | 144 | |
| 145 | - if( class_exists( '\TYPO3\CMS\Core\Crypto\PasswordHashing\PasswordHashFactory' ) ) // TYPO3 9+ |
|
| 145 | + if( class_exists( '\TYPO3\CMS\Core\Crypto\PasswordHashing\PasswordHashFactory' ) ) { |
|
| 146 | + // TYPO3 9+ |
|
| 146 | 147 | { |
| 147 | 148 | $factory = GeneralUtility::makeInstance( 'TYPO3\CMS\Core\Crypto\PasswordHashing\PasswordHashFactory' ); |
| 148 | - $context->setHasherTypo3( $factory->getDefaultHashInstance( 'FE' ) ); |
|
| 149 | 149 | } |
| 150 | - elseif( class_exists( '\TYPO3\CMS\Saltedpasswords\Salt\SaltFactory' ) ) // TYPO3 7/8 |
|
| 150 | + $context->setHasherTypo3( $factory->getDefaultHashInstance( 'FE' ) ); |
|
| 151 | + } elseif( class_exists( '\TYPO3\CMS\Saltedpasswords\Salt\SaltFactory' ) ) { |
|
| 152 | + // TYPO3 7/8 |
|
| 151 | 153 | { |
| 152 | 154 | $context->setHasherTypo3( \TYPO3\CMS\Saltedpasswords\Salt\SaltFactory::getSaltingInstance() ); |
| 153 | 155 | } |
| 156 | + } |
|
| 154 | 157 | |
| 155 | 158 | return $context; |
| 156 | 159 | } |
@@ -284,12 +287,10 @@ discard block |
||
| 284 | 287 | { |
| 285 | 288 | $context->setUserId( $GLOBALS['TSFE']->fe_user->user[$GLOBALS['TSFE']->fe_user->userid_column] ); |
| 286 | 289 | $context->setEditor( $GLOBALS['TSFE']->fe_user->user['username'] ); |
| 287 | - } |
|
| 288 | - elseif( TYPO3_MODE === 'BE' && isset( $GLOBALS['BE_USER']->user['username'] ) ) |
|
| 290 | + } elseif( TYPO3_MODE === 'BE' && isset( $GLOBALS['BE_USER']->user['username'] ) ) |
|
| 289 | 291 | { |
| 290 | 292 | $context->setEditor( $GLOBALS['BE_USER']->user['username'] ); |
| 291 | - } |
|
| 292 | - else |
|
| 293 | + } else |
|
| 293 | 294 | { |
| 294 | 295 | $context->setEditor( GeneralUtility::getIndpEnv( 'REMOTE_ADDR' ) ); |
| 295 | 296 | } |
@@ -316,8 +317,7 @@ discard block |
||
| 316 | 317 | { |
| 317 | 318 | $ids = GeneralUtility::trimExplode( ',', $GLOBALS['TSFE']->fe_user->user['usergroup'] ); |
| 318 | 319 | $context->setGroupIds( $ids ); |
| 319 | - } |
|
| 320 | - elseif( TYPO3_MODE === 'BE' && $GLOBALS['BE_USER']->userGroups ) |
|
| 320 | + } elseif( TYPO3_MODE === 'BE' && $GLOBALS['BE_USER']->userGroups ) |
|
| 321 | 321 | { |
| 322 | 322 | $ids = array_keys( $GLOBALS['BE_USER']->userGroups ); |
| 323 | 323 | $context->setGroupIds( $ids ); |
@@ -41,12 +41,12 @@ |
||
| 41 | 41 | self::addMessageQueueManager( $context ); |
| 42 | 42 | self::addLogger( $context ); |
| 43 | 43 | self::addCache( $context ); |
| 44 | - self::addMailer( $context); |
|
| 44 | + self::addMailer( $context ); |
|
| 45 | 45 | self::addProcess( $context ); |
| 46 | 46 | self::addSession( $context ); |
| 47 | - self::addHasher( $context); |
|
| 48 | - self::addUser( $context); |
|
| 49 | - self::addGroups( $context); |
|
| 47 | + self::addHasher( $context ); |
|
| 48 | + self::addUser( $context ); |
|
| 49 | + self::addGroups( $context ); |
|
| 50 | 50 | |
| 51 | 51 | self::$context = $context; |
| 52 | 52 | } |
@@ -23,7 +23,7 @@ |
||
| 23 | 23 | /** |
| 24 | 24 | * Creates a new configuration object. |
| 25 | 25 | * |
| 26 | - * @param array $paths Paths to the configuration directories |
|
| 26 | + * @param array $paths Paths to the configuration directories |
|
| 27 | 27 | * @param array $local Multi-dimensional associative list with local configuration |
| 28 | 28 | * @return \Aimeos\MW\Config\Iface Configuration object |
| 29 | 29 | */ |
@@ -119,8 +119,7 @@ |
||
| 119 | 119 | |
| 120 | 120 | $prop->setAccessible( true ); |
| 121 | 121 | $prop->setValue( $uriBuilder, $configurationManager ); |
| 122 | - } |
|
| 123 | - else |
|
| 122 | + } else |
|
| 124 | 123 | { |
| 125 | 124 | $uriBuilder->injectConfigurationManager( $configurationManager ); |
| 126 | 125 | } |
@@ -141,7 +141,7 @@ discard block |
||
| 141 | 141 | */ |
| 142 | 142 | public static function getSiteItems( \Aimeos\MShop\Context\Item\Iface $context, $sites ) |
| 143 | 143 | { |
| 144 | - if( !is_array( $sites ) ) { |
|
| 144 | + if( !is_array( $sites ) ) { |
|
| 145 | 145 | $sites = explode( ' ', $sites ); |
| 146 | 146 | } |
| 147 | 147 | |
@@ -173,7 +173,7 @@ discard block |
||
| 173 | 173 | $page->init( true ); |
| 174 | 174 | |
| 175 | 175 | $name = 'TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController'; |
| 176 | - $GLOBALS['TSFE'] = GeneralUtility::makeInstance( $name, $GLOBALS['TYPO3_CONF_VARS'], $pageid, 0 ); |
|
| 176 | + $GLOBALS['TSFE'] = GeneralUtility::makeInstance( $name, $GLOBALS['TYPO3_CONF_VARS'], $pageid, 0 ); |
|
| 177 | 177 | $GLOBALS['TSFE']->connectToDB(); |
| 178 | 178 | $GLOBALS['TSFE']->initFEuser(); |
| 179 | 179 | $GLOBALS['TSFE']->no_cache = true; |
@@ -57,7 +57,7 @@ |
||
| 57 | 57 | protected function execute( InputInterface $input, OutputInterface $output ) |
| 58 | 58 | { |
| 59 | 59 | $aimeos = \Aimeos\Aimeos\Base::getAimeos(); |
| 60 | - $config = \Aimeos\Aimeos\Base::getConfig(); |
|
| 60 | + $config = \Aimeos\Aimeos\Base::getConfig(); |
|
| 61 | 61 | $context = \Aimeos\Aimeos\Base::getContext( $config ); |
| 62 | 62 | $process = $context->getProcess(); |
| 63 | 63 | |
@@ -35,8 +35,8 @@ |
||
| 35 | 35 | 'realurl' => '1.12.8-2.99.99', |
| 36 | 36 | ), |
| 37 | 37 | ), |
| 38 | - 'autoload' => array ( |
|
| 39 | - 'psr-4' => array ( |
|
| 38 | + 'autoload' => array( |
|
| 39 | + 'psr-4' => array( |
|
| 40 | 40 | 'Aimeos\\Aimeos\\' => 'Classes', |
| 41 | 41 | ), |
| 42 | 42 | ), |
@@ -260,11 +260,11 @@ |
||
| 260 | 260 | */ |
| 261 | 261 | |
| 262 | 262 | if( !is_array( $GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['aimeos'] ) ) { |
| 263 | - $GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['aimeos'] = array(); |
|
| 263 | + $GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['aimeos'] = array(); |
|
| 264 | 264 | } |
| 265 | 265 | |
| 266 | 266 | if( !isset($GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['aimeos']['frontend'] ) ) { |
| 267 | - $GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['aimeos']['frontend'] = 'TYPO3\\CMS\\Core\\Cache\\Frontend\\StringFrontend'; |
|
| 267 | + $GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['aimeos']['frontend'] = 'TYPO3\\CMS\\Core\\Cache\\Frontend\\StringFrontend'; |
|
| 268 | 268 | } |
| 269 | 269 | |
| 270 | 270 | if( !isset($GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['aimeos']['options'] ) ) { |
@@ -1,6 +1,6 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -if ( ! defined( 'TYPO3_MODE' ) ) { |
|
| 3 | +if( !defined( 'TYPO3_MODE' ) ) { |
|
| 4 | 4 | die ( 'Access denied.' ); |
| 5 | 5 | } |
| 6 | 6 | |
@@ -263,15 +263,15 @@ discard block |
||
| 263 | 263 | $GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['aimeos'] = array(); |
| 264 | 264 | } |
| 265 | 265 | |
| 266 | -if( !isset($GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['aimeos']['frontend'] ) ) { |
|
| 266 | +if( !isset( $GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['aimeos']['frontend'] ) ) { |
|
| 267 | 267 | $GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['aimeos']['frontend'] = 'TYPO3\\CMS\\Core\\Cache\\Frontend\\StringFrontend'; |
| 268 | 268 | } |
| 269 | 269 | |
| 270 | -if( !isset($GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['aimeos']['options'] ) ) { |
|
| 270 | +if( !isset( $GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['aimeos']['options'] ) ) { |
|
| 271 | 271 | $GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['aimeos']['options'] = array( 'defaultLifetime' => 0 ); |
| 272 | 272 | } |
| 273 | 273 | |
| 274 | -if( !isset($GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['aimeos']['groups'] ) ) { |
|
| 274 | +if( !isset( $GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['aimeos']['groups'] ) ) { |
|
| 275 | 275 | $GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['aimeos']['groups'] = array( 'pages' ); |
| 276 | 276 | } |
| 277 | 277 | |