@@ -1,11 +1,11 @@ discard block |
||
1 | 1 | <?php |
2 | -<<<<<<< 5851fedfe7b02562c0bb0e52a45b9344b357a91b |
|
3 | -if (!defined ('TYPO3_MODE')) die ('Access denied.'); |
|
2 | +<<<<<<<5851fedfe7b02562c0bb0e52a45b9344b357a91b |
|
3 | +if (!defined('TYPO3_MODE')) die ('Access denied.'); |
|
4 | 4 | |
5 | 5 | \TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin( |
6 | 6 | $_EXTKEY |
7 | 7 | ); |
8 | -======= |
|
8 | +=== === = |
|
9 | 9 | if (!defined('TYPO3_MODE')) { |
10 | 10 | die('Access denied.'); |
11 | 11 | } |
@@ -14,4 +14,4 @@ discard block |
||
14 | 14 | 'Onpage', |
15 | 15 | array() |
16 | 16 | ); |
17 | ->>>>>>> Added BE Module |
|
17 | +>>>>>>>Added BE Module |
@@ -9,8 +9,8 @@ |
||
9 | 9 | if (TYPO3_MODE === 'BE') { |
10 | 10 | \TYPO3\CMS\Extbase\Utility\ExtensionUtility::registerModule( |
11 | 11 | 'HDNET.'.$_EXTKEY, |
12 | - 'web', // Position of the module |
|
13 | - 'management', // module name |
|
12 | + 'web', // Position of the module |
|
13 | + 'management', // module name |
|
14 | 14 | '', |
15 | 15 | array( // Allowed controller action combinations |
16 | 16 | 'Backend' => 'index', |
@@ -20,7 +20,7 @@ |
||
20 | 20 | $apiEndpoint = 'https://api.onpage.org'; |
21 | 21 | $zoomRoute = '/zoom/json'; |
22 | 22 | |
23 | - $requestUrl = $apiEndpoint . $zoomRoute; |
|
23 | + $requestUrl = $apiEndpoint.$zoomRoute; |
|
24 | 24 | |
25 | 25 | |
26 | 26 | /*** |