Erikmitk / kitodo-presentation

Classes/Plugin/Tools/PdfDownloadTool.php

Braces +4 added lines, -8 removed lines

@@ -25,8 +25,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class PdfDownloadTool extends \Kitodo\Dlf\Common\AbstractPlugin
-{
+class PdfDownloadTool extends \Kitodo\Dlf\Common\AbstractPlugin {
     public $scriptRelPath = 'Classes/Plugin/Tools/PdfDownloadTool.php';
 
     /**
@@ -39,8 +38,7 @@ 
      *
      * @return string The content that is displayed on the website
      */
-    public function main($content, $conf)
-    {
+    public function main($content, $conf) {
         $this->init($conf);
         // Merge configuration with conf array of toolbox.
         if (!empty($this->cObj->data['conf'])) {
@@ -90,8 +88,7 @@ 
      *
      * @return string Link to downloadable page
      */
-    protected function getPageLink()
-    {
+    protected function getPageLink() {
         $page1Link = '';
         $page2Link = '';
         $pageNumber = $this->piVars['page'];
@@ -147,8 +144,7 @@ 
      *
      * @return string Link to downloadable work
      */
-    protected function getWorkLink()
-    {
+    protected function getWorkLink() {
         $workLink = '';
         $fileGrpsDownload = GeneralUtility::trimExplode(',', $this->conf['fileGrpDownload']);
         // Get work link.

Classes/Plugin/AudioPlayer.php

Braces +3 added lines, -6 removed lines

@@ -26,8 +26,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class AudioPlayer extends \Kitodo\Dlf\Common\AbstractPlugin
-{
+class AudioPlayer extends \Kitodo\Dlf\Common\AbstractPlugin {
     public $scriptRelPath = 'Classes/Plugin/AudioPlayer.php';
 
     /**
@@ -45,8 +44,7 @@ 
      *
      * @return void
      */
-    protected function addPlayerJS()
-    {
+    protected function addPlayerJS() {
         // Inline CSS.
         $inlineCSS = '#tx-dlf-audio { width: 100px; height: 100px; }';
 
@@ -80,8 +78,7 @@ 
      *
      * @return string The content that is displayed on the website
      */
-    public function main($content, $conf)
-    {
+    public function main($content, $conf) {
         $this->init($conf);
         // Load current document.
         $this->loadDocument();

Classes/Plugin/PageView.php

Braces +8 added lines, -16 removed lines

@@ -28,8 +28,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class PageView extends \Kitodo\Dlf\Common\AbstractPlugin
-{
+class PageView extends \Kitodo\Dlf\Common\AbstractPlugin {
     public $scriptRelPath = 'Classes/Plugin/PageView.php';
 
     /**
@@ -71,8 +70,7 @@ 
      *
      * @return void
      */
-    protected function addViewerJS()
-    {
+    protected function addViewerJS() {
         // Viewer configuration.
         $viewerConfiguration = '
             $(document).ready(function() {
@@ -100,8 +98,7 @@ 
      *
      * @return array Marker array
      */
-    protected function addInteraction()
-    {
+    protected function addInteraction() {
         $markerArray = [];
         if ($this->piVars['id']) {
             if ($this->conf['crop']) {
@@ -127,8 +124,7 @@ 
      *
      * @return array Marker array
      */
-    protected function addBasketForm()
-    {
+    protected function addBasketForm() {
         $markerArray = [];
         // Add basket button
         if ($this->conf['basketButton'] && $this->conf['targetBasket'] && $this->piVars['id']) {
@@ -176,8 +172,7 @@ 
      *
      * @return array URL and MIME type of image file
      */
-    protected function getImage($page)
-    {
+    protected function getImage($page) {
         $image = [];
         // Get @USE value of METS fileGrp.
         $fileGrpsImages = GeneralUtility::trimExplode(',', $this->conf['fileGrpImages']);
@@ -213,8 +208,7 @@ 
      *
      * @return array URL and MIME type of fulltext file
      */
-    protected function getFulltext($page)
-    {
+    protected function getFulltext($page) {
         $fulltext = [];
         // Get fulltext link.
         $fileGrpsFulltext = GeneralUtility::trimExplode(',', $this->conf['fileGrpFulltext']);
@@ -250,8 +244,7 @@ 
      * @return array An array containing the IRIs of the AnnotationLists / AnnotationPages as well as
      *               some information about the canvas.
      */
-    protected function getAnnotationContainers($page)
-    {
+    protected function getAnnotationContainers($page) {
         if ($this->doc instanceof IiifManifest) {
             $canvasId = $this->doc->physicalStructure[$page];
             $iiif = $this->doc->getIiif();
@@ -308,8 +301,7 @@ 
      *
      * @return string The content that is displayed on the website
      */
-    public function main($content, $conf)
-    {
+    public function main($content, $conf) {
         $this->init($conf);
         // Load current document.
         $this->loadDocument();

Classes/Common/AbstractModule.php

Braces +3 added lines, -6 removed lines

@@ -24,8 +24,7 @@ 
  * @access public
  * @abstract
  */
-abstract class AbstractModule extends \TYPO3\CMS\Backend\Module\BaseScriptClass
-{
+abstract class AbstractModule extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
     public $extKey = 'dlf';
     public $prefixId = 'tx_dlf';
 
@@ -97,8 +96,7 @@ 
      *
      * @return string
      */
-    protected function printContent()
-    {
+    protected function printContent() {
         $this->doc = GeneralUtility::makeInstance(\TYPO3\CMS\Backend\Template\DocumentTemplate::class);
         $this->doc->setModuleTemplate('EXT:' . $this->extKey . '/Resources/Private/Templates/' . Helper::getUnqualifiedClassName(get_class($this)) . '.tmpl');
         $this->doc->backPath = $GLOBALS['BACK_PATH'];
@@ -129,8 +127,7 @@ 
      *
      * @return void
      */
-    public function __construct()
-    {
+    public function __construct() {
         $GLOBALS['LANG']->includeLLFile('EXT:' . $this->extKey . '/Resources/Private/Language/' . Helper::getUnqualifiedClassName(get_class($this)) . '.xml');
         // Read extension configuration.
         if (isset($GLOBALS['TYPO3_CONF_VARS']['EXTENSIONS'][$this->extKey]) && is_array($GLOBALS['TYPO3_CONF_VARS']['EXTENSIONS'][$this->extKey])) {

Classes/Hooks/DataHandler.php

Braces +4 added lines, -8 removed lines

@@ -31,8 +31,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class DataHandler implements LoggerAwareInterface
-{
+class DataHandler implements LoggerAwareInterface {
     use LoggerAwareTrait;
 
     /**
@@ -47,8 +46,7 @@ 
      *
      * @return void
      */
-    public function processDatamap_postProcessFieldArray($status, $table, $id, &$fieldArray)
-    {
+    public function processDatamap_postProcessFieldArray($status, $table, $id, &$fieldArray) {
         if ($status == 'new') {
             switch ($table) {
                     // Field post-processing for table "tx_dlf_documents".
@@ -179,8 +177,7 @@ 
      *
      * @return void
      */
-    public function processDatamap_afterDatabaseOperations($status, $table, $id, &$fieldArray)
-    {
+    public function processDatamap_afterDatabaseOperations($status, $table, $id, &$fieldArray) {
         if ($status == 'update') {
             switch ($table) {
                     // After database operations for table "tx_dlf_documents".
@@ -260,8 +257,7 @@ 
      *
      * @return void
      */
-    public function processCmdmap_postProcess($command, $table, $id)
-    {
+    public function processCmdmap_postProcess($command, $table, $id) {
         if (
             in_array($command, ['move', 'delete', 'undelete'])
             && $table == 'tx_dlf_documents'

Classes/Plugin/Search.php

Braces +12 added lines, -24 removed lines

@@ -31,8 +31,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class Search extends \Kitodo\Dlf\Common\AbstractPlugin
-{
+class Search extends \Kitodo\Dlf\Common\AbstractPlugin {
     public $scriptRelPath = 'Classes/Plugin/Search.php';
 
     /**
@@ -42,8 +41,7 @@ 
      *
      * @return void
      */
-    protected function addAutocompleteJS()
-    {
+    protected function addAutocompleteJS() {
         $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)
             ->getQueryBuilderForTable('tx_dlf_documents');
 
@@ -74,8 +72,7 @@ 
      *
      * @return string HTML input fields with current document's UID and parent ID
      */
-    protected function addCurrentCollection()
-    {
+    protected function addCurrentCollection() {
         // Load current collection.
         $list = GeneralUtility::makeInstance(DocumentList::class);
         if (
@@ -107,8 +104,7 @@ 
      *
      * @return string HTML input fields with current document's UID
      */
-    protected function addCurrentDocument()
-    {
+    protected function addCurrentDocument() {
         // Load current list object.
         $list = GeneralUtility::makeInstance(DocumentList::class);
         // Load current document.
@@ -147,8 +143,7 @@ 
      *
      * @return string HTML input fields with encrypted core name and hash
      */
-    protected function addEncryptedCoreName()
-    {
+    protected function addEncryptedCoreName() {
         // Get core name.
         $name = Helper::getIndexNameFromUid($this->conf['solrcore'], 'tx_dlf_solrcores');
         // Encrypt core name.
@@ -170,8 +165,7 @@ 
      *
      * @return string The extended search form or an empty string
      */
-    protected function addExtendedSearch()
-    {
+    protected function addExtendedSearch() {
         $extendedSearch = '';
         // Quit without doing anything if no fields for extended search are selected.
         if (
@@ -209,8 +203,7 @@ 
      *
      * @return string HTML output of facets menu
      */
-    protected function addFacetsMenu()
-    {
+    protected function addFacetsMenu() {
         // Check for typoscript configuration to prevent fatal error.
         if (empty($this->conf['facetsConf.'])) {
             $this->logger->warning('Incomplete plugin configuration');
@@ -244,8 +237,7 @@ 
      *
      * @return string HTML output of fulltext switch
      */
-    protected function addFulltextSwitch($isFulltextSearch = 0)
-    {
+    protected function addFulltextSwitch($isFulltextSearch = 0) {
         $output = '';
         // Check for plugin configuration.
         if (!empty($this->conf['fulltext'])) {
@@ -264,8 +256,7 @@ 
      *
      * @return string HTML output of logical page field
      */
-    protected function addLogicalPage()
-    {
+    protected function addLogicalPage() {
         $output = '';
         // Check for plugin configuration.
         if (!empty($this->conf['showLogicalPageField'])) {
@@ -288,8 +279,7 @@ 
      *
      * @return array The array for the facet's menu entry
      */
-    protected function getFacetsMenuEntry($field, $value, $count, $search, &$state)
-    {
+    protected function getFacetsMenuEntry($field, $value, $count, $search, &$state) {
         $entryArray = [];
         // Translate value.
         if ($field == 'owner_faceting') {
@@ -345,8 +335,7 @@ 
      *
      * @return string The content that is displayed on the website
      */
-    public function main($content, $conf)
-    {
+    public function main($content, $conf) {
         $this->init($conf);
         // Disable caching for this plugin.
         $this->setCache(false);
@@ -553,8 +542,7 @@ 
      *
      * @return array HMENU array
      */
-    public function makeFacetsMenuArray($content, $conf)
-    {
+    public function makeFacetsMenuArray($content, $conf) {
         $this->init($conf);
         $menuArray = [];
         // Set default value for facet search.

Classes/Hooks/UserFunc.php

Braces +2 added lines, -4 removed lines

@@ -30,8 +30,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class UserFunc implements LoggerAwareInterface
-{
+class UserFunc implements LoggerAwareInterface {
     use LoggerAwareTrait;
 
     /**
@@ -53,8 +52,7 @@ 
      *
      * @return string HTML <img> tag for thumbnail
      */
-    public function displayThumbnail(&$params)
-    {
+    public function displayThumbnail(&$params) {
         // Simulate TCA field type "passthrough".
         $output = '<input type="hidden" name="' . $params['itemFormElName'] . '" value="' . $params['itemFormElValue'] . '" />';
         if (!empty($params['itemFormElValue'])) {

Classes/Hooks/ConfigurationForm.php

Braces +4 added lines, -8 removed lines

@@ -28,8 +28,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class ConfigurationForm
-{
+class ConfigurationForm {
     /**
      * This holds the current configuration
      *
@@ -45,8 +44,7 @@ 
      *
      * @return string Message informing the user of success or failure
      */
-    public function checkSolrConnection()
-    {
+    public function checkSolrConnection() {
         $solr = Solr::getInstance();
         if ($solr->ready) {
             Helper::addMessage(
@@ -71,8 +69,7 @@ 
      *
      * @return string Message informing the user of success or failure
      */
-    public function checkMetadataFormats()
-    {
+    public function checkMetadataFormats() {
         // We need to do some bootstrapping manually as of TYPO3 9.
         // Load table configuration array into $GLOBALS['TCA'].
         ExtensionManagementUtility::loadBaseTca(false);
@@ -201,8 +198,7 @@ 
      *
      * @return void
      */
-    public function __construct()
-    {
+    public function __construct() {
         // Load localization file.
         $GLOBALS['LANG']->includeLLFile('EXT:dlf/Resources/Private/Language/FlashMessages.xml');
         // Get current configuration.

Classes/Common/AbstractPlugin.php

Braces +8 added lines, -16 removed lines

@@ -29,8 +29,7 @@ 
  * @access public
  * @abstract
  */
-abstract class AbstractPlugin extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin implements LoggerAwareInterface
-{
+abstract class AbstractPlugin extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin implements LoggerAwareInterface {
     use LoggerAwareTrait;
 
     public $extKey = 'dlf';
@@ -73,8 +72,7 @@ 
      *
      * @return void
      */
-    protected function getTemplate($part = '###TEMPLATE###')
-    {
+    protected function getTemplate($part = '###TEMPLATE###') {
         $this->templateService = GeneralUtility::makeInstance(MarkerBasedTemplateService::class);
         if (!empty($this->conf['templateFile'])) {
             // Load template file from configuration.
@@ -98,8 +96,7 @@ 
      *
      * @return void
      */
-    protected function init(array $conf)
-    {
+    protected function init(array $conf) {
         // Read FlexForm configuration.
         $flexFormConf = [];
         $this->cObj->readFlexformIntoConf($this->cObj->data['pi_flexform'], $flexFormConf);
@@ -137,8 +134,7 @@ 
      *
      * @return void
      */
-    protected function loadDocument()
-    {
+    protected function loadDocument() {
         // Check for required variable.
         if (
             !empty($this->piVars['id'])
@@ -209,8 +205,7 @@ 
      *
      * @return array The resulting typoscript array
      */
-    protected function parseTS($string = '')
-    {
+    protected function parseTS($string = '') {
         $parser = GeneralUtility::makeInstance(\TYPO3\CMS\Core\TypoScript\Parser\TypoScriptParser::class);
         $parser->parse($string);
         return $parser->setup;
@@ -229,8 +224,7 @@ 
      *
      * @return string The input string wrapped in <a> tags
      */
-    public function pi_linkTP($str, $urlParameters = [], $cache = false, $altPageId = 0)
-    {
+    public function pi_linkTP($str, $urlParameters = [], $cache = false, $altPageId = 0) {
         $conf = [];
         if (!$cache) {
             $conf['no_cache'] = true;
@@ -253,8 +247,7 @@ 
      *
      * @return string HTML content wrapped, ready to return to the parent object.
      */
-    public function pi_wrapInBaseClass($content)
-    {
+    public function pi_wrapInBaseClass($content) {
         if (!$this->frontendController->config['config']['disableWrapInBaseClass']) {
             // Use class name instead of $this->prefixId for content wrapping because $this->prefixId is the same for all plugins.
             $content = '<div class="tx-dlf-' . strtolower(Helper::getUnqualifiedClassName(get_class($this))) . '">' . $content . '</div>';
@@ -274,8 +267,7 @@ 
      *
      * @return void
      */
-    protected function setCache($cache = true)
-    {
+    protected function setCache($cache = true) {
         if ($cache) {
             // Set cObject type to "USER" (default).
             $this->pi_USER_INT_obj = false;