kitodo / kitodo-presentation

Classes/Hooks/ExtensionManagementUtility.php

Spacing +4 added lines, -4 removed lines

@@ -40,15 +40,15 @@
      */
     public static function addPItoST43($key, $class, $suffix = '', $type = 'list_type', $cached = FALSE)
     {
-        $internalName = 'tx_' . $key . '_' . strtolower(Helper::getUnqualifiedClassName($class));
+        $internalName = 'tx_'.$key.'_'.strtolower(Helper::getUnqualifiedClassName($class));
         // General plugin
-        $typoscript = 'plugin.' . $internalName . ' = USER' . ($cached ? '' : '_INT') . "\n";
-        $typoscript .= 'plugin.' . $internalName . '.userFunc = ' . $class . '->main' . "\n";
+        $typoscript = 'plugin.'.$internalName.' = USER'.($cached ? '' : '_INT')."\n";
+        $typoscript .= 'plugin.'.$internalName.'.userFunc = '.$class.'->main'."\n";
         parent::addTypoScript($key, 'setup', $typoscript);
         // Add after defaultContentRendering
         switch ($type) {
             case 'list_type':
-                $addLine = 'tt_content.list.20.' . $key . $suffix . ' = < plugin.' . $internalName;
+                $addLine = 'tt_content.list.20.'.$key.$suffix.' = < plugin.'.$internalName;
                 break;
             default:
                 $addLine = '';

Braces +2 added lines, -4 removed lines

@@ -22,8 +22,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class ExtensionManagementUtility extends \TYPO3\CMS\Core\Utility\ExtensionManagementUtility
-{
+class ExtensionManagementUtility extends \TYPO3\CMS\Core\Utility\ExtensionManagementUtility {
     /**
      * Add plugin to static template for css_styled_content
      * @see \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPItoST43()
@@ -38,8 +37,7 @@ 
      *
      * @return void
      */
-    public static function addPItoST43($key, $class, $suffix = '', $type = 'list_type', $cached = FALSE)
-    {
+    public static function addPItoST43($key, $class, $suffix = '', $type = 'list_type', $cached = FALSE) {
         $internalName = 'tx_' . $key . '_' . strtolower(Helper::getUnqualifiedClassName($class));
         // General plugin
         $typoscript = 'plugin.' . $internalName . ' = USER' . ($cached ? '' : '_INT') . "\n";

Classes/Hooks/ConfigurationForm.php

Spacing +2 added lines, -2 removed lines

@@ -54,12 +54,12 @@
             !empty($solrInfo['username'])
             && !empty($solrInfo['password'])
         ) {
-            $host = $solrInfo['username'] . ':' . $solrInfo['password'] . '@' . $solrInfo['host'];
+            $host = $solrInfo['username'].':'.$solrInfo['password'].'@'.$solrInfo['host'];
         } else {
             $host = $solrInfo['host'];
         }
         // Build request URI.
-        $url = $solrInfo['scheme'] . '://' . $host . ':' . $solrInfo['port'] . '/' . $solrInfo['path'] . '/admin/cores?wt=xml';
+        $url = $solrInfo['scheme'].'://'.$host.':'.$solrInfo['port'].'/'.$solrInfo['path'].'/admin/cores?wt=xml';
         $context = stream_context_create([
             'http' => [
                 'method' => 'GET',

Braces +4 added lines, -8 removed lines

@@ -26,8 +26,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class ConfigurationForm
-{
+class ConfigurationForm {
     /**
      * This holds the current configuration
      *
@@ -46,8 +45,7 @@ 
      *
      * @return string Message informing the user of success or failure
      */
-    public function checkSolrConnection(&$params, &$pObj)
-    {
+    public function checkSolrConnection(&$params, &$pObj) {
         $solrInfo = Solr::getSolrConnectionInfo();
         // Prepend username and password to hostname.
         if (
@@ -98,8 +96,7 @@ 
      *
      * @return string Message informing the user of success or failure
      */
-    public function checkMetadataFormats(&$params, &$pObj)
-    {
+    public function checkMetadataFormats(&$params, &$pObj) {
         $nsDefined = [
             'MODS' => FALSE,
             'TEIHDR' => FALSE,
@@ -221,8 +218,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/Hooks/DataHandler.php

Spacing +17 added lines, -17 removed lines

@@ -112,7 +112,7 @@ 
                         $solrInfo['username']
                         && $solrInfo['password']
                     ) {
-                        $host = $solrInfo['username'] . ':' . $solrInfo['password'] . '@' . $solrInfo['host'];
+                        $host = $solrInfo['username'].':'.$solrInfo['password'].'@'.$solrInfo['host'];
                     } else {
                         $host = $solrInfo['host'];
                     }
@@ -124,7 +124,7 @@ 
                     ]);
                     // Build request for adding new Solr core.
                     // @see http://wiki.apache.org/solr/CoreAdmin
-                    $url = $solrInfo['scheme'] . '://' . $host . ':' . $solrInfo['port'] . '/' . $solrInfo['path'] . '/admin/cores?wt=xml&action=CREATE&name=dlfCore' . $coreNumber . '&instanceDir=dlfCore' . $coreNumber . '&dataDir=data&configSet=dlf';
+                    $url = $solrInfo['scheme'].'://'.$host.':'.$solrInfo['port'].'/'.$solrInfo['path'].'/admin/cores?wt=xml&action=CREATE&name=dlfCore'.$coreNumber.'&instanceDir=dlfCore'.$coreNumber.'&dataDir=data&configSet=dlf';
                     $response = @simplexml_load_string(file_get_contents($url, FALSE, $context));
                     // Process response.
                     if ($response) {
@@ -133,11 +133,11 @@ 
                             $status
                             && $status[0] == 0
                         ) {
-                            $fieldArray['index_name'] = 'dlfCore' . $coreNumber;
+                            $fieldArray['index_name'] = 'dlfCore'.$coreNumber;
                             return;
                         }
                     }
-                    Helper::devLog('Could not create new Apache Solr core "dlfCore' . $coreNumber . '"', DEVLOG_SEVERITY_ERROR);
+                    Helper::devLog('Could not create new Apache Solr core "dlfCore'.$coreNumber.'"', DEVLOG_SEVERITY_ERROR);
                     // Solr core could not be created, thus unset field array.
                     $fieldArray = [];
                     break;
@@ -161,10 +161,10 @@ 
                     ) {
                         // Get current configuration.
                         $result = $queryBuilder
-                            ->select($table . '.is_listed AS is_listed')
+                            ->select($table.'.is_listed AS is_listed')
                             ->from($table)
                             ->where(
-                                $queryBuilder->expr()->eq($table . '.uid', intval($id)),
+                                $queryBuilder->expr()->eq($table.'.uid', intval($id)),
                                 Helper::whereExpression($table)
                             )
                             ->setMaxResults(1)
@@ -186,10 +186,10 @@ 
                     ) {
                         // Get current configuration.
                         $result = $queryBuilder
-                            ->select($table . '.index_autocomplete AS index_autocomplete')
+                            ->select($table.'.index_autocomplete AS index_autocomplete')
                             ->from($table)
                             ->where(
-                                $queryBuilder->expr()->eq($table . '.uid', intval($id)),
+                                $queryBuilder->expr()->eq($table.'.uid', intval($id)),
                                 Helper::whereExpression($table)
                             )
                             ->setMaxResults(1)
@@ -210,10 +210,10 @@ 
                         } else {
                             // Get current index name.
                             $result = $queryBuilder
-                                ->select($table . '.index_autocomplete AS index_autocomplete')
+                                ->select($table.'.index_autocomplete AS index_autocomplete')
                                 ->from($table)
                                 ->where(
-                                    $queryBuilder->expr()->eq($table . '.uid', intval($id)),
+                                    $queryBuilder->expr()->eq($table.'.uid', intval($id)),
                                     Helper::whereExpression($table)
                                 )
                                 ->setMaxResults(1)
@@ -224,7 +224,7 @@ 
                                 $fieldArray['index_indexed'] = $resArray['index_autocomplete'];
                             }
                         }
-                        Helper::devLog('Prevented change of index_name for UID ' . $id . ' in table "' . $table . '"', DEVLOG_SEVERITY_NOTICE);
+                        Helper::devLog('Prevented change of index_name for UID '.$id.' in table "'.$table.'"', DEVLOG_SEVERITY_NOTICE);
                     }
                     break;
             }
@@ -260,7 +260,7 @@ 
                             'tx_dlf_solrcores.uid,tx_dlf_documents.hidden',
                             'tx_dlf_solrcores,tx_dlf_documents',
                             'tx_dlf_solrcores.uid=tx_dlf_documents.solrcore'
-                                . ' AND tx_dlf_documents.uid=' . intval($id)
+                                . ' AND tx_dlf_documents.uid='.intval($id)
                                 . Helper::whereClause('tx_dlf_solrcores'),
                             '',
                             '',
@@ -273,7 +273,7 @@ 
                                 if ($solr = Solr::getInstance($core)) {
                                     // Delete Solr document.
                                     $updateQuery = $solr->service->createUpdate();
-                                    $updateQuery->addDeleteQuery('uid:' . $id);
+                                    $updateQuery->addDeleteQuery('uid:'.$id);
                                     $updateQuery->addCommit();
                                     $solr->service->update($updateQuery);
                                 }
@@ -283,7 +283,7 @@ 
                                 if ($doc->ready) {
                                     Indexer::add($doc, $core);
                                 } else {
-                                    Helper::devLog('Failed to re-index document with UID ' . $id, DEVLOG_SEVERITY_ERROR);
+                                    Helper::devLog('Failed to re-index document with UID '.$id, DEVLOG_SEVERITY_ERROR);
                                 }
                             }
                         }
@@ -317,7 +317,7 @@ 
                 'tx_dlf_solrcores.uid',
                 'tx_dlf_solrcores,tx_dlf_documents',
                 'tx_dlf_solrcores.uid=tx_dlf_documents.solrcore'
-                    . ' AND tx_dlf_documents.uid=' . intval($id)
+                    . ' AND tx_dlf_documents.uid='.intval($id)
                     . Helper::whereClause('tx_dlf_solrcores'),
                 '',
                 '',
@@ -332,7 +332,7 @@ 
                         if ($solr = Solr::getInstance($core)) {
                             // Delete Solr document.
                             $updateQuery = $solr->service->createUpdate();
-                            $updateQuery->addDeleteQuery('uid:' . $id);
+                            $updateQuery->addDeleteQuery('uid:'.$id);
                             $updateQuery->addCommit();
                             $solr->service->update($updateQuery);
                             if ($command == 'delete') {
@@ -345,7 +345,7 @@ 
                         if ($doc->ready) {
                             Indexer::add($doc, $core);
                         } else {
-                            Helper::devLog('Failed to re-index document with UID ' . $id, DEVLOG_SEVERITY_ERROR);
+                            Helper::devLog('Failed to re-index document with UID '.$id, DEVLOG_SEVERITY_ERROR);
                         }
                         break;
                 }

Braces +4 added lines, -8 removed lines

@@ -28,8 +28,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class DataHandler
-{
+class DataHandler {
     /**
      * Field post-processing hook for the process_datamap() method.
      *
@@ -43,8 +42,7 @@ 
      *
      * @return void
      */
-    public function processDatamap_postProcessFieldArray($status, $table, $id, &$fieldArray, $pObj)
-    {
+    public function processDatamap_postProcessFieldArray($status, $table, $id, &$fieldArray, $pObj) {
         if ($status == 'new') {
             switch ($table) {
                     // Field post-processing for table "tx_dlf_documents".
@@ -244,8 +242,7 @@ 
      *
      * @return void
      */
-    public function processDatamap_afterDatabaseOperations($status, $table, $id, &$fieldArray, $pObj)
-    {
+    public function processDatamap_afterDatabaseOperations($status, $table, $id, &$fieldArray, $pObj) {
         if ($status == 'update') {
             switch ($table) {
                     // After database operations for table "tx_dlf_documents".
@@ -306,8 +303,7 @@ 
      *
      * @return void
      */
-    public function processCmdmap_postProcess($command, $table, $id, $value, $pObj)
-    {
+    public function processCmdmap_postProcess($command, $table, $id, $value, $pObj) {
         if (
             in_array($command, ['move', 'delete', 'undelete'])
             && $table == 'tx_dlf_documents'

Classes/Plugin/OaiPmh.php

Spacing +27 added lines, -27 removed lines

@@ -83,7 +83,7 @@ 
         // Delete expired resumption tokens.
         $GLOBALS['TYPO3_DB']->exec_DELETEquery(
             'tx_dlf_tokens',
-            'tx_dlf_tokens.ident="oai" AND tx_dlf_tokens.tstamp<' . intval($GLOBALS['EXEC_TIME'] - $this->conf['expired'])
+            'tx_dlf_tokens.ident="oai" AND tx_dlf_tokens.tstamp<'.intval($GLOBALS['EXEC_TIME'] - $this->conf['expired'])
         );
         if ($GLOBALS['TYPO3_DB']->sql_affected_rows() === -1) {
             // Deletion failed.
@@ -151,13 +151,13 @@ 
         $oai_dc = $this->oai->createElementNS($this->formats['oai_dc']['namespace'], 'oai_dc:dc');
         $oai_dc->setAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:dc', 'http://purl.org/dc/elements/1.1/');
         $oai_dc->setAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:xsi', 'http://www.w3.org/2001/XMLSchema-instance');
-        $oai_dc->setAttributeNS('http://www.w3.org/2001/XMLSchema-instance', 'xsi:schemaLocation', $this->formats['oai_dc']['namespace'] . ' ' . $this->formats['oai_dc']['schema']);
+        $oai_dc->setAttributeNS('http://www.w3.org/2001/XMLSchema-instance', 'xsi:schemaLocation', $this->formats['oai_dc']['namespace'].' '.$this->formats['oai_dc']['schema']);
         $oai_dc->appendChild($this->oai->createElementNS('http://purl.org/dc/elements/1.1/', 'dc:identifier', htmlspecialchars($metadata['record_id'], ENT_NOQUOTES, 'UTF-8')));
         if (!empty($metadata['purl'])) {
             $oai_dc->appendChild($this->oai->createElementNS('http://purl.org/dc/elements/1.1/', 'dc:identifier', htmlspecialchars($metadata['purl'], ENT_NOQUOTES, 'UTF-8')));
         }
         if (!empty($metadata['prod_id'])) {
-            $oai_dc->appendChild($this->oai->createElementNS('http://purl.org/dc/elements/1.1/', 'dc:identifier', 'kitodo:production:' . htmlspecialchars($metadata['prod_id'], ENT_NOQUOTES, 'UTF-8')));
+            $oai_dc->appendChild($this->oai->createElementNS('http://purl.org/dc/elements/1.1/', 'dc:identifier', 'kitodo:production:'.htmlspecialchars($metadata['prod_id'], ENT_NOQUOTES, 'UTF-8')));
         }
         if (!empty($metadata['urn'])) {
             $oai_dc->appendChild($this->oai->createElementNS('http://purl.org/dc/elements/1.1/', 'dc:identifier', htmlspecialchars($metadata['urn'], ENT_NOQUOTES, 'UTF-8')));
@@ -255,7 +255,7 @@ 
         }
         // Add attributes and build XML tree.
         $epicur->setAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:xsi', 'http://www.w3.org/2001/XMLSchema-instance');
-        $epicur->setAttributeNS('http://www.w3.org/2001/XMLSchema-instance', 'xsi:schemaLocation', $this->formats['epicur']['namespace'] . ' ' . $this->formats['epicur']['schema']);
+        $epicur->setAttributeNS('http://www.w3.org/2001/XMLSchema-instance', 'xsi:schemaLocation', $this->formats['epicur']['namespace'].' '.$this->formats['epicur']['schema']);
         // Do we update an URN or register a new one?
         if ($metadata['tstamp'] == $metadata['crdate']) {
             $update->setAttribute('type', 'urn_new');
@@ -302,10 +302,10 @@ 
                 // Import node into \DOMDocument.
                 $mets = $this->oai->importNode($root->item(0), TRUE);
             } else {
-                Helper::devLog('No METS part found in document with location "' . $metadata['location'] . '"', DEVLOG_SEVERITY_ERROR);
+                Helper::devLog('No METS part found in document with location "'.$metadata['location'].'"', DEVLOG_SEVERITY_ERROR);
             }
         } else {
-            Helper::devLog('Could not load XML file from "' . $metadata['location'] . '"', DEVLOG_SEVERITY_ERROR);
+            Helper::devLog('Could not load XML file from "'.$metadata['location'].'"', DEVLOG_SEVERITY_ERROR);
         }
         if ($mets === NULL) {
             $mets = $this->oai->createElementNS('http://kitodo.org/', 'kitodo:error', htmlspecialchars($this->pi_getLL('error', 'Error!', FALSE), ENT_NOQUOTES, 'UTF-8'));
@@ -341,15 +341,15 @@ 
             if (substr($this->conf['stylesheet'], 0, 4) == 'EXT:') {
                 list($extKey, $filePath) = explode('/', substr($this->conf['stylesheet'], 4), 2);
                 if (\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded($extKey)) {
-                    $this->conf['stylesheet'] = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($extKey) . $filePath;
+                    $this->conf['stylesheet'] = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($extKey).$filePath;
                 }
             }
             $stylesheet = \TYPO3\CMS\Core\Utility\GeneralUtility::locationHeaderUrl($this->conf['stylesheet']);
         } else {
             // Use default stylesheet if no custom stylesheet is given.
-            $stylesheet = \TYPO3\CMS\Core\Utility\GeneralUtility::locationHeaderUrl(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'Resources/Public/Stylesheets/OaiPmh.xsl');
+            $stylesheet = \TYPO3\CMS\Core\Utility\GeneralUtility::locationHeaderUrl(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'Resources/Public/Stylesheets/OaiPmh.xsl');
         }
-        $this->oai->appendChild($this->oai->createProcessingInstruction('xml-stylesheet', 'type="text/xsl" href="' . htmlspecialchars($stylesheet, ENT_NOQUOTES, 'UTF-8') . '"'));
+        $this->oai->appendChild($this->oai->createProcessingInstruction('xml-stylesheet', 'type="text/xsl" href="'.htmlspecialchars($stylesheet, ENT_NOQUOTES, 'UTF-8').'"'));
         // Create root element.
         $root = $this->oai->createElementNS('http://www.openarchives.org/OAI/2.0/', 'OAI-PMH');
         $root->setAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:xsi', 'http://www.w3.org/2001/XMLSchema-instance');
@@ -399,10 +399,10 @@ 
         // Send headers.
         header('HTTP/1.1 200 OK');
         header('Cache-Control: no-cache');
-        header('Content-Length: ' . strlen($content));
+        header('Content-Length: '.strlen($content));
         header('Content-Type: text/xml; charset=utf-8');
-        header('Date: ' . date('r', $GLOBALS['EXEC_TIME']));
-        header('Expires: ' . date('r', $GLOBALS['EXEC_TIME'] + $this->conf['expired']));
+        header('Date: '.date('r', $GLOBALS['EXEC_TIME']));
+        header('Expires: '.date('r', $GLOBALS['EXEC_TIME'] + $this->conf['expired']));
         echo $content;
         exit;
     }
@@ -467,10 +467,10 @@ 
             'tx_dlf_documents',
             'tx_dlf_relations',
             'tx_dlf_collections',
-            'AND tx_dlf_documents.record_id=' . $GLOBALS['TYPO3_DB']->fullQuoteStr($this->piVars['identifier'], 'tx_dlf_documents')
-                . ' AND tx_dlf_documents.pid=' . intval($this->conf['pages'])
-                . ' AND tx_dlf_collections.pid=' . intval($this->conf['pages'])
-                . ' AND tx_dlf_relations.ident=' . $GLOBALS['TYPO3_DB']->fullQuoteStr('docs_colls', 'tx_dlf_relations')
+            'AND tx_dlf_documents.record_id='.$GLOBALS['TYPO3_DB']->fullQuoteStr($this->piVars['identifier'], 'tx_dlf_documents')
+                . ' AND tx_dlf_documents.pid='.intval($this->conf['pages'])
+                . ' AND tx_dlf_collections.pid='.intval($this->conf['pages'])
+                . ' AND tx_dlf_relations.ident='.$GLOBALS['TYPO3_DB']->fullQuoteStr('docs_colls', 'tx_dlf_relations')
                 . $where
                 . Helper::whereClause('tx_dlf_collections'),
             '',
@@ -590,7 +590,7 @@ 
             $timestamp = $resArray['tstamp'];
             $earliestDatestamp = gmdate('Y-m-d\TH:i:s\Z', $timestamp);
         } else {
-            Helper::devLog('No records found with PID ' . $this->conf['pages'], DEVLOG_SEVERITY_NOTICE);
+            Helper::devLog('No records found with PID '.$this->conf['pages'], DEVLOG_SEVERITY_NOTICE);
         }
         $linkConf = [
             'parameter' => $GLOBALS['TSFE']->id,
@@ -853,9 +853,9 @@ 
             }
             $resArray = $allResults[0];
             if ($resArray['index_query'] != "") {
-                $solr_query .= '(' . $resArray['index_query'] . ')';
+                $solr_query .= '('.$resArray['index_query'].')';
             } else {
-                $solr_query .= 'collection:' . '"' . $resArray['index_name'] . '"';
+                $solr_query .= 'collection:'.'"'.$resArray['index_name'].'"';
             }
         } else {
             // If no set is specified we have to query for all collections
@@ -863,7 +863,7 @@ 
         }
         // Check for required fields.
         foreach ($this->formats[$this->piVars['metadataPrefix']]['requiredFields'] as $required) {
-            $solr_query .= ' NOT ' . $required . ':""';
+            $solr_query .= ' NOT '.$required.':""';
         }
         // toplevel="true" is always required
         $solr_query .= ' AND toplevel:true';
@@ -876,7 +876,7 @@ 
                 || is_array($date_array = strptime($this->piVars['from'], '%Y-%m-%d'))
             ) {
                 $timestamp = gmmktime($date_array['tm_hour'], $date_array['tm_min'], $date_array['tm_sec'], $date_array['tm_mon'] + 1, $date_array['tm_mday'], $date_array['tm_year'] + 1900);
-                $from = date("Y-m-d", $timestamp) . 'T' . date("H:i:s", $timestamp) . '.000Z';
+                $from = date("Y-m-d", $timestamp).'T'.date("H:i:s", $timestamp).'.000Z';
             } else {
                 throw new \Exception('badArgument');
             }
@@ -890,7 +890,7 @@ 
                 || is_array($date_array = strptime($this->piVars['until'], '%Y-%m-%d'))
             ) {
                 $timestamp = gmmktime($date_array['tm_hour'], $date_array['tm_min'], $date_array['tm_sec'], $date_array['tm_mon'] + 1, $date_array['tm_mday'], $date_array['tm_year'] + 1900);
-                $until = date("Y-m-d", $timestamp) . 'T' . date("H:i:s", $timestamp) . '.999Z';
+                $until = date("Y-m-d", $timestamp).'T'.date("H:i:s", $timestamp).'.999Z';
                 if ($from != "*" && $from > $until) {
                     throw new \Exception('badArgument');
                 }
@@ -907,7 +907,7 @@ 
                 throw new \Exception('badArgument');
             }
         }
-        $solr_query .= ' AND timestamp:[' . $from . ' TO ' . $until . ']';
+        $solr_query .= ' AND timestamp:['.$from.' TO '.$until.']';
         $documentSet = [];
         $solr = Solr::getInstance($this->conf['solrcore']);
         if (intval($this->conf['solr_limit']) > 0) {
@@ -947,10 +947,10 @@ 
             'tx_dlf_documents',
             'tx_dlf_relations',
             'tx_dlf_collections',
-            'AND tx_dlf_documents.uid IN (' . implode(',', $GLOBALS['TYPO3_DB']->cleanIntArray($documentsToProcess)) . ')'
-                . ' AND tx_dlf_documents.pid=' . intval($this->conf['pages'])
-                . ' AND tx_dlf_collections.pid=' . intval($this->conf['pages'])
-                . ' AND tx_dlf_relations.ident=' . $GLOBALS['TYPO3_DB']->fullQuoteStr('docs_colls', 'tx_dlf_relations')
+            'AND tx_dlf_documents.uid IN ('.implode(',', $GLOBALS['TYPO3_DB']->cleanIntArray($documentsToProcess)).')'
+                . ' AND tx_dlf_documents.pid='.intval($this->conf['pages'])
+                . ' AND tx_dlf_collections.pid='.intval($this->conf['pages'])
+                . ' AND tx_dlf_relations.ident='.$GLOBALS['TYPO3_DB']->fullQuoteStr('docs_colls', 'tx_dlf_relations')
                 . Helper::whereClause('tx_dlf_collections'),
             'tx_dlf_documents.uid',
             'tx_dlf_documents.tstamp',

Braces +18 added lines, -36 removed lines

@@ -27,8 +27,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class OaiPmh extends \Kitodo\Dlf\Common\AbstractPlugin
-{
+class OaiPmh extends \Kitodo\Dlf\Common\AbstractPlugin {
     public $scriptRelPath = 'Classes/Plugin/OaiPmh.php';
 
     /**
@@ -78,8 +77,7 @@ 
      *
      * @return void
      */
-    protected function deleteExpiredTokens()
-    {
+    protected function deleteExpiredTokens() {
         // Delete expired resumption tokens.
         $GLOBALS['TYPO3_DB']->exec_DELETEquery(
             'tx_dlf_tokens',
@@ -100,8 +98,7 @@ 
      *
      * @return \DOMElement XML node to add to the OAI response
      */
-    protected function error($type)
-    {
+    protected function error($type) {
         $this->error = TRUE;
         $error = $this->oai->createElementNS('http://www.openarchives.org/OAI/2.0/', 'error', htmlspecialchars($this->pi_getLL($type, $type, FALSE), ENT_NOQUOTES, 'UTF-8'));
         $error->setAttribute('code', $type);
@@ -115,8 +112,7 @@ 
      *
      * @return void
      */
-    protected function getUrlParams()
-    {
+    protected function getUrlParams() {
         $allowedParams = [
             'verb',
             'identifier',
@@ -146,8 +142,7 @@ 
      *
      * @return \DOMElement XML node to add to the OAI response
      */
-    protected function getDcData(array $metadata)
-    {
+    protected function getDcData(array $metadata) {
         $oai_dc = $this->oai->createElementNS($this->formats['oai_dc']['namespace'], 'oai_dc:dc');
         $oai_dc->setAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:dc', 'http://purl.org/dc/elements/1.1/');
         $oai_dc->setAttributeNS('http://www.w3.org/2000/xmlns/', 'xmlns:xsi', 'http://www.w3.org/2001/XMLSchema-instance');
@@ -226,8 +221,7 @@ 
      *
      * @return \DOMElement XML node to add to the OAI response
      */
-    protected function getEpicurData(array $metadata)
-    {
+    protected function getEpicurData(array $metadata) {
         // Define all XML elements with or without qualified namespace.
         if (empty($this->conf['unqualified_epicur'])) {
             $epicur = $this->oai->createElementNS($this->formats['epicur']['namespace'], 'epicur:epicur');
@@ -290,8 +284,7 @@ 
      *
      * @return \DOMElement XML node to add to the OAI response
      */
-    protected function getMetsData(array $metadata)
-    {
+    protected function getMetsData(array $metadata) {
         $mets = NULL;
         // Load METS file.
         $xml = new \DOMDocument();
@@ -323,8 +316,7 @@ 
      *
      * @return void
      */
-    public function main($content, $conf)
-    {
+    public function main($content, $conf) {
         // Initialize plugin.
         $this->init($conf);
         // Turn cache off.
@@ -414,8 +406,7 @@ 
      *
      * @return string Substitution for subpart "###RESPONSE###"
      */
-    protected function resume()
-    {
+    protected function resume() {
         /** @var QueryBuilder $queryBuilder */
         $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)
             ->getQueryBuilderForTable('tx_dlf_tokens');
@@ -450,8 +441,7 @@ 
      *
      * @return string Substitution for subpart "###RESPONSE###"
      */
-    protected function verbGetRecord()
-    {
+    protected function verbGetRecord() {
         if (count($this->piVars) != 3 || empty($this->piVars['metadataPrefix']) || empty($this->piVars['identifier'])) {
             return $this->error('badArgument');
         }
@@ -530,8 +520,7 @@ 
      *
      * @return \DOMElement XML node to add to the OAI response
      */
-    protected function verbIdentify()
-    {
+    protected function verbIdentify() {
         // Check for invalid arguments.
         if (count($this->piVars) > 1) {
             return $this->error('badArgument');
@@ -616,8 +605,7 @@ 
      *
      * @return string Substitution for subpart "###RESPONSE###"
      */
-    protected function verbListIdentifiers()
-    {
+    protected function verbListIdentifiers() {
         // If we have a resumption token we can continue our work
         if (!empty($this->piVars['resumptionToken'])) {
             // "resumptionToken" is an exclusive argument.
@@ -656,8 +644,7 @@ 
      *
      * @return \DOMElement XML node to add to the OAI response
      */
-    protected function verbListMetadataFormats()
-    {
+    protected function verbListMetadataFormats() {
         $resArray = [];
         // Check for invalid arguments.
         if (count($this->piVars) > 1) {
@@ -716,8 +703,7 @@ 
      *
      * @return string Substitution for subpart "###RESPONSE###"
      */
-    protected function verbListRecords()
-    {
+    protected function verbListRecords() {
         // Check for invalid arguments.
         if (!empty($this->piVars['resumptionToken'])) {
             // "resumptionToken" is an exclusive argument.
@@ -757,8 +743,7 @@ 
      *
      * @return string Substitution for subpart "###RESPONSE###"
      */
-    protected function verbListSets()
-    {
+    protected function verbListSets() {
         /** @var QueryBuilder $queryBuilder */
         $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)
             ->getQueryBuilderForTable('tx_dlf_collections');
@@ -815,8 +800,7 @@ 
      * @return array Array of matching records
      * @throws \Exception
      */
-    protected function fetchDocumentUIDs()
-    {
+    protected function fetchDocumentUIDs() {
         /** @var QueryBuilder $queryBuilder */
         $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)
             ->getQueryBuilderForTable('tx_dlf_collections');
@@ -938,8 +922,7 @@ 
      *
      * @return \DOMElement XML of enriched records
      */
-    protected function generateOutputForDocumentList(DocumentList $documentListSet)
-    {
+    protected function generateOutputForDocumentList(DocumentList $documentListSet) {
         $documentsToProcess = $documentListSet->removeRange(0, intval($this->conf['limit']));
         $verb = $this->piVars['verb'];
         $documents = $GLOBALS['TYPO3_DB']->exec_SELECT_mm_query(
@@ -1025,8 +1008,7 @@ 
      *
      * @return \DOMElement XML for resumption token
      */
-    protected function generateResumptionTokenForDocumentListSet(DocumentList $documentListSet)
-    {
+    protected function generateResumptionTokenForDocumentListSet(DocumentList $documentListSet) {
         if ($documentListSet->count() != 0) {
             $token = uniqid();
             $GLOBALS['TYPO3_DB']->exec_INSERTquery(

Classes/Plugin/PageGrid.php

Spacing +8 added lines, -8 removed lines

@@ -55,9 +55,9 @@ 
         } elseif (!empty($this->conf['placeholder'])) {
             $thumbnailFile = $GLOBALS['TSFE']->tmpl->getFileName($this->conf['placeholder']);
         } else {
-            $thumbnailFile = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'Resources/Public/Images/PageGridPlaceholder.jpg';
+            $thumbnailFile = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'Resources/Public/Images/PageGridPlaceholder.jpg';
         }
-        $thumbnail = '<img alt="' . $markerArray['###PAGINATION###'] . '" src="' . $thumbnailFile . '" />';
+        $thumbnail = '<img alt="'.$markerArray['###PAGINATION###'].'" src="'.$thumbnailFile.'" />';
         // Get new plugin variables for typolink.
         $piVars = $this->piVars;
         // Unset no longer needed plugin variables.
@@ -93,22 +93,22 @@ 
         $separator = $this->pi_getLL('separator', ' - ', TRUE);
         // Add link to previous page.
         if ($this->piVars['pointer'] > 0) {
-            $output = $this->pi_linkTP_keepPIvars($this->pi_getLL('prevPage', '&lt;', TRUE), ['pointer' => $this->piVars['pointer'] - 1, 'page' => (($this->piVars['pointer'] - 1) * $this->conf['limit']) + 1], TRUE) . $separator;
+            $output = $this->pi_linkTP_keepPIvars($this->pi_getLL('prevPage', '&lt;', TRUE), ['pointer' => $this->piVars['pointer'] - 1, 'page' => (($this->piVars['pointer'] - 1) * $this->conf['limit']) + 1], TRUE).$separator;
         } else {
-            $output = '<span class="prev-page not-active">' . $this->pi_getLL('prevPage', '&lt;', TRUE) . '</span>' . $separator;
+            $output = '<span class="prev-page not-active">'.$this->pi_getLL('prevPage', '&lt;', TRUE).'</span>'.$separator;
         }
         $i = 0;
         // Add links to pages.
         while ($i < $maxPages) {
             if ($i < 3 || ($i > $this->piVars['pointer'] - 3 && $i < $this->piVars['pointer'] + 3) || $i > $maxPages - 4) {
                 if ($this->piVars['pointer'] != $i) {
-                    $output .= $this->pi_linkTP_keepPIvars(sprintf($this->pi_getLL('page', '%d', TRUE), $i + 1), ['pointer' => $i, 'page' => ($i * $this->conf['limit']) + 1], TRUE) . $separator;
+                    $output .= $this->pi_linkTP_keepPIvars(sprintf($this->pi_getLL('page', '%d', TRUE), $i + 1), ['pointer' => $i, 'page' => ($i * $this->conf['limit']) + 1], TRUE).$separator;
                 } else {
-                    $output .= '<span class="active">' . sprintf($this->pi_getLL('page', '%d', TRUE), $i + 1) . '</span>' . $separator;
+                    $output .= '<span class="active">'.sprintf($this->pi_getLL('page', '%d', TRUE), $i + 1).'</span>'.$separator;
                 }
                 $skip = TRUE;
             } elseif ($skip == TRUE) {
-                $output .= '<span class="skipped">' . $this->pi_getLL('skip', '...', TRUE) . '</span>' . $separator;
+                $output .= '<span class="skipped">'.$this->pi_getLL('skip', '...', TRUE).'</span>'.$separator;
                 $skip = FALSE;
             }
             $i++;
@@ -117,7 +117,7 @@ 
         if ($this->piVars['pointer'] < $maxPages - 1) {
             $output .= $this->pi_linkTP_keepPIvars($this->pi_getLL('nextPage', '&gt;', TRUE), ['pointer' => $this->piVars['pointer'] + 1, 'page' => ($this->piVars['pointer'] + 1) * $this->conf['limit'] + 1], TRUE);
         } else {
-            $output .= '<span class="next-page not-active">' . $this->pi_getLL('nextPage', '&gt;', TRUE) . '</span>';
+            $output .= '<span class="next-page not-active">'.$this->pi_getLL('nextPage', '&gt;', TRUE).'</span>';
         }
         return $output;
     }

Braces +4 added lines, -8 removed lines

@@ -23,8 +23,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class PageGrid extends \Kitodo\Dlf\Common\AbstractPlugin
-{
+class PageGrid extends \Kitodo\Dlf\Common\AbstractPlugin {
     public $scriptRelPath = 'Classes/Plugin/PageGrid.php';
 
     /**
@@ -37,8 +36,7 @@ 
      *
      * @return string The rendered entry ready for output
      */
-    protected function getEntry($number, $template)
-    {
+    protected function getEntry($number, $template) {
         // Set current page if applicable.
         if (!empty($this->piVars['page']) && $this->piVars['page'] == $number) {
             $markerArray['###STATE###'] = 'cur';
@@ -81,8 +79,7 @@ 
      *
      * @return string The rendered page browser ready for output
      */
-    protected function getPageBrowser()
-    {
+    protected function getPageBrowser() {
         // Get overall number of pages.
         $maxPages = intval(ceil($this->doc->numPages / $this->conf['limit']));
         // Return empty pagebrowser if there is just one page.
@@ -132,8 +129,7 @@ 
      *
      * @return string The content that is displayed on the website
      */
-    public function main($content, $conf)
-    {
+    public function main($content, $conf) {
         $this->init($conf);
         $this->loadDocument();
         if (

Classes/Plugin/Basket.php

Spacing +47 added lines, -47 removed lines

@@ -56,7 +56,7 @@ 
             $query = $GLOBALS['TYPO3_DB']->SELECTquery(
                 '*',
                 'tx_dlf_basket',
-                'tx_dlf_basket.fe_user_id=' . intval($insertArray['fe_user_id'])
+                'tx_dlf_basket.fe_user_id='.intval($insertArray['fe_user_id'])
                     . Helper::whereClause('tx_dlf_basket'),
                 '',
                 '',
@@ -69,7 +69,7 @@ 
             $query = $GLOBALS['TYPO3_DB']->SELECTquery(
                 '*',
                 'tx_dlf_basket',
-                'tx_dlf_basket.session_id=' . $GLOBALS['TYPO3_DB']->fullQuoteStr($sessionId, 'tx_dlf_basket')
+                'tx_dlf_basket.session_id='.$GLOBALS['TYPO3_DB']->fullQuoteStr($sessionId, 'tx_dlf_basket')
                     . Helper::whereClause('tx_dlf_basket'),
                 '',
                 '',
@@ -159,9 +159,9 @@ 
 
         if ($resultMail->countRow() > 0) {
             $mailForm = '<select name="tx_dlf[mail_action]">';
-            $mailForm .= '<option value="">' . $this->pi_getLL('chooseMail', '', TRUE) . '</option>';
+            $mailForm .= '<option value="">'.$this->pi_getLL('chooseMail', '', TRUE).'</option>';
             while ($row = $resultMail->fetch()) {
-                $mailForm .= '<option value="' . $row['uid'] . '">' . $row['name'] . ' (' . $row['mail'] . ')</option>';
+                $mailForm .= '<option value="'.$row['uid'].'">'.$row['name'].' ('.$row['mail'].')</option>';
             }
             $mailForm .= '</select><input type="submit">';
         }
@@ -170,9 +170,9 @@ 
         // remove action form
         $markerArray['###REMOVEACTION###'] = '
    <select name="tx_dlf[basket_action]">
-    <option value="">' . $this->pi_getLL('chooseAction', '', TRUE) . '</option>
-    <option value="open">' . $this->pi_getLL('download', '', TRUE) . '</option>
-    <option value="remove">' . $this->pi_getLL('remove', '', TRUE) . '</option>
+    <option value="">' . $this->pi_getLL('chooseAction', '', TRUE).'</option>
+    <option value="open">' . $this->pi_getLL('download', '', TRUE).'</option>
+    <option value="remove">' . $this->pi_getLL('remove', '', TRUE).'</option>
    </select>
    <input type="submit">
   ';
@@ -193,9 +193,9 @@ 
         $printForm = '';
         if ($resultPrinter->countRow() > 0) {
             $printForm = '<select name="tx_dlf[print_action]">';
-            $printForm .= '<option value="">' . $this->pi_getLL('choosePrinter', '', TRUE) . '</option>';
+            $printForm .= '<option value="">'.$this->pi_getLL('choosePrinter', '', TRUE).'</option>';
             while ($row = $resultPrinter->fetch()) {
-                $printForm .= '<option value="' . $row['uid'] . '">' . $row['label'] . '</option>';
+                $printForm .= '<option value="'.$row['uid'].'">'.$row['label'].'</option>';
             }
             $printForm .= '</select><input type="submit" />';
         }
@@ -250,23 +250,23 @@ 
         $rotation = $data['rotation'];
         $docData = $this->getDocumentData($id, $data);
         $markerArray['###BASKETDATA###'] = $docData['downloadLink'];
-        $arrayKey = $id . '_' . $startpage;
+        $arrayKey = $id.'_'.$startpage;
         if (isset($startX)) {
-            $arrayKey .= '_' . $startX;
+            $arrayKey .= '_'.$startX;
         }
         if (isset($endX)) {
-            $arrayKey .= '_' . $endX;
+            $arrayKey .= '_'.$endX;
         }
-        $controlMark = '<input value="' . $id . '" name="tx_dlf[selected][' . $arrayKey . '][id]" type="checkbox">';
-        $controlMark .= '<input value="' . $startpage . '" name="tx_dlf[selected][' . $arrayKey . '][startpage]" type="hidden">';
-        $controlMark .= '<input value="' . $endpage . '" name="tx_dlf[selected][' . $arrayKey . '][endpage]" type="hidden">';
+        $controlMark = '<input value="'.$id.'" name="tx_dlf[selected]['.$arrayKey.'][id]" type="checkbox">';
+        $controlMark .= '<input value="'.$startpage.'" name="tx_dlf[selected]['.$arrayKey.'][startpage]" type="hidden">';
+        $controlMark .= '<input value="'.$endpage.'" name="tx_dlf[selected]['.$arrayKey.'][endpage]" type="hidden">';
         // add hidden fields for detail information
         if ($startX) {
-            $controlMark .= '<input type="hidden" name="tx_dlf[selected][' . $arrayKey . '][startX]" value="' . $startX . '">';
-            $controlMark .= '<input type="hidden" name="tx_dlf[selected][' . $arrayKey . '][startY]"  value="' . $startY . '">';
-            $controlMark .= '<input type="hidden" name="tx_dlf[selected][' . $arrayKey . '][endX]"  value="' . $endX . '">';
-            $controlMark .= '<input type="hidden" name="tx_dlf[selected][' . $arrayKey . '][endY]"  value="' . $endY . '">';
-            $controlMark .= '<input type="hidden" name="tx_dlf[selected][' . $arrayKey . '][rotation]"  value="' . $rotation . '">';
+            $controlMark .= '<input type="hidden" name="tx_dlf[selected]['.$arrayKey.'][startX]" value="'.$startX.'">';
+            $controlMark .= '<input type="hidden" name="tx_dlf[selected]['.$arrayKey.'][startY]"  value="'.$startY.'">';
+            $controlMark .= '<input type="hidden" name="tx_dlf[selected]['.$arrayKey.'][endX]"  value="'.$endX.'">';
+            $controlMark .= '<input type="hidden" name="tx_dlf[selected]['.$arrayKey.'][endY]"  value="'.$endY.'">';
+            $controlMark .= '<input type="hidden" name="tx_dlf[selected]['.$arrayKey.'][rotation]"  value="'.$rotation.'">';
         }
         // return one entry
         $markerArray['###CONTROLS###'] = $controlMark;
@@ -322,12 +322,12 @@ 
             if ($_piVars['addToBasket'] == 'list') {
                 $documentItem['endpage'] = $document->numPages;
             }
-            $arrayKey = $documentItem['id'] . '_' . $page;
+            $arrayKey = $documentItem['id'].'_'.$page;
             if (!empty($documentItem['startX'])) {
-                $arrayKey .= '_' . $documentItem['startX'];
+                $arrayKey .= '_'.$documentItem['startX'];
             }
             if (!empty($documentItem['endX'])) {
-                $arrayKey .= '_' . $documentItem['endX'];
+                $arrayKey .= '_'.$documentItem['endX'];
             }
             // do not add more than one identical object
             if (!in_array($arrayKey, $items)) {
@@ -346,14 +346,14 @@ 
                     // remove parameter endpage
                     $pdfParams = str_replace(",##endpage##", '', $pdfParams);
                 }
-                $pdfGenerateUrl = $this->conf['pdfgenerate'] . $pdfParams;
+                $pdfGenerateUrl = $this->conf['pdfgenerate'].$pdfParams;
                 if ($this->conf['pregeneration']) {
                     // send ajax request to webapp
                     $output .= '
      <script>
       $(document).ready(function(){
        $.ajax({
-         url: "' . $pdfGenerateUrl . '",
+         url: "' . $pdfGenerateUrl.'",
        }).done(function() {
        });
       });
@@ -361,7 +361,7 @@ 
                 }
             }
             $update = ['doc_ids' => json_encode($items)];
-            $GLOBALS['TYPO3_DB']->exec_UPDATEquery('tx_dlf_basket', 'uid=' . intval($basketData['uid']), $update);
+            $GLOBALS['TYPO3_DB']->exec_UPDATEquery('tx_dlf_basket', 'uid='.intval($basketData['uid']), $update);
             $basketData['doc_ids'] = $items;
         }
         return ['basketData' => $basketData, 'jsOutput' => $output];
@@ -385,12 +385,12 @@ 
         }
         foreach ($_piVars['selected'] as $value) {
             if (isset($value['id'])) {
-                $arrayKey = $value['id'] . '_' . $value['startpage'];
+                $arrayKey = $value['id'].'_'.$value['startpage'];
                 if (isset($value['startX'])) {
-                    $arrayKey .= '_' . $value['startX'];
+                    $arrayKey .= '_'.$value['startX'];
                 }
                 if (isset($value['endX'])) {
-                    $arrayKey .= '_' . $value['endX'];
+                    $arrayKey .= '_'.$value['endX'];
                 }
                 if (isset($items[$arrayKey])) {
                     unset($items[$arrayKey]);
@@ -402,7 +402,7 @@ 
         } else {
             $update = ['doc_ids' => json_encode($items)];
         }
-        $GLOBALS['TYPO3_DB']->exec_UPDATEquery('tx_dlf_basket', 'uid=' . intval($basketData['uid']), $update);
+        $GLOBALS['TYPO3_DB']->exec_UPDATEquery('tx_dlf_basket', 'uid='.intval($basketData['uid']), $update);
         $basketData['doc_ids'] = $items;
         return $basketData;
     }
@@ -423,10 +423,10 @@ 
         foreach ($this->piVars['selected'] as $docValue) {
             if ($docValue['id']) {
                 $docData = $this->getDocumentData($docValue['id'], $docValue);
-                $pdfUrl .= $docData['urlParams'] . $this->conf['pdfparamseparator'];
+                $pdfUrl .= $docData['urlParams'].$this->conf['pdfparamseparator'];
             }
         }
-        header('Location: ' . $pdfUrl);
+        header('Location: '.$pdfUrl);
         ob_end_flush();
         exit;
     }
@@ -460,7 +460,7 @@ 
             $urlParams = str_replace("##endx##", $data['endX'] === "" ? "" : intval($data['endX']), $urlParams);
             $urlParams = str_replace("##endy##", $data['endY'] === "" ? "" : intval($data['endY']), $urlParams);
             $urlParams = str_replace("##rotation##", $data['rotation'] === "" ? "" : intval($data['rotation']), $urlParams);
-            $downloadUrl = $this->conf['pdfgenerate'] . $urlParams;
+            $downloadUrl = $this->conf['pdfgenerate'].$urlParams;
             $title = $document->getTitle($id, TRUE);
             if (empty($title)) {
                 $title = $this->pi_getLL('noTitle', '', TRUE);
@@ -469,15 +469,15 @@ 
             $info = '';
             if ($data['startX'] != '' && $data['endX'] != '') {
                 // cutout
-                $info .= $this->pi_getLL('cutout', '', TRUE) . ' ';
+                $info .= $this->pi_getLL('cutout', '', TRUE).' ';
             }
             if ($data['startpage'] == $data['endpage']) {
                 // One page
-                $info .= $this->pi_getLL('page', '', TRUE) . ' ' . $data['startpage'];
+                $info .= $this->pi_getLL('page', '', TRUE).' '.$data['startpage'];
             } else {
-                $info .= $this->pi_getLL('page', '', TRUE) . ' ' . $data['startpage'] . '-' . $data['endpage'];
+                $info .= $this->pi_getLL('page', '', TRUE).' '.$data['startpage'].'-'.$data['endpage'];
             }
-            $downloadLink = '<a href="' . $downloadUrl . '" target="_blank">' . $title . '</a> (' . $info . ')';
+            $downloadLink = '<a href="'.$downloadUrl.'" target="_blank">'.$title.'</a> ('.$info.')';
             if ($data['startpage'] == $data['endpage']) {
                 $pageNums = 1;
             } else {
@@ -523,7 +523,7 @@ 
 
         $allResults = $resultMail->fetchAll();
         $mailData = $allResults[0];
-        $mailText = $this->pi_getLL('mailBody', '', TRUE) . "\n";
+        $mailText = $this->pi_getLL('mailBody', '', TRUE)."\n";
         $numberOfPages = 0;
         $pdfUrl = $this->conf['pdfdownload'];
         // prepare links
@@ -531,7 +531,7 @@ 
             if ($docValue['id']) {
                 $explodeId = explode("_", $docValue['id']);
                 $docData = $this->getDocumentData($explodeId[0], $docValue);
-                $pdfUrl .= $docData['urlParams'] . $this->conf['pdfparamseparator'];
+                $pdfUrl .= $docData['urlParams'].$this->conf['pdfparamseparator'];
                 $pages = (abs(intval($docValue['startpage']) - intval($docValue['endpage'])));
                 if ($pages === 0) {
                     $numberOfPages = $numberOfPages + 1;
@@ -542,7 +542,7 @@ 
         }
         // Remove leading/tailing pdfparamseperator
         $pdfUrl = trim($pdfUrl, $this->conf['pdfparamseparator']);
-        $mailBody = $mailText . $pdfUrl;
+        $mailBody = $mailText.$pdfUrl;
         // Get hook objects.
         $hookObjects = Helper::getHookObjects($this->scriptRelPath);
         // Hook for getting a customized mail body.
@@ -575,12 +575,12 @@ 
             // internal user
             $insertArray['user_id'] = $GLOBALS["TSFE"]->fe_user->user['uid'];
             $insertArray['name'] = $GLOBALS["TSFE"]->fe_user->user['username'];
-            $insertArray['label'] = 'Mail: ' . $mailData['mail'];
+            $insertArray['label'] = 'Mail: '.$mailData['mail'];
         } else {
             // external user
             $insertArray['user_id'] = 0;
             $insertArray['name'] = 'n/a';
-            $insertArray['label'] = 'Mail: ' . $mailData['mail'];
+            $insertArray['label'] = 'Mail: '.$mailData['mail'];
         }
         // add action to protocol
         $GLOBALS['TYPO3_DB']->exec_INSERTquery('tx_dlf_actionlog', $insertArray);
@@ -600,7 +600,7 @@ 
         foreach ($this->piVars['selected'] as $docId => $docValue) {
             if ($docValue['id']) {
                 $docData = $this->getDocumentData($docValue['id'], $docValue);
-                $pdfUrl .= $docData['urlParams'] . $this->conf['pdfparamseparator'];
+                $pdfUrl .= $docData['urlParams'].$this->conf['pdfparamseparator'];
                 $numberOfPages += $docData['pageNums'];
             }
         }
@@ -632,7 +632,7 @@ 
                 if ($docValue['id']) {
                     $explodeId = explode("_", $docId);
                     $docData = $this->getDocumentData($explodeId[0], $docValue);
-                    $pdfUrl .= $docData['urlParams'] . $this->conf['pdfparamseparator'];
+                    $pdfUrl .= $docData['urlParams'].$this->conf['pdfparamseparator'];
                     $numberOfPages += $docData['pageNums'];
                 }
             }
@@ -649,16 +649,16 @@ 
             // internal user
             $insertArray['user_id'] = $GLOBALS["TSFE"]->fe_user->user['uid'];
             $insertArray['name'] = $GLOBALS["TSFE"]->fe_user->user['username'];
-            $insertArray['label'] = 'Print: ' . $printerData['label'];
+            $insertArray['label'] = 'Print: '.$printerData['label'];
         } else {
             // external user
             $insertArray['user_id'] = 0;
             $insertArray['name'] = 'n/a';
-            $insertArray['label'] = 'Print: ' . $printerData['label'];
+            $insertArray['label'] = 'Print: '.$printerData['label'];
         }
         // add action to protocol
         $GLOBALS['TYPO3_DB']->exec_INSERTquery('tx_dlf_actionlog', $insertArray);
-        header('Location: ' . $pdfUrl);
+        header('Location: '.$pdfUrl);
         ob_end_flush();
         exit;
     }

Braces +9 added lines, -18 removed lines

@@ -26,8 +26,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class Basket extends \Kitodo\Dlf\Common\AbstractPlugin
-{
+class Basket extends \Kitodo\Dlf\Common\AbstractPlugin {
     public $scriptRelPath = 'Classes/Plugin/Basket.php';
 
     /**
@@ -40,8 +39,7 @@ 
      *
      * @return string The content that is displayed on the website
      */
-    public function main($content, $conf)
-    {
+    public function main($content, $conf) {
         $this->init($conf);
         // Don't cache the output.
         $this->setCache(FALSE);
@@ -235,8 +233,7 @@ 
      *
      * @return string One basket entry
      */
-    protected function getEntry($data, $template)
-    {
+    protected function getEntry($data, $template) {
         if (is_object($data)) {
             $data = get_object_vars($data);
         }
@@ -284,8 +281,7 @@ 
      *
      * @return array Basket data and Javascript output
      */
-    protected function addToBasket($_piVars, $basketData)
-    {
+    protected function addToBasket($_piVars, $basketData) {
         $output = '';
         if (!$_piVars['startpage']) {
             $page = 0;
@@ -377,8 +373,7 @@ 
      *
      * @return array basket data
      */
-    protected function removeFromBasket($_piVars, $basketData)
-    {
+    protected function removeFromBasket($_piVars, $basketData) {
         if (!empty($basketData['doc_ids'])) {
             $items = $basketData['doc_ids'];
             $items = get_object_vars($items);
@@ -417,8 +412,7 @@ 
      *
      * @return array basket data
      */
-    protected function openFromBasket($_piVars, $basketData)
-    {
+    protected function openFromBasket($_piVars, $basketData) {
         $pdfUrl = $this->conf['pdfgenerate'];
         foreach ($this->piVars['selected'] as $docValue) {
             if ($docValue['id']) {
@@ -440,8 +434,7 @@ 
      *
      * @return mixed download url or FALSE
      */
-    protected function getDocumentData($id, $data)
-    {
+    protected function getDocumentData($id, $data) {
         // get document instance to load further information
         $document = Document::getInstance($id, 0);
         if ($document) {
@@ -501,8 +494,7 @@ 
      *
      * @return void
      */
-    protected function sendMail()
-    {
+    protected function sendMail() {
         // send mail
         $mailId = $this->piVars['mail_action'];
 
@@ -593,8 +585,7 @@ 
      *
      * @return void
      */
-    protected function printDocument()
-    {
+    protected function printDocument() {
         $pdfUrl = $this->conf['pdfprint'];
         $numberOfPages = 0;
         foreach ($this->piVars['selected'] as $docId => $docValue) {

Classes/Plugin/Calendar.php

Spacing +15 added lines, -15 removed lines

@@ -120,16 +120,16 @@ 
                 '###DAYFRI_NAME###' => strftime('%a', strtotime('last Friday')),
                 '###DAYSAT_NAME###' => strftime('%a', strtotime('last Saturday')),
                 '###DAYSUN_NAME###' => strftime('%a', strtotime('last Sunday')),
-                '###MONTHNAME###'  => strftime('%B', strtotime($year . '-' . ($i + 1) . '-1'))
+                '###MONTHNAME###'  => strftime('%B', strtotime($year.'-'.($i + 1).'-1'))
             ];
             // Reset week content of new month.
             $subWeekPartContent = '';
-            $firstOfMonth = strtotime($year . '-' . ($i + 1) . '-1');
+            $firstOfMonth = strtotime($year.'-'.($i + 1).'-1');
             $lastOfMonth = strtotime('last day of', ($firstOfMonth));
             $firstOfMonthStart = strtotime('last Monday', $firstOfMonth);
             // There are never more than 6 weeks in a month.
             for ($j = 0; $j <= 5; $j++) {
-                $firstDayOfWeek = strtotime('+ ' . $j . ' Week', $firstOfMonthStart);
+                $firstDayOfWeek = strtotime('+ '.$j.' Week', $firstOfMonthStart);
                 $weekArray = [
                     '###DAYMON###' => '&nbsp;',
                     '###DAYTUE###' => '&nbsp;',
@@ -141,7 +141,7 @@ 
                 ];
                 // Every week has seven days. ;-)
                 for ($k = 0; $k <= 6; $k++) {
-                    $currentDayTime = strtotime('+ ' . $k . ' Day', $firstDayOfWeek);
+                    $currentDayTime = strtotime('+ '.$k.' Day', $firstDayOfWeek);
                     if (
                         $currentDayTime >= $firstOfMonth
                         && $currentDayTime <= $lastOfMonth
@@ -159,7 +159,7 @@ 
                                         $linkConf = [
                                             'useCacheHash' => 1,
                                             'parameter' => $this->conf['targetPid'],
-                                            'additionalParams' => '&' . $this->prefixId . '[id]=' . urlencode($issue['uid']),
+                                            'additionalParams' => '&'.$this->prefixId.'[id]='.urlencode($issue['uid']),
                                             'ATagParams' => ' class="title"',
                                         ];
                                         $dayLinksText[] = $this->cObj->typoLink($dayLinkLabel, $linkConf);
@@ -171,13 +171,13 @@ 
                             if (!empty($dayLinksText)) {
                                 $dayLinksList = '<ul>';
                                 foreach ($dayLinksText as $link) {
-                                    $dayLinksList .= '<li>' . $link . '</li>';
+                                    $dayLinksList .= '<li>'.$link.'</li>';
                                 }
                                 $dayLinksList .= '</ul>';
                             }
-                            $dayLinkDiv = '<div class="issues"><h4>' . strftime('%d', $currentDayTime) . '</h4><div>' . $dayLinksList . '</div></div>';
+                            $dayLinkDiv = '<div class="issues"><h4>'.strftime('%d', $currentDayTime).'</h4><div>'.$dayLinksList.'</div></div>';
                         }
-                        switch (strftime('%w', strtotime('+ ' . $k . ' Day', $firstDayOfWeek))) {
+                        switch (strftime('%w', strtotime('+ '.$k.' Day', $firstDayOfWeek))) {
                             case '0':
                                 $weekArray['###DAYSUN###'] = ((int) $dayLinks === (int) date('j', $currentDayTime)) ? $dayLinkDiv : strftime('%d', $currentDayTime);
                                 break;
@@ -214,14 +214,14 @@ 
         $linkConf = [
             'useCacheHash' => 1,
             'parameter' => $this->conf['targetPid'],
-            'additionalParams' => '&' . $this->prefixId . '[id]=' . urlencode($this->doc->parentId),
+            'additionalParams' => '&'.$this->prefixId.'[id]='.urlencode($this->doc->parentId),
         ];
-        $allYearsLink = $this->cObj->typoLink($this->pi_getLL('allYears', '', TRUE) . ' ' . $this->doc->getTitle($this->doc->parentId), $linkConf);
+        $allYearsLink = $this->cObj->typoLink($this->pi_getLL('allYears', '', TRUE).' '.$this->doc->getTitle($this->doc->parentId), $linkConf);
         // Link to current year.
         $linkConf = [
             'useCacheHash' => 1,
             'parameter' => $this->conf['targetPid'],
-            'additionalParams' => '&' . $this->prefixId . '[id]=' . urlencode($this->doc->uid),
+            'additionalParams' => '&'.$this->prefixId.'[id]='.urlencode($this->doc->uid),
         ];
         $yearLink = $this->cObj->typoLink($year, $linkConf);
         $subPartContentList = '';
@@ -310,8 +310,8 @@ 
                 $linkConf = [
                     'useCacheHash' => 1,
                     'parameter' => $this->conf['targetPid'],
-                    'additionalParams' => '&' . $this->prefixId . '[id]=' . urlencode($year['uid']),
-                    'title' => $titleAnchor . ': ' . $year['title']
+                    'additionalParams' => '&'.$this->prefixId.'[id]='.urlencode($year['uid']),
+                    'title' => $titleAnchor.': '.$year['title']
                 ];
                 $yearArray = [
                     '###YEARNAME###' => $this->cObj->typoLink($year['title'], $linkConf),
@@ -323,9 +323,9 @@ 
         $linkConf = [
             'useCacheHash' => 1,
             'parameter' => $this->conf['targetPid'],
-            'additionalParams' => '&' . $this->prefixId . '[id]=' . $this->doc->uid,
+            'additionalParams' => '&'.$this->prefixId.'[id]='.$this->doc->uid,
         ];
-        $allYearsLink = $this->cObj->typoLink($this->pi_getLL('allYears', '', TRUE) . ' ' . $this->doc->getTitle($this->doc->uid), $linkConf);
+        $allYearsLink = $this->cObj->typoLink($this->pi_getLL('allYears', '', TRUE).' '.$this->doc->getTitle($this->doc->uid), $linkConf);
         // Fill markers.
         $markerArray = [
             '###LABEL_CHOOSE_YEAR###' => $this->pi_getLL('label.please_choose_year'),

Braces +4 added lines, -8 removed lines

@@ -25,8 +25,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class Calendar extends \Kitodo\Dlf\Common\AbstractPlugin
-{
+class Calendar extends \Kitodo\Dlf\Common\AbstractPlugin {
     public $scriptRelPath = 'Classes/Plugin/Calendar.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) {
         // Nothing to do here.
         return $content;
     }
@@ -55,8 +53,7 @@ 
      *
      * @return string The content that is displayed on the website
      */
-    public function calendar($content, $conf)
-    {
+    public function calendar($content, $conf) {
         $this->init($conf);
         // Load current document.
         $this->loadDocument();
@@ -262,8 +259,7 @@ 
      *
      * @return string The content that is displayed on the website
      */
-    public function years($content, $conf)
-    {
+    public function years($content, $conf) {
         $this->init($conf);
         // Load current document.
         $this->loadDocument();

Classes/Plugin/Statistics.php

Spacing +13 added lines, -13 removed lines

@@ -59,11 +59,11 @@ 
                 'tx_dlf_documents',
                 'tx_dlf_relations',
                 'tx_dlf_collections',
-                'AND tx_dlf_documents.pid=' . intval($this->conf['pages'])
-                    . ' AND tx_dlf_collections.pid=' . intval($this->conf['pages'])
+                'AND tx_dlf_documents.pid='.intval($this->conf['pages'])
+                    . ' AND tx_dlf_collections.pid='.intval($this->conf['pages'])
                     . ' AND tx_dlf_documents.partof=0'
-                    . ' AND tx_dlf_collections.uid IN (' . $GLOBALS['TYPO3_DB']->cleanIntList($this->conf['collections']) . ')'
-                    . ' AND tx_dlf_relations.ident=' . $GLOBALS['TYPO3_DB']->fullQuoteStr('docs_colls', 'tx_dlf_relations')
+                    . ' AND tx_dlf_collections.uid IN ('.$GLOBALS['TYPO3_DB']->cleanIntList($this->conf['collections']).')'
+                    . ' AND tx_dlf_relations.ident='.$GLOBALS['TYPO3_DB']->fullQuoteStr('docs_colls', 'tx_dlf_relations')
                     . Helper::whereClause('tx_dlf_documents')
                     . Helper::whereClause('tx_dlf_collections'),
                 'tx_dlf_documents.uid'
@@ -73,11 +73,11 @@ 
                 'tx_dlf_documents',
                 'tx_dlf_relations',
                 'tx_dlf_collections',
-                'AND tx_dlf_documents.pid=' . intval($this->conf['pages'])
-                    . ' AND tx_dlf_collections.pid=' . intval($this->conf['pages'])
-                    . ' AND NOT tx_dlf_documents.uid IN (SELECT DISTINCT tx_dlf_documents.partof FROM tx_dlf_documents WHERE NOT tx_dlf_documents.partof=0' . Helper::whereClause('tx_dlf_documents') . ')'
-                    . ' AND tx_dlf_collections.uid IN (' . $GLOBALS['TYPO3_DB']->cleanIntList($this->conf['collections']) . ')'
-                    . ' AND tx_dlf_relations.ident=' . $GLOBALS['TYPO3_DB']->fullQuoteStr('docs_colls', 'tx_dlf_relations')
+                'AND tx_dlf_documents.pid='.intval($this->conf['pages'])
+                    . ' AND tx_dlf_collections.pid='.intval($this->conf['pages'])
+                    . ' AND NOT tx_dlf_documents.uid IN (SELECT DISTINCT tx_dlf_documents.partof FROM tx_dlf_documents WHERE NOT tx_dlf_documents.partof=0'.Helper::whereClause('tx_dlf_documents').')'
+                    . ' AND tx_dlf_collections.uid IN ('.$GLOBALS['TYPO3_DB']->cleanIntList($this->conf['collections']).')'
+                    . ' AND tx_dlf_relations.ident='.$GLOBALS['TYPO3_DB']->fullQuoteStr('docs_colls', 'tx_dlf_relations')
                     . Helper::whereClause('tx_dlf_documents')
                     . Helper::whereClause('tx_dlf_collections'),
                 'tx_dlf_documents.uid'
@@ -101,8 +101,8 @@ 
             $resultVolumes = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
                 'tx_dlf_documents.uid AS uid',
                 'tx_dlf_documents',
-                'tx_dlf_documents.pid=' . intval($this->conf['pages'])
-                    . ' AND NOT tx_dlf_documents.uid IN (SELECT DISTINCT tx_dlf_documents.partof FROM tx_dlf_documents WHERE NOT tx_dlf_documents.partof=0' . Helper::whereClause('tx_dlf_documents') . ')'
+                'tx_dlf_documents.pid='.intval($this->conf['pages'])
+                    . ' AND NOT tx_dlf_documents.uid IN (SELECT DISTINCT tx_dlf_documents.partof FROM tx_dlf_documents WHERE NOT tx_dlf_documents.partof=0'.Helper::whereClause('tx_dlf_documents').')'
                     . Helper::whereClause('tx_dlf_documents')
             );
         }
@@ -115,8 +115,8 @@ 
                 '###VOLUMES###'
             ],
             'value' => [
-                $countTitles . ($countTitles > 1 ? $this->pi_getLL('titles', '', TRUE) : $this->pi_getLL('title', '', TRUE)),
-                $countVolumes . ($countVolumes > 1 ? $this->pi_getLL('volumes', '', TRUE) : $this->pi_getLL('volume', '', TRUE))
+                $countTitles.($countTitles > 1 ? $this->pi_getLL('titles', '', TRUE) : $this->pi_getLL('title', '', TRUE)),
+                $countVolumes.($countVolumes > 1 ? $this->pi_getLL('volumes', '', TRUE) : $this->pi_getLL('volume', '', TRUE))
             ]
         ];
         // Apply replacements.

Braces +2 added lines, -4 removed lines

@@ -25,8 +25,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class Statistics extends \Kitodo\Dlf\Common\AbstractPlugin
-{
+class Statistics extends \Kitodo\Dlf\Common\AbstractPlugin {
     public $scriptRelPath = 'Classes/Plugin/Statistics.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);
         // Turn cache on.
         $this->setCache(TRUE);

Classes/Plugin/Feeds.php

Spacing +13 added lines, -13 removed lines

@@ -90,18 +90,18 @@ 
             $additionalWhere = '';
             // Check for pre-selected collections.
             if (!empty($this->piVars['collection'])) {
-                $additionalWhere = ' AND tx_dlf_collections.uid=' . intval($this->piVars['collection']);
+                $additionalWhere = ' AND tx_dlf_collections.uid='.intval($this->piVars['collection']);
             } elseif (!empty($this->conf['collections'])) {
-                $additionalWhere = ' AND tx_dlf_collections.uid IN (' . $GLOBALS['TYPO3_DB']->cleanIntList($this->conf['collections']) . ')';
+                $additionalWhere = ' AND tx_dlf_collections.uid IN ('.$GLOBALS['TYPO3_DB']->cleanIntList($this->conf['collections']).')';
             }
             $result = $GLOBALS['TYPO3_DB']->exec_SELECT_mm_query(
                 'tx_dlf_documents.uid AS uid,tx_dlf_documents.partof AS partof,tx_dlf_documents.title AS title,tx_dlf_documents.volume AS volume,tx_dlf_documents.author AS author,tx_dlf_documents.record_id AS guid,tx_dlf_documents.tstamp AS tstamp,tx_dlf_documents.crdate AS crdate',
                 'tx_dlf_documents',
                 'tx_dlf_relations',
                 'tx_dlf_collections',
-                'AND tx_dlf_documents.pid=' . intval($this->conf['pages'])
-                    . ' AND tx_dlf_relations.ident=' . $GLOBALS['TYPO3_DB']->fullQuoteStr('docs_colls', 'tx_dlf_relations')
-                    . ' AND tx_dlf_collections.pid=' . intval($this->conf['pages'])
+                'AND tx_dlf_documents.pid='.intval($this->conf['pages'])
+                    . ' AND tx_dlf_relations.ident='.$GLOBALS['TYPO3_DB']->fullQuoteStr('docs_colls', 'tx_dlf_relations')
+                    . ' AND tx_dlf_collections.pid='.intval($this->conf['pages'])
                     . $additionalWhere
                     . Helper::whereClause('tx_dlf_documents')
                     . Helper::whereClause('tx_dlf_collections'),
@@ -120,12 +120,12 @@ 
                     ) {
                         $superiorTitle = Document::getTitle($resArray['partof'], TRUE);
                         if (!empty($superiorTitle)) {
-                            $title .= '[' . $superiorTitle . ']';
+                            $title .= '['.$superiorTitle.']';
                         }
                     }
                     // Get title of document.
                     if (!empty($resArray['title'])) {
-                        $title .= ' ' . $resArray['title'];
+                        $title .= ' '.$resArray['title'];
                     }
                     // Set default title if empty.
                     if (empty($title)) {
@@ -133,13 +133,13 @@ 
                     }
                     // Append volume information.
                     if (!empty($resArray['volume'])) {
-                        $title .= ', ' . $this->pi_getLL('volume') . ' ' . $resArray['volume'];
+                        $title .= ', '.$this->pi_getLL('volume').' '.$resArray['volume'];
                     }
                     // Is this document new or updated?
                     if ($resArray['crdate'] == $resArray['tstamp']) {
-                        $title = $this->pi_getLL('new') . ' ' . trim($title);
+                        $title = $this->pi_getLL('new').' '.trim($title);
                     } else {
-                        $title = $this->pi_getLL('update') . ' ' . trim($title);
+                        $title = $this->pi_getLL('update').' '.trim($title);
                     }
                     $item->appendChild($rss->createElement('title', htmlspecialchars($title, ENT_NOQUOTES, 'UTF-8')));
                     // Add link.
@@ -170,10 +170,10 @@ 
         // Send headers.
         header('HTTP/1.1 200 OK');
         header('Cache-Control: no-cache');
-        header('Content-Length: ' . strlen($content));
+        header('Content-Length: '.strlen($content));
         header('Content-Type: application/rss+xml; charset=utf-8');
-        header('Date: ' . date('r', $GLOBALS['EXEC_TIME']));
-        header('Expires: ' . date('r', $GLOBALS['EXEC_TIME']));
+        header('Date: '.date('r', $GLOBALS['EXEC_TIME']));
+        header('Expires: '.date('r', $GLOBALS['EXEC_TIME']));
         echo $content;
         exit;
     }

Braces +2 added lines, -4 removed lines

@@ -26,8 +26,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class Feeds extends \Kitodo\Dlf\Common\AbstractPlugin
-{
+class Feeds extends \Kitodo\Dlf\Common\AbstractPlugin {
     public $scriptRelPath = 'Classes/Plugin/Feeds.php';
 
     /**
@@ -40,8 +39,7 @@ 
      *
      * @return void
      */
-    public function main($content, $conf)
-    {
+    public function main($content, $conf) {
         $this->init($conf);
         // Don't cache the output.
         $this->setCache(FALSE);