@@ -226,7 +226,7 @@ |
||
| 226 | 226 | 'label' => 'LLL:EXT:dlf/Resources/Private/Language/Labels.xml:tx_dlf_documents.thumbnail', |
| 227 | 227 | 'config' => [ |
| 228 | 228 | 'type' => 'user', |
| 229 | - 'userFunc' => \Kitodo\Dlf\Hooks\UserFunc::class . '->displayThumbnail', |
|
| 229 | + 'userFunc' => \Kitodo\Dlf\Hooks\UserFunc::class.'->displayThumbnail', |
|
| 230 | 230 | ], |
| 231 | 231 | ], |
| 232 | 232 | 'metadata' => [ |
@@ -17,79 +17,79 @@ |
||
| 17 | 17 | $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['dlf_audioplayer'] = 'layout,select_key,pages,recursive'; |
| 18 | 18 | $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['dlf_audioplayer'] = 'pi_flexform'; |
| 19 | 19 | \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPlugin(['LLL:EXT:dlf/Resources/Private/Language/Labels.xml:tt_content.dlf_audioplayer', 'dlf_audioplayer'], 'list_type', 'dlf'); |
| 20 | -\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_audioplayer', 'FILE:EXT:' . 'dlf/Configuration/Flexforms/AudioPlayer.xml'); |
|
| 20 | +\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_audioplayer', 'FILE:EXT:'.'dlf/Configuration/Flexforms/AudioPlayer.xml'); |
|
| 21 | 21 | // Plugin "basket". |
| 22 | 22 | $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['dlf_basket'] = 'layout,select_key,pages,recursive'; |
| 23 | 23 | $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['dlf_basket'] = 'pi_flexform'; |
| 24 | 24 | \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPlugin(['LLL:EXT:dlf/Resources/Private/Language/Labels.xml:tt_content.dlf_basket', 'dlf_basket'], 'list_type', 'dlf'); |
| 25 | -\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_basket', 'FILE:EXT:' . 'dlf/Configuration/Flexforms/Basket.xml'); |
|
| 25 | +\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_basket', 'FILE:EXT:'.'dlf/Configuration/Flexforms/Basket.xml'); |
|
| 26 | 26 | // Plugin "calendar". |
| 27 | 27 | $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['dlf_calendar'] = 'layout,select_key,pages,recursive'; |
| 28 | 28 | $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['dlf_calendar'] = 'pi_flexform'; |
| 29 | 29 | \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPlugin(['LLL:EXT:dlf/Resources/Private/Language/Labels.xml:tt_content.dlf_calendar', 'dlf_calendar'], 'list_type', 'dlf'); |
| 30 | -\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_calendar', 'FILE:EXT:' . 'dlf/Configuration/Flexforms/Calendar.xml'); |
|
| 30 | +\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_calendar', 'FILE:EXT:'.'dlf/Configuration/Flexforms/Calendar.xml'); |
|
| 31 | 31 | // Plugin "collection". |
| 32 | 32 | $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['dlf_collection'] = 'layout,select_key,pages,recursive'; |
| 33 | 33 | $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['dlf_collection'] = 'pi_flexform'; |
| 34 | 34 | \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPlugin(['LLL:EXT:dlf/Resources/Private/Language/Labels.xml:tt_content.dlf_collection', 'dlf_collection'], 'list_type', 'dlf'); |
| 35 | -\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_collection', 'FILE:EXT:' . 'dlf/Configuration/Flexforms/Collection.xml'); |
|
| 35 | +\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_collection', 'FILE:EXT:'.'dlf/Configuration/Flexforms/Collection.xml'); |
|
| 36 | 36 | // Plugin "feeds". |
| 37 | 37 | $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['dlf_feeds'] = 'layout,select_key,pages,recursive'; |
| 38 | 38 | $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['dlf_feeds'] = 'pi_flexform'; |
| 39 | 39 | \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPlugin(['LLL:EXT:dlf/Resources/Private/Language/Labels.xml:tt_content.dlf_feeds', 'dlf_feeds'], 'list_type', 'dlf'); |
| 40 | -\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_feeds', 'FILE:EXT:' . 'dlf/Configuration/Flexforms/Feeds.xml'); |
|
| 40 | +\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_feeds', 'FILE:EXT:'.'dlf/Configuration/Flexforms/Feeds.xml'); |
|
| 41 | 41 | // Plugin "listview". |
| 42 | 42 | $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['dlf_listview'] = 'layout,select_key,pages,recursive'; |
| 43 | 43 | $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['dlf_listview'] = 'pi_flexform'; |
| 44 | 44 | \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPlugin(['LLL:EXT:dlf/Resources/Private/Language/Labels.xml:tt_content.dlf_listview', 'dlf_listview'], 'list_type', 'dlf'); |
| 45 | -\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_listview', 'FILE:EXT:' . 'dlf/Configuration/Flexforms/ListView.xml'); |
|
| 45 | +\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_listview', 'FILE:EXT:'.'dlf/Configuration/Flexforms/ListView.xml'); |
|
| 46 | 46 | // Plugin "metadata". |
| 47 | 47 | $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['dlf_metadata'] = 'layout,select_key,pages,recursive'; |
| 48 | 48 | $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['dlf_metadata'] = 'pi_flexform'; |
| 49 | 49 | \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPlugin(['LLL:EXT:dlf/Resources/Private/Language/Labels.xml:tt_content.dlf_metadata', 'dlf_metadata'], 'list_type', 'dlf'); |
| 50 | -\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_metadata', 'FILE:EXT:' . 'dlf/Configuration/Flexforms/Metadata.xml'); |
|
| 50 | +\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_metadata', 'FILE:EXT:'.'dlf/Configuration/Flexforms/Metadata.xml'); |
|
| 51 | 51 | // Plugin "navigation". |
| 52 | 52 | $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['dlf_navigation'] = 'layout,select_key,pages,recursive'; |
| 53 | 53 | $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['dlf_navigation'] = 'pi_flexform'; |
| 54 | 54 | \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPlugin(['LLL:EXT:dlf/Resources/Private/Language/Labels.xml:tt_content.dlf_navigation', 'dlf_navigation'], 'list_type', 'dlf'); |
| 55 | -\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_navigation', 'FILE:EXT:' . 'dlf/Configuration/Flexforms/Navigation.xml'); |
|
| 55 | +\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_navigation', 'FILE:EXT:'.'dlf/Configuration/Flexforms/Navigation.xml'); |
|
| 56 | 56 | // Plugin "oaipmh". |
| 57 | 57 | $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['dlf_oaipmh'] = 'layout,select_key,pages,recursive'; |
| 58 | 58 | $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['dlf_oaipmh'] = 'pi_flexform'; |
| 59 | 59 | \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPlugin(['LLL:EXT:dlf/Resources/Private/Language/Labels.xml:tt_content.dlf_oaipmh', 'dlf_oaipmh'], 'list_type', 'dlf'); |
| 60 | -\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_oaipmh', 'FILE:EXT:' . 'dlf/Configuration/Flexforms/OaiPmh.xml'); |
|
| 60 | +\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_oaipmh', 'FILE:EXT:'.'dlf/Configuration/Flexforms/OaiPmh.xml'); |
|
| 61 | 61 | // Plugin "pagegrid". |
| 62 | 62 | $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['dlf_pagegrid'] = 'layout,select_key,pages,recursive'; |
| 63 | 63 | $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['dlf_pagegrid'] = 'pi_flexform'; |
| 64 | 64 | \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPlugin(['LLL:EXT:dlf/Resources/Private/Language/Labels.xml:tt_content.dlf_pagegrid', 'dlf_pagegrid'], 'list_type', 'dlf'); |
| 65 | -\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_pagegrid', 'FILE:EXT:' . 'dlf/Configuration/Flexforms/PageGrid.xml'); |
|
| 65 | +\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_pagegrid', 'FILE:EXT:'.'dlf/Configuration/Flexforms/PageGrid.xml'); |
|
| 66 | 66 | // Plugin "pageview". |
| 67 | 67 | $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['dlf_pageview'] = 'layout,select_key,pages,recursive'; |
| 68 | 68 | $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['dlf_pageview'] = 'pi_flexform'; |
| 69 | 69 | \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPlugin(['LLL:EXT:dlf/Resources/Private/Language/Labels.xml:tt_content.dlf_pageview', 'dlf_pageview'], 'list_type', 'dlf'); |
| 70 | -\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_pageview', 'FILE:EXT:' . 'dlf/Configuration/Flexforms/PageView.xml'); |
|
| 70 | +\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_pageview', 'FILE:EXT:'.'dlf/Configuration/Flexforms/PageView.xml'); |
|
| 71 | 71 | // Plugin "search". |
| 72 | 72 | $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['dlf_search'] = 'layout,select_key,pages,recursive'; |
| 73 | 73 | $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['dlf_search'] = 'pi_flexform'; |
| 74 | 74 | \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPlugin(['LLL:EXT:dlf/Resources/Private/Language/Labels.xml:tt_content.dlf_search', 'dlf_search'], 'list_type', 'dlf'); |
| 75 | -\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_search', 'FILE:EXT:' . 'dlf/Configuration/Flexforms/Search.xml'); |
|
| 75 | +\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_search', 'FILE:EXT:'.'dlf/Configuration/Flexforms/Search.xml'); |
|
| 76 | 76 | // Plugin "statistics". |
| 77 | 77 | $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['dlf_statistics'] = 'layout,select_key,pages,recursive'; |
| 78 | 78 | $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['dlf_statistics'] = 'pi_flexform'; |
| 79 | 79 | \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPlugin(['LLL:EXT:dlf/Resources/Private/Language/Labels.xml:tt_content.dlf_statistics', 'dlf_statistics'], 'list_type', 'dlf'); |
| 80 | -\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_statistics', 'FILE:EXT:' . 'dlf/Configuration/Flexforms/Statistics.xml'); |
|
| 80 | +\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_statistics', 'FILE:EXT:'.'dlf/Configuration/Flexforms/Statistics.xml'); |
|
| 81 | 81 | // Plugin "tableofcontents". |
| 82 | 82 | $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['dlf_tableofcontents'] = 'layout,select_key,pages,recursive'; |
| 83 | 83 | $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['dlf_tableofcontents'] = 'pi_flexform'; |
| 84 | 84 | \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPlugin(['LLL:EXT:dlf/Resources/Private/Language/Labels.xml:tt_content.dlf_tableofcontents', 'dlf_tableofcontents'], 'list_type', 'dlf'); |
| 85 | -\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_tableofcontents', 'FILE:EXT:' . 'dlf/Configuration/Flexforms/TableOfContents.xml'); |
|
| 85 | +\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_tableofcontents', 'FILE:EXT:'.'dlf/Configuration/Flexforms/TableOfContents.xml'); |
|
| 86 | 86 | // Plugin "toolbox". |
| 87 | 87 | $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['dlf_toolbox'] = 'layout,select_key,pages,recursive'; |
| 88 | 88 | $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['dlf_toolbox'] = 'pi_flexform'; |
| 89 | 89 | \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPlugin(['LLL:EXT:dlf/Resources/Private/Language/Labels.xml:tt_content.dlf_toolbox', 'dlf_toolbox'], 'list_type', 'dlf'); |
| 90 | -\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_toolbox', 'FILE:EXT:' . 'dlf/Configuration/Flexforms/Toolbox.xml'); |
|
| 90 | +\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_toolbox', 'FILE:EXT:'.'dlf/Configuration/Flexforms/Toolbox.xml'); |
|
| 91 | 91 | // Plugin "validator". |
| 92 | 92 | $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_excludelist']['dlf_validator'] = 'layout,select_key,pages,recursive'; |
| 93 | 93 | $GLOBALS['TCA']['tt_content']['types']['list']['subtypes_addlist']['dlf_validator'] = 'pi_flexform'; |
| 94 | 94 | \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPlugin(['LLL:EXT:dlf/Resources/Private/Language/Labels.xml:tt_content.dlf_validator', 'dlf_validator'], 'list_type', 'dlf'); |
| 95 | -\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_validator', 'FILE:EXT:' . 'dlf/Configuration/Flexforms/Validator.xml'); |
|
| 95 | +\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPiFlexFormValue('dlf_validator', 'FILE:EXT:'.'dlf/Configuration/Flexforms/Validator.xml'); |
|
@@ -18,7 +18,7 @@ |
||
| 18 | 18 | '', |
| 19 | 19 | '', |
| 20 | 20 | [ |
| 21 | - 'routeTarget' => \Kitodo\Dlf\Module\NewTenant::class . '::main', |
|
| 21 | + 'routeTarget' => \Kitodo\Dlf\Module\NewTenant::class.'::main', |
|
| 22 | 22 | 'access' => 'admin', |
| 23 | 23 | 'name' => 'tools_dlfNewTenantModule', |
| 24 | 24 | 'icon' => 'EXT:dlf/Resources/Public/Icons/Extension.svg', |
@@ -56,7 +56,7 @@ |
||
| 56 | 56 | $tool = trim($tool); |
| 57 | 57 | $cObj = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer::class); |
| 58 | 58 | $cObj->data = $data; |
| 59 | - $content .= $this->templateService->substituteMarkerArray($subpart, ['###TOOL###' => $cObj->cObjGetSingle($GLOBALS['TSFE']->tmpl->setup['plugin.'][$tool], $GLOBALS['TSFE']->tmpl->setup['plugin.'][$tool . '.'])]); |
|
| 59 | + $content .= $this->templateService->substituteMarkerArray($subpart, ['###TOOL###' => $cObj->cObjGetSingle($GLOBALS['TSFE']->tmpl->setup['plugin.'][$tool], $GLOBALS['TSFE']->tmpl->setup['plugin.'][$tool.'.'])]); |
|
| 60 | 60 | } |
| 61 | 61 | return $this->pi_wrapInBaseClass($this->templateService->substituteSubpart($this->template, '###TOOLS###', $content, true)); |
| 62 | 62 | } |
@@ -20,8 +20,7 @@ discard block |
||
| 20 | 20 | * @subpackage dlf |
| 21 | 21 | * @access public |
| 22 | 22 | */ |
| 23 | -class Toolbox extends \Kitodo\Dlf\Common\AbstractPlugin |
|
| 24 | -{ |
|
| 23 | +class Toolbox extends \Kitodo\Dlf\Common\AbstractPlugin { |
|
| 25 | 24 | public $scriptRelPath = 'Classes/Plugin/Toolbox.php'; |
| 26 | 25 | |
| 27 | 26 | /** |
@@ -34,8 +33,7 @@ discard block |
||
| 34 | 33 | * |
| 35 | 34 | * @return string The content that is displayed on the website |
| 36 | 35 | */ |
| 37 | - public function main($content, $conf) |
|
| 38 | - { |
|
| 36 | + public function main($content, $conf) { |
|
| 39 | 37 | $this->init($conf); |
| 40 | 38 | // Quit without doing anything if required variable is not set. |
| 41 | 39 | if (empty($this->piVars['id'])) { |
@@ -28,8 +28,7 @@ discard block |
||
| 28 | 28 | * @subpackage dlf |
| 29 | 29 | * @access public |
| 30 | 30 | */ |
| 31 | -class Metadata extends \Kitodo\Dlf\Common\AbstractPlugin |
|
| 32 | -{ |
|
| 31 | +class Metadata extends \Kitodo\Dlf\Common\AbstractPlugin { |
|
| 33 | 32 | public $scriptRelPath = 'Classes/Plugin/Metadata.php'; |
| 34 | 33 | |
| 35 | 34 | /** |
@@ -50,8 +49,7 @@ discard block |
||
| 50 | 49 | * |
| 51 | 50 | * @return string The content that is displayed on the website |
| 52 | 51 | */ |
| 53 | - public function main($content, $conf) |
|
| 54 | - { |
|
| 52 | + public function main($content, $conf) { |
|
| 55 | 53 | $this->init($conf); |
| 56 | 54 | // Turn cache on. |
| 57 | 55 | $this->setCache(true); |
@@ -156,8 +154,7 @@ discard block |
||
| 156 | 154 | * |
| 157 | 155 | * @return string The metadata array ready for output |
| 158 | 156 | */ |
| 159 | - protected function printMetadata(array $metadataArray, $useOriginalIiifManifestMetadata = false) |
|
| 160 | - { |
|
| 157 | + protected function printMetadata(array $metadataArray, $useOriginalIiifManifestMetadata = false) { |
|
| 161 | 158 | // Load template file. |
| 162 | 159 | $this->getTemplate(); |
| 163 | 160 | $output = ''; |
@@ -130,7 +130,7 @@ discard block |
||
| 130 | 130 | array_unshift($metadata, $data); |
| 131 | 131 | } |
| 132 | 132 | if (empty($metadata)) { |
| 133 | - $this->logger->warning('No metadata found for document with UID ' . $this->doc->uid); |
|
| 133 | + $this->logger->warning('No metadata found for document with UID '.$this->doc->uid); |
|
| 134 | 134 | return $content; |
| 135 | 135 | } |
| 136 | 136 | ksort($metadata); |
@@ -184,7 +184,7 @@ discard block |
||
| 184 | 184 | $iiifLink['value.']['wrap'] = '<dd>|</dd>'; |
| 185 | 185 | foreach ($metadataArray as $metadata) { |
| 186 | 186 | foreach ($metadata as $key => $group) { |
| 187 | - $markerArray['###METADATA###'] = '<span class="tx-dlf-metadata-group">' . $this->pi_getLL($key) . '</span>'; |
|
| 187 | + $markerArray['###METADATA###'] = '<span class="tx-dlf-metadata-group">'.$this->pi_getLL($key).'</span>'; |
|
| 188 | 188 | // Reset content object's data array. |
| 189 | 189 | $this->cObj->data = $cObjData; |
| 190 | 190 | if (!is_array($group)) { |
@@ -302,7 +302,7 @@ discard block |
||
| 302 | 302 | if (empty($value) && $this->conf['getTitle'] && $this->doc->parentId) { |
| 303 | 303 | $superiorTitle = Document::getTitle($this->doc->parentId, true); |
| 304 | 304 | if (!empty($superiorTitle)) { |
| 305 | - $value = '[' . $superiorTitle . ']'; |
|
| 305 | + $value = '['.$superiorTitle.']'; |
|
| 306 | 306 | } |
| 307 | 307 | } |
| 308 | 308 | if (!empty($value)) { |
@@ -25,8 +25,7 @@ discard block |
||
| 25 | 25 | * @subpackage dlf |
| 26 | 26 | * @access public |
| 27 | 27 | */ |
| 28 | -class Calendar extends \Kitodo\Dlf\Common\AbstractPlugin |
|
| 29 | -{ |
|
| 28 | +class Calendar extends \Kitodo\Dlf\Common\AbstractPlugin { |
|
| 30 | 29 | public $scriptRelPath = 'Classes/Plugin/Calendar.php'; |
| 31 | 30 | |
| 32 | 31 | /** |
@@ -47,8 +46,7 @@ discard block |
||
| 47 | 46 | * |
| 48 | 47 | * @return string The content that is displayed on the website |
| 49 | 48 | */ |
| 50 | - public function main($content, $conf) |
|
| 51 | - { |
|
| 49 | + public function main($content, $conf) { |
|
| 52 | 50 | $this->init($conf); |
| 53 | 51 | |
| 54 | 52 | // Set initial document (anchor or year file) if configured. |
@@ -95,8 +93,7 @@ discard block |
||
| 95 | 93 | * |
| 96 | 94 | * @return string The content that is displayed on the website |
| 97 | 95 | */ |
| 98 | - public function calendar($content, $conf) |
|
| 99 | - { |
|
| 96 | + public function calendar($content, $conf) { |
|
| 100 | 97 | $this->init($conf); |
| 101 | 98 | // Load current document. |
| 102 | 99 | $this->loadDocument(); |
@@ -241,8 +238,7 @@ discard block |
||
| 241 | 238 | * |
| 242 | 239 | * @return string Content for template subpart |
| 243 | 240 | */ |
| 244 | - protected function getCalendarYear($calendarIssuesByMonth, $year, $firstMonth = 1, $lastMonth = 12) |
|
| 245 | - { |
|
| 241 | + protected function getCalendarYear($calendarIssuesByMonth, $year, $firstMonth = 1, $lastMonth = 12) { |
|
| 246 | 242 | // Get subpart templates. |
| 247 | 243 | $subPartContent = ''; |
| 248 | 244 | $subParts['month'] = $this->templateService->getSubpart($this->template, '###CALMONTH###'); |
@@ -360,8 +356,7 @@ discard block |
||
| 360 | 356 | * |
| 361 | 357 | * @return string The content that is displayed on the website |
| 362 | 358 | */ |
| 363 | - public function years($content, $conf) |
|
| 364 | - { |
|
| 359 | + public function years($content, $conf) { |
|
| 365 | 360 | $this->init($conf); |
| 366 | 361 | // Load current document. |
| 367 | 362 | $this->loadDocument(); |
@@ -157,7 +157,7 @@ discard block |
||
| 157 | 157 | $_day = date('j', $dateTimestamp); |
| 158 | 158 | $calendarIssuesByYear[$_year][$_month][$_day][] = $issue; |
| 159 | 159 | } else { |
| 160 | - $this->logger->warning('Document with UID ' . $issue['uid'] . 'has no valid date of publication'); |
|
| 160 | + $this->logger->warning('Document with UID '.$issue['uid'].'has no valid date of publication'); |
|
| 161 | 161 | } |
| 162 | 162 | } |
| 163 | 163 | // Sort by years. |
@@ -206,7 +206,7 @@ discard block |
||
| 206 | 206 | 'parameter' => $GLOBALS['TSFE']->id, |
| 207 | 207 | 'forceAbsoluteUrl' => !empty($this->conf['forceAbsoluteUrl']) ? 1 : 0, |
| 208 | 208 | 'forceAbsoluteUrl.' => ['scheme' => !empty($this->conf['forceAbsoluteUrl']) && !empty($this->conf['forceAbsoluteUrlHttps']) ? 'https' : 'http'], |
| 209 | - 'additionalParams' => '&' . $this->prefixId . '[id]=' . urlencode($this->doc->uid), |
|
| 209 | + 'additionalParams' => '&'.$this->prefixId.'[id]='.urlencode($this->doc->uid), |
|
| 210 | 210 | ]; |
| 211 | 211 | $linkTitleData = $this->doc->getTitledata(); |
| 212 | 212 | $linkTitle = !empty($linkTitleData['mets_orderlabel'][0]) ? $linkTitleData['mets_orderlabel'][0] : $linkTitleData['mets_label'][0]; |
@@ -217,9 +217,9 @@ discard block |
||
| 217 | 217 | 'parameter' => $GLOBALS['TSFE']->id, |
| 218 | 218 | 'forceAbsoluteUrl' => !empty($this->conf['forceAbsoluteUrl']) ? 1 : 0, |
| 219 | 219 | 'forceAbsoluteUrl.' => ['scheme' => !empty($this->conf['forceAbsoluteUrl']) && !empty($this->conf['forceAbsoluteUrlHttps']) ? 'https' : 'http'], |
| 220 | - 'additionalParams' => '&' . $this->prefixId . '[id]=' . urlencode($this->doc->parentId), |
|
| 220 | + 'additionalParams' => '&'.$this->prefixId.'[id]='.urlencode($this->doc->parentId), |
|
| 221 | 221 | ]; |
| 222 | - $allYearsLink = $this->cObj->typoLink(htmlspecialchars($this->pi_getLL('allYears', '')) . ' ' . $this->doc->getTitle($this->doc->parentId), $linkConf); |
|
| 222 | + $allYearsLink = $this->cObj->typoLink(htmlspecialchars($this->pi_getLL('allYears', '')).' '.$this->doc->getTitle($this->doc->parentId), $linkConf); |
|
| 223 | 223 | // Fill marker array. |
| 224 | 224 | $markerArray = [ |
| 225 | 225 | '###CALENDARVIEWACTIVE###' => count($this->allIssues) > 5 ? 'active' : '', |
@@ -260,19 +260,19 @@ discard block |
||
| 260 | 260 | '###DAYFRI_NAME###' => strftime('%a', strtotime('last Friday')), |
| 261 | 261 | '###DAYSAT_NAME###' => strftime('%a', strtotime('last Saturday')), |
| 262 | 262 | '###DAYSUN_NAME###' => strftime('%a', strtotime('last Sunday')), |
| 263 | - '###MONTHNAME###' => strftime('%B', strtotime($year . '-' . $i . '-1')) . ' ' . $year, |
|
| 264 | - '###CALYEAR###' => ($i == $firstMonth) ? '<div class="year">' . $year . '</div>' : '' |
|
| 263 | + '###MONTHNAME###' => strftime('%B', strtotime($year.'-'.$i.'-1')).' '.$year, |
|
| 264 | + '###CALYEAR###' => ($i == $firstMonth) ? '<div class="year">'.$year.'</div>' : '' |
|
| 265 | 265 | ]; |
| 266 | 266 | // Fill the month markers. |
| 267 | 267 | $subPartContentMonth = $this->templateService->substituteMarkerArray($subParts['month'], $markerArray); |
| 268 | 268 | // Reset week content of new month. |
| 269 | 269 | $subPartContentWeek = ''; |
| 270 | - $firstOfMonth = strtotime($year . '-' . $i . '-1'); |
|
| 270 | + $firstOfMonth = strtotime($year.'-'.$i.'-1'); |
|
| 271 | 271 | $lastOfMonth = strtotime('last day of', ($firstOfMonth)); |
| 272 | 272 | $firstOfMonthStart = strtotime('last Monday', $firstOfMonth); |
| 273 | 273 | // There are never more than 6 weeks in a month. |
| 274 | 274 | for ($j = 0; $j <= 5; $j++) { |
| 275 | - $firstDayOfWeek = strtotime('+ ' . $j . ' Week', $firstOfMonthStart); |
|
| 275 | + $firstDayOfWeek = strtotime('+ '.$j.' Week', $firstOfMonthStart); |
|
| 276 | 276 | $weekArray = [ |
| 277 | 277 | '###DAYMON###' => ' ', |
| 278 | 278 | '###DAYTUE###' => ' ', |
@@ -284,7 +284,7 @@ discard block |
||
| 284 | 284 | ]; |
| 285 | 285 | // Every week has seven days. ;-) |
| 286 | 286 | for ($k = 0; $k <= 6; $k++) { |
| 287 | - $currentDayTime = strtotime('+ ' . $k . ' Day', $firstDayOfWeek); |
|
| 287 | + $currentDayTime = strtotime('+ '.$k.' Day', $firstDayOfWeek); |
|
| 288 | 288 | if ( |
| 289 | 289 | $currentDayTime >= $firstOfMonth |
| 290 | 290 | && $currentDayTime <= $lastOfMonth |
@@ -304,7 +304,7 @@ discard block |
||
| 304 | 304 | 'parameter' => $this->conf['targetPid'], |
| 305 | 305 | 'forceAbsoluteUrl' => !empty($this->conf['forceAbsoluteUrl']) ? 1 : 0, |
| 306 | 306 | 'forceAbsoluteUrl.' => ['scheme' => !empty($this->conf['forceAbsoluteUrl']) && !empty($this->conf['forceAbsoluteUrlHttps']) ? 'https' : 'http'], |
| 307 | - 'additionalParams' => '&' . $this->prefixId . '[id]=' . urlencode($issue['uid']), |
|
| 307 | + 'additionalParams' => '&'.$this->prefixId.'[id]='.urlencode($issue['uid']), |
|
| 308 | 308 | 'ATagParams' => ' class="title"', |
| 309 | 309 | ]; |
| 310 | 310 | $dayLinksText[] = $this->cObj->typoLink($dayLinkLabel, $linkConf); |
@@ -316,13 +316,13 @@ discard block |
||
| 316 | 316 | if (!empty($dayLinksText)) { |
| 317 | 317 | $dayLinksList = '<ul>'; |
| 318 | 318 | foreach ($dayLinksText as $link) { |
| 319 | - $dayLinksList .= '<li>' . $link . '</li>'; |
|
| 319 | + $dayLinksList .= '<li>'.$link.'</li>'; |
|
| 320 | 320 | } |
| 321 | 321 | $dayLinksList .= '</ul>'; |
| 322 | 322 | } |
| 323 | - $dayLinkDiv = '<div class="issues"><h4>' . strftime('%d', $currentDayTime) . '</h4><div>' . $dayLinksList . '</div></div>'; |
|
| 323 | + $dayLinkDiv = '<div class="issues"><h4>'.strftime('%d', $currentDayTime).'</h4><div>'.$dayLinksList.'</div></div>'; |
|
| 324 | 324 | } |
| 325 | - switch (strftime('%w', strtotime('+ ' . $k . ' Day', $firstDayOfWeek))) { |
|
| 325 | + switch (strftime('%w', strtotime('+ '.$k.' Day', $firstDayOfWeek))) { |
|
| 326 | 326 | case '0': |
| 327 | 327 | $weekArray['###DAYSUN###'] = ((int) $dayLinks === (int) date('j', $currentDayTime)) ? $dayLinkDiv : strftime('%d', $currentDayTime); |
| 328 | 328 | break; |
@@ -418,8 +418,8 @@ discard block |
||
| 418 | 418 | 'parameter' => $GLOBALS['TSFE']->id, |
| 419 | 419 | 'forceAbsoluteUrl' => !empty($this->conf['forceAbsoluteUrl']) ? 1 : 0, |
| 420 | 420 | 'forceAbsoluteUrl.' => ['scheme' => !empty($this->conf['forceAbsoluteUrl']) && !empty($this->conf['forceAbsoluteUrlHttps']) ? 'https' : 'http'], |
| 421 | - 'additionalParams' => '&' . $this->prefixId . '[id]=' . urlencode($year['uid']), |
|
| 422 | - 'title' => $titleAnchor . ': ' . $year['title'] |
|
| 421 | + 'additionalParams' => '&'.$this->prefixId.'[id]='.urlencode($year['uid']), |
|
| 422 | + 'title' => $titleAnchor.': '.$year['title'] |
|
| 423 | 423 | ]; |
| 424 | 424 | $yearArray = [ |
| 425 | 425 | '###YEARNAME###' => $this->cObj->typoLink($year['title'], $linkConf), |
@@ -433,9 +433,9 @@ discard block |
||
| 433 | 433 | 'parameter' => $GLOBALS['TSFE']->id, |
| 434 | 434 | 'forceAbsoluteUrl' => !empty($this->conf['forceAbsoluteUrl']) ? 1 : 0, |
| 435 | 435 | 'forceAbsoluteUrl.' => ['scheme' => !empty($this->conf['forceAbsoluteUrl']) && !empty($this->conf['forceAbsoluteUrlHttps']) ? 'https' : 'http'], |
| 436 | - 'additionalParams' => '&' . $this->prefixId . '[id]=' . $this->doc->uid, |
|
| 436 | + 'additionalParams' => '&'.$this->prefixId.'[id]='.$this->doc->uid, |
|
| 437 | 437 | ]; |
| 438 | - $allYearsLink = $this->cObj->typoLink(htmlspecialchars($this->pi_getLL('allYears', '')) . ' ' . $this->doc->getTitle($this->doc->uid), $linkConf); |
|
| 438 | + $allYearsLink = $this->cObj->typoLink(htmlspecialchars($this->pi_getLL('allYears', '')).' '.$this->doc->getTitle($this->doc->uid), $linkConf); |
|
| 439 | 439 | // Fill markers. |
| 440 | 440 | $markerArray = [ |
| 441 | 441 | '###LABEL_CHOOSE_YEAR###' => htmlspecialchars($this->pi_getLL('label.please_choose_year')), |
@@ -20,8 +20,7 @@ discard block |
||
| 20 | 20 | * @subpackage dlf |
| 21 | 21 | * @access public |
| 22 | 22 | */ |
| 23 | -class Validator extends \Kitodo\Dlf\Common\AbstractPlugin |
|
| 24 | -{ |
|
| 23 | +class Validator extends \Kitodo\Dlf\Common\AbstractPlugin { |
|
| 25 | 24 | public $scriptRelPath = 'Classes/Plugin/Validator.php'; |
| 26 | 25 | |
| 27 | 26 | /** |
@@ -34,8 +33,7 @@ discard block |
||
| 34 | 33 | * |
| 35 | 34 | * @return string The content that is displayed on the website |
| 36 | 35 | */ |
| 37 | - public function main($content, $conf) |
|
| 38 | - { |
|
| 36 | + public function main($content, $conf) { |
|
| 39 | 37 | $this->init($conf); |
| 40 | 38 | // Disable caching for this plugin. |
| 41 | 39 | $this->setCache(false); |
@@ -25,8 +25,7 @@ discard block |
||
| 25 | 25 | * @subpackage dlf |
| 26 | 26 | * @access public |
| 27 | 27 | */ |
| 28 | -class Basket extends \Kitodo\Dlf\Common\AbstractPlugin |
|
| 29 | -{ |
|
| 28 | +class Basket extends \Kitodo\Dlf\Common\AbstractPlugin { |
|
| 30 | 29 | public $scriptRelPath = 'Classes/Plugin/Basket.php'; |
| 31 | 30 | |
| 32 | 31 | /** |
@@ -39,8 +38,7 @@ discard block |
||
| 39 | 38 | * |
| 40 | 39 | * @return string The content that is displayed on the website |
| 41 | 40 | */ |
| 42 | - public function main($content, $conf) |
|
| 43 | - { |
|
| 41 | + public function main($content, $conf) { |
|
| 44 | 42 | $this->init($conf); |
| 45 | 43 | // Don't cache the output. |
| 46 | 44 | $this->setCache(false); |
@@ -233,8 +231,7 @@ discard block |
||
| 233 | 231 | * |
| 234 | 232 | * @return string One basket entry |
| 235 | 233 | */ |
| 236 | - protected function getEntry($data, $template) |
|
| 237 | - { |
|
| 234 | + protected function getEntry($data, $template) { |
|
| 238 | 235 | if (is_object($data)) { |
| 239 | 236 | $data = get_object_vars($data); |
| 240 | 237 | } |
@@ -282,8 +279,7 @@ discard block |
||
| 282 | 279 | * |
| 283 | 280 | * @return array Basket data and Javascript output |
| 284 | 281 | */ |
| 285 | - protected function addToBasket($_piVars, $basketData) |
|
| 286 | - { |
|
| 282 | + protected function addToBasket($_piVars, $basketData) { |
|
| 287 | 283 | $output = ''; |
| 288 | 284 | if (!$_piVars['startpage']) { |
| 289 | 285 | $page = 0; |
@@ -375,8 +371,7 @@ discard block |
||
| 375 | 371 | * |
| 376 | 372 | * @return array basket data |
| 377 | 373 | */ |
| 378 | - protected function removeFromBasket($_piVars, $basketData) |
|
| 379 | - { |
|
| 374 | + protected function removeFromBasket($_piVars, $basketData) { |
|
| 380 | 375 | if (!empty($basketData['doc_ids'])) { |
| 381 | 376 | $items = $basketData['doc_ids']; |
| 382 | 377 | $items = get_object_vars($items); |
@@ -415,8 +410,7 @@ discard block |
||
| 415 | 410 | * |
| 416 | 411 | * @return array basket data |
| 417 | 412 | */ |
| 418 | - protected function openFromBasket($_piVars, $basketData) |
|
| 419 | - { |
|
| 413 | + protected function openFromBasket($_piVars, $basketData) { |
|
| 420 | 414 | $pdfUrl = $this->conf['pdfgenerate']; |
| 421 | 415 | foreach ($this->piVars['selected'] as $docValue) { |
| 422 | 416 | if ($docValue['id']) { |
@@ -438,8 +432,7 @@ discard block |
||
| 438 | 432 | * |
| 439 | 433 | * @return mixed download url or false |
| 440 | 434 | */ |
| 441 | - protected function getDocumentData($id, $data) |
|
| 442 | - { |
|
| 435 | + protected function getDocumentData($id, $data) { |
|
| 443 | 436 | // get document instance to load further information |
| 444 | 437 | $document = Document::getInstance($id, 0); |
| 445 | 438 | if ($document) { |
@@ -499,8 +492,7 @@ discard block |
||
| 499 | 492 | * |
| 500 | 493 | * @return void |
| 501 | 494 | */ |
| 502 | - protected function sendMail() |
|
| 503 | - { |
|
| 495 | + protected function sendMail() { |
|
| 504 | 496 | // send mail |
| 505 | 497 | $mailId = $this->piVars['mail_action']; |
| 506 | 498 | |
@@ -590,8 +582,7 @@ discard block |
||
| 590 | 582 | * |
| 591 | 583 | * @return void |
| 592 | 584 | */ |
| 593 | - protected function printDocument() |
|
| 594 | - { |
|
| 585 | + protected function printDocument() { |
|
| 595 | 586 | $pdfUrl = $this->conf['pdfprint']; |
| 596 | 587 | $numberOfPages = 0; |
| 597 | 588 | foreach ($this->piVars['selected'] as $docId => $docValue) { |
@@ -164,9 +164,9 @@ discard block |
||
| 164 | 164 | |
| 165 | 165 | if ($resultMail->rowCount() > 0) { |
| 166 | 166 | $mailForm = '<select name="tx_dlf[mail_action]">'; |
| 167 | - $mailForm .= '<option value="">' . htmlspecialchars($this->pi_getLL('chooseMail', '')) . '</option>'; |
|
| 167 | + $mailForm .= '<option value="">'.htmlspecialchars($this->pi_getLL('chooseMail', '')).'</option>'; |
|
| 168 | 168 | while ($row = $resultMail->fetch()) { |
| 169 | - $mailForm .= '<option value="' . $row['uid'] . '">' . htmlspecialchars($row['name']) . ' (' . htmlspecialchars($row['mail']) . ')</option>'; |
|
| 169 | + $mailForm .= '<option value="'.$row['uid'].'">'.htmlspecialchars($row['name']).' ('.htmlspecialchars($row['mail']).')</option>'; |
|
| 170 | 170 | } |
| 171 | 171 | $mailForm .= '</select><input type="submit">'; |
| 172 | 172 | } |
@@ -175,9 +175,9 @@ discard block |
||
| 175 | 175 | // remove action form |
| 176 | 176 | $markerArray['###REMOVEACTION###'] = ' |
| 177 | 177 | <select name="tx_dlf[basket_action]"> |
| 178 | - <option value="">' . htmlspecialchars($this->pi_getLL('chooseAction', '')) . '</option> |
|
| 179 | - <option value="open">' . htmlspecialchars($this->pi_getLL('download', '')) . '</option> |
|
| 180 | - <option value="remove">' . htmlspecialchars($this->pi_getLL('remove', '')) . '</option> |
|
| 178 | + <option value="">' . htmlspecialchars($this->pi_getLL('chooseAction', '')).'</option> |
|
| 179 | + <option value="open">' . htmlspecialchars($this->pi_getLL('download', '')).'</option> |
|
| 180 | + <option value="remove">' . htmlspecialchars($this->pi_getLL('remove', '')).'</option> |
|
| 181 | 181 | </select> |
| 182 | 182 | <input type="submit"> |
| 183 | 183 | '; |
@@ -198,9 +198,9 @@ discard block |
||
| 198 | 198 | $printForm = ''; |
| 199 | 199 | if ($resultPrinter->rowCount() > 0) { |
| 200 | 200 | $printForm = '<select name="tx_dlf[print_action]">'; |
| 201 | - $printForm .= '<option value="">' . htmlspecialchars($this->pi_getLL('choosePrinter', '')) . '</option>'; |
|
| 201 | + $printForm .= '<option value="">'.htmlspecialchars($this->pi_getLL('choosePrinter', '')).'</option>'; |
|
| 202 | 202 | while ($row = $resultPrinter->fetch()) { |
| 203 | - $printForm .= '<option value="' . $row['uid'] . '">' . htmlspecialchars($row['label']) . '</option>'; |
|
| 203 | + $printForm .= '<option value="'.$row['uid'].'">'.htmlspecialchars($row['label']).'</option>'; |
|
| 204 | 204 | } |
| 205 | 205 | $printForm .= '</select><input type="submit" />'; |
| 206 | 206 | } |
@@ -257,23 +257,23 @@ discard block |
||
| 257 | 257 | $rotation = $data['rotation']; |
| 258 | 258 | $docData = $this->getDocumentData($id, $data); |
| 259 | 259 | $markerArray['###BASKETDATA###'] = $docData['downloadLink']; |
| 260 | - $arrayKey = $id . '_' . $startpage; |
|
| 260 | + $arrayKey = $id.'_'.$startpage; |
|
| 261 | 261 | if (isset($startX)) { |
| 262 | - $arrayKey .= '_' . $startX; |
|
| 262 | + $arrayKey .= '_'.$startX; |
|
| 263 | 263 | } |
| 264 | 264 | if (isset($endX)) { |
| 265 | - $arrayKey .= '_' . $endX; |
|
| 265 | + $arrayKey .= '_'.$endX; |
|
| 266 | 266 | } |
| 267 | - $controlMark = '<input value="' . $id . '" name="tx_dlf[selected][' . $arrayKey . '][id]" type="checkbox">'; |
|
| 268 | - $controlMark .= '<input value="' . $startpage . '" name="tx_dlf[selected][' . $arrayKey . '][startpage]" type="hidden">'; |
|
| 269 | - $controlMark .= '<input value="' . $endpage . '" name="tx_dlf[selected][' . $arrayKey . '][endpage]" type="hidden">'; |
|
| 267 | + $controlMark = '<input value="'.$id.'" name="tx_dlf[selected]['.$arrayKey.'][id]" type="checkbox">'; |
|
| 268 | + $controlMark .= '<input value="'.$startpage.'" name="tx_dlf[selected]['.$arrayKey.'][startpage]" type="hidden">'; |
|
| 269 | + $controlMark .= '<input value="'.$endpage.'" name="tx_dlf[selected]['.$arrayKey.'][endpage]" type="hidden">'; |
|
| 270 | 270 | // add hidden fields for detail information |
| 271 | 271 | if ($startX) { |
| 272 | - $controlMark .= '<input type="hidden" name="tx_dlf[selected][' . $arrayKey . '][startX]" value="' . $startX . '">'; |
|
| 273 | - $controlMark .= '<input type="hidden" name="tx_dlf[selected][' . $arrayKey . '][startY]" value="' . $startY . '">'; |
|
| 274 | - $controlMark .= '<input type="hidden" name="tx_dlf[selected][' . $arrayKey . '][endX]" value="' . $endX . '">'; |
|
| 275 | - $controlMark .= '<input type="hidden" name="tx_dlf[selected][' . $arrayKey . '][endY]" value="' . $endY . '">'; |
|
| 276 | - $controlMark .= '<input type="hidden" name="tx_dlf[selected][' . $arrayKey . '][rotation]" value="' . $rotation . '">'; |
|
| 272 | + $controlMark .= '<input type="hidden" name="tx_dlf[selected]['.$arrayKey.'][startX]" value="'.$startX.'">'; |
|
| 273 | + $controlMark .= '<input type="hidden" name="tx_dlf[selected]['.$arrayKey.'][startY]" value="'.$startY.'">'; |
|
| 274 | + $controlMark .= '<input type="hidden" name="tx_dlf[selected]['.$arrayKey.'][endX]" value="'.$endX.'">'; |
|
| 275 | + $controlMark .= '<input type="hidden" name="tx_dlf[selected]['.$arrayKey.'][endY]" value="'.$endY.'">'; |
|
| 276 | + $controlMark .= '<input type="hidden" name="tx_dlf[selected]['.$arrayKey.'][rotation]" value="'.$rotation.'">'; |
|
| 277 | 277 | } |
| 278 | 278 | // return one entry |
| 279 | 279 | $markerArray['###CONTROLS###'] = $controlMark; |
@@ -329,12 +329,12 @@ discard block |
||
| 329 | 329 | if ($_piVars['addToBasket'] == 'list') { |
| 330 | 330 | $documentItem['endpage'] = $document->numPages; |
| 331 | 331 | } |
| 332 | - $arrayKey = $documentItem['id'] . '_' . $page; |
|
| 332 | + $arrayKey = $documentItem['id'].'_'.$page; |
|
| 333 | 333 | if (!empty($documentItem['startX'])) { |
| 334 | - $arrayKey .= '_' . $documentItem['startX']; |
|
| 334 | + $arrayKey .= '_'.$documentItem['startX']; |
|
| 335 | 335 | } |
| 336 | 336 | if (!empty($documentItem['endX'])) { |
| 337 | - $arrayKey .= '_' . $documentItem['endX']; |
|
| 337 | + $arrayKey .= '_'.$documentItem['endX']; |
|
| 338 | 338 | } |
| 339 | 339 | // do not add more than one identical object |
| 340 | 340 | if (!in_array($arrayKey, $items)) { |
@@ -353,14 +353,14 @@ discard block |
||
| 353 | 353 | // remove parameter endpage |
| 354 | 354 | $pdfParams = str_replace(",##endpage##", '', $pdfParams); |
| 355 | 355 | } |
| 356 | - $pdfGenerateUrl = $this->conf['pdfgenerate'] . $pdfParams; |
|
| 356 | + $pdfGenerateUrl = $this->conf['pdfgenerate'].$pdfParams; |
|
| 357 | 357 | if ($this->conf['pregeneration']) { |
| 358 | 358 | // send ajax request to webapp |
| 359 | 359 | $output .= ' |
| 360 | 360 | <script> |
| 361 | 361 | $(document).ready(function(){ |
| 362 | 362 | $.ajax({ |
| 363 | - url: "' . $pdfGenerateUrl . '", |
|
| 363 | + url: "' . $pdfGenerateUrl.'", |
|
| 364 | 364 | }).done(function() { |
| 365 | 365 | }); |
| 366 | 366 | }); |
@@ -398,12 +398,12 @@ discard block |
||
| 398 | 398 | } |
| 399 | 399 | foreach ($_piVars['selected'] as $value) { |
| 400 | 400 | if (isset($value['id'])) { |
| 401 | - $arrayKey = $value['id'] . '_' . $value['startpage']; |
|
| 401 | + $arrayKey = $value['id'].'_'.$value['startpage']; |
|
| 402 | 402 | if (isset($value['startX'])) { |
| 403 | - $arrayKey .= '_' . $value['startX']; |
|
| 403 | + $arrayKey .= '_'.$value['startX']; |
|
| 404 | 404 | } |
| 405 | 405 | if (isset($value['endX'])) { |
| 406 | - $arrayKey .= '_' . $value['endX']; |
|
| 406 | + $arrayKey .= '_'.$value['endX']; |
|
| 407 | 407 | } |
| 408 | 408 | if (isset($items[$arrayKey])) { |
| 409 | 409 | unset($items[$arrayKey]); |
@@ -442,10 +442,10 @@ discard block |
||
| 442 | 442 | foreach ($this->piVars['selected'] as $docValue) { |
| 443 | 443 | if ($docValue['id']) { |
| 444 | 444 | $docData = $this->getDocumentData($docValue['id'], $docValue); |
| 445 | - $pdfUrl .= $docData['urlParams'] . $this->conf['pdfparamseparator']; |
|
| 445 | + $pdfUrl .= $docData['urlParams'].$this->conf['pdfparamseparator']; |
|
| 446 | 446 | } |
| 447 | 447 | } |
| 448 | - header('Location: ' . $pdfUrl); |
|
| 448 | + header('Location: '.$pdfUrl); |
|
| 449 | 449 | ob_end_flush(); |
| 450 | 450 | exit; |
| 451 | 451 | } |
@@ -479,7 +479,7 @@ discard block |
||
| 479 | 479 | $urlParams = str_replace("##endx##", $data['endX'] === "" ? "" : intval($data['endX']), $urlParams); |
| 480 | 480 | $urlParams = str_replace("##endy##", $data['endY'] === "" ? "" : intval($data['endY']), $urlParams); |
| 481 | 481 | $urlParams = str_replace("##rotation##", $data['rotation'] === "" ? "" : intval($data['rotation']), $urlParams); |
| 482 | - $downloadUrl = $this->conf['pdfgenerate'] . $urlParams; |
|
| 482 | + $downloadUrl = $this->conf['pdfgenerate'].$urlParams; |
|
| 483 | 483 | $title = $document->getTitle($id, true); |
| 484 | 484 | if (empty($title)) { |
| 485 | 485 | $title = $this->pi_getLL('noTitle', ''); |
@@ -488,15 +488,15 @@ discard block |
||
| 488 | 488 | $info = ''; |
| 489 | 489 | if ($data['startX'] != '' && $data['endX'] != '') { |
| 490 | 490 | // cutout |
| 491 | - $info .= htmlspecialchars($this->pi_getLL('cutout', '')) . ' '; |
|
| 491 | + $info .= htmlspecialchars($this->pi_getLL('cutout', '')).' '; |
|
| 492 | 492 | } |
| 493 | 493 | if ($data['startpage'] == $data['endpage']) { |
| 494 | 494 | // One page |
| 495 | - $info .= htmlspecialchars($this->pi_getLL('page', '')) . ' ' . $data['startpage']; |
|
| 495 | + $info .= htmlspecialchars($this->pi_getLL('page', '')).' '.$data['startpage']; |
|
| 496 | 496 | } else { |
| 497 | - $info .= htmlspecialchars($this->pi_getLL('page', '')) . ' ' . $data['startpage'] . '-' . $data['endpage']; |
|
| 497 | + $info .= htmlspecialchars($this->pi_getLL('page', '')).' '.$data['startpage'].'-'.$data['endpage']; |
|
| 498 | 498 | } |
| 499 | - $downloadLink = '<a href="' . $downloadUrl . '" target="_blank">' . htmlspecialchars($title) . '</a> (' . $info . ')'; |
|
| 499 | + $downloadLink = '<a href="'.$downloadUrl.'" target="_blank">'.htmlspecialchars($title).'</a> ('.$info.')'; |
|
| 500 | 500 | if ($data['startpage'] == $data['endpage']) { |
| 501 | 501 | $pageNums = 1; |
| 502 | 502 | } else { |
@@ -541,7 +541,7 @@ discard block |
||
| 541 | 541 | |
| 542 | 542 | $allResults = $resultMail->fetchAll(); |
| 543 | 543 | $mailData = $allResults[0]; |
| 544 | - $mailText = htmlspecialchars($this->pi_getLL('mailBody', '')) . "\n"; |
|
| 544 | + $mailText = htmlspecialchars($this->pi_getLL('mailBody', ''))."\n"; |
|
| 545 | 545 | $numberOfPages = 0; |
| 546 | 546 | $pdfUrl = $this->conf['pdfdownload']; |
| 547 | 547 | // prepare links |
@@ -549,7 +549,7 @@ discard block |
||
| 549 | 549 | if ($docValue['id']) { |
| 550 | 550 | $explodeId = explode("_", $docValue['id']); |
| 551 | 551 | $docData = $this->getDocumentData($explodeId[0], $docValue); |
| 552 | - $pdfUrl .= $docData['urlParams'] . $this->conf['pdfparamseparator']; |
|
| 552 | + $pdfUrl .= $docData['urlParams'].$this->conf['pdfparamseparator']; |
|
| 553 | 553 | $pages = (abs(intval($docValue['startpage']) - intval($docValue['endpage']))); |
| 554 | 554 | if ($pages === 0) { |
| 555 | 555 | $numberOfPages = $numberOfPages + 1; |
@@ -560,7 +560,7 @@ discard block |
||
| 560 | 560 | } |
| 561 | 561 | // Remove leading/tailing pdfparamseperator |
| 562 | 562 | $pdfUrl = trim($pdfUrl, $this->conf['pdfparamseparator']); |
| 563 | - $mailBody = $mailText . $pdfUrl; |
|
| 563 | + $mailBody = $mailText.$pdfUrl; |
|
| 564 | 564 | // Get hook objects. |
| 565 | 565 | $hookObjects = Helper::getHookObjects($this->scriptRelPath); |
| 566 | 566 | // Hook for getting a customized mail body. |
@@ -593,12 +593,12 @@ discard block |
||
| 593 | 593 | // internal user |
| 594 | 594 | $insertArray['user_id'] = $GLOBALS["TSFE"]->fe_user->user['uid']; |
| 595 | 595 | $insertArray['name'] = $GLOBALS["TSFE"]->fe_user->user['username']; |
| 596 | - $insertArray['label'] = 'Mail: ' . $mailData['mail']; |
|
| 596 | + $insertArray['label'] = 'Mail: '.$mailData['mail']; |
|
| 597 | 597 | } else { |
| 598 | 598 | // external user |
| 599 | 599 | $insertArray['user_id'] = 0; |
| 600 | 600 | $insertArray['name'] = 'n/a'; |
| 601 | - $insertArray['label'] = 'Mail: ' . $mailData['mail']; |
|
| 601 | + $insertArray['label'] = 'Mail: '.$mailData['mail']; |
|
| 602 | 602 | } |
| 603 | 603 | // add action to protocol |
| 604 | 604 | GeneralUtility::makeInstance(ConnectionPool::class) |
@@ -623,7 +623,7 @@ discard block |
||
| 623 | 623 | foreach ($this->piVars['selected'] as $docId => $docValue) { |
| 624 | 624 | if ($docValue['id']) { |
| 625 | 625 | $docData = $this->getDocumentData($docValue['id'], $docValue); |
| 626 | - $pdfUrl .= $docData['urlParams'] . $this->conf['pdfparamseparator']; |
|
| 626 | + $pdfUrl .= $docData['urlParams'].$this->conf['pdfparamseparator']; |
|
| 627 | 627 | $numberOfPages += $docData['pageNums']; |
| 628 | 628 | } |
| 629 | 629 | } |
@@ -654,7 +654,7 @@ discard block |
||
| 654 | 654 | if ($docValue['id']) { |
| 655 | 655 | $explodeId = explode("_", $docId); |
| 656 | 656 | $docData = $this->getDocumentData($explodeId[0], $docValue); |
| 657 | - $pdfUrl .= $docData['urlParams'] . $this->conf['pdfparamseparator']; |
|
| 657 | + $pdfUrl .= $docData['urlParams'].$this->conf['pdfparamseparator']; |
|
| 658 | 658 | $numberOfPages += $docData['pageNums']; |
| 659 | 659 | } |
| 660 | 660 | } |
@@ -671,12 +671,12 @@ discard block |
||
| 671 | 671 | // internal user |
| 672 | 672 | $insertArray['user_id'] = $GLOBALS["TSFE"]->fe_user->user['uid']; |
| 673 | 673 | $insertArray['name'] = $GLOBALS["TSFE"]->fe_user->user['username']; |
| 674 | - $insertArray['label'] = 'Print: ' . $printerData['label']; |
|
| 674 | + $insertArray['label'] = 'Print: '.$printerData['label']; |
|
| 675 | 675 | } else { |
| 676 | 676 | // external user |
| 677 | 677 | $insertArray['user_id'] = 0; |
| 678 | 678 | $insertArray['name'] = 'n/a'; |
| 679 | - $insertArray['label'] = 'Print: ' . $printerData['label']; |
|
| 679 | + $insertArray['label'] = 'Print: '.$printerData['label']; |
|
| 680 | 680 | } |
| 681 | 681 | // add action to protocol |
| 682 | 682 | GeneralUtility::makeInstance(ConnectionPool::class) |
@@ -685,7 +685,7 @@ discard block |
||
| 685 | 685 | 'tx_dlf_actionlog', |
| 686 | 686 | $insertArray |
| 687 | 687 | ); |
| 688 | - header('Location: ' . $pdfUrl); |
|
| 688 | + header('Location: '.$pdfUrl); |
|
| 689 | 689 | ob_end_flush(); |
| 690 | 690 | exit; |
| 691 | 691 | } |
@@ -26,8 +26,7 @@ discard block |
||
| 26 | 26 | * @subpackage dlf |
| 27 | 27 | * @access public |
| 28 | 28 | */ |
| 29 | -class AnnotationTool extends AbstractPlugin |
|
| 30 | -{ |
|
| 29 | +class AnnotationTool extends AbstractPlugin { |
|
| 31 | 30 | /** |
| 32 | 31 | * @access public |
| 33 | 32 | * @var string |
@@ -44,8 +43,7 @@ discard block |
||
| 44 | 43 | * |
| 45 | 44 | * @return string The content that is displayed on the website |
| 46 | 45 | */ |
| 47 | - public function main($content, $conf) |
|
| 48 | - { |
|
| 46 | + public function main($content, $conf) { |
|
| 49 | 47 | $this->init($conf); |
| 50 | 48 | // Merge configuration with conf array of toolbox. |
| 51 | 49 | if (!empty($this->cObj->data['conf'])) { |
@@ -84,9 +84,9 @@ |
||
| 84 | 84 | $annotationContainers != null |
| 85 | 85 | && sizeof($annotationContainers) > 0 |
| 86 | 86 | ) { |
| 87 | - $markerArray['###ANNOTATION_SELECT###'] = '<a class="select switchoff" id="tx-dlf-tools-annotations" title="" data-dic="annotations-on:' . htmlspecialchars($this->pi_getLL('annotations-on', '')) . ';annotations-off:' . htmlspecialchars($this->pi_getLL('annotations-off', '')) . '"> </a>'; |
|
| 87 | + $markerArray['###ANNOTATION_SELECT###'] = '<a class="select switchoff" id="tx-dlf-tools-annotations" title="" data-dic="annotations-on:'.htmlspecialchars($this->pi_getLL('annotations-on', '')).';annotations-off:'.htmlspecialchars($this->pi_getLL('annotations-off', '')).'"> </a>'; |
|
| 88 | 88 | } else { |
| 89 | - $markerArray['###ANNOTATION_SELECT###'] = '<span class="no-annotations">' . htmlspecialchars($this->pi_getLL('annotations-not-available', '')) . '</span>'; |
|
| 89 | + $markerArray['###ANNOTATION_SELECT###'] = '<span class="no-annotations">'.htmlspecialchars($this->pi_getLL('annotations-not-available', '')).'</span>'; |
|
| 90 | 90 | } |
| 91 | 91 | $content .= $this->templateService->substituteMarkerArray($this->template, $markerArray); |
| 92 | 92 | return $this->pi_wrapInBaseClass($content); |