kitodo / kitodo-presentation

modules/newclient/index.php

Spacing +21 added lines, -21 removed lines

@@ -21,11 +21,11 @@ 
 
     protected $modPath = 'newclient/';
 
-    protected $buttonArray = array (
+    protected $buttonArray = array(
         'SHORTCUT' => '',
     );
 
-    protected $markerArray = array (
+    protected $markerArray = array(
         'CSH' => '',
         'MOD_MENU' => '',
         'CONTENT' => '',
@@ -44,7 +44,7 @@ 
         $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
                 'uid,db_mountpoints',
                 'be_groups',
-                'title='.$GLOBALS['TYPO3_DB']->fullQuoteStr('_cli_dlf', 'be_groups').' AND '.$GLOBALS['TCA']['be_groups']['ctrl']['enablecolumns']['disabled'].'=0'.\TYPO3\CMS\Backend\Utility\BackendUtility::deleteClause('be_groups')
+                'title=' . $GLOBALS['TYPO3_DB']->fullQuoteStr('_cli_dlf', 'be_groups') . ' AND ' . $GLOBALS['TCA']['be_groups']['ctrl']['enablecolumns']['disabled'] . '=0' . \TYPO3\CMS\Backend\Utility\BackendUtility::deleteClause('be_groups')
         );
 
         if ($GLOBALS['TYPO3_DB']->sql_num_rows($result)) {
@@ -54,7 +54,7 @@ 
             // Add current page to mountpoints.
             if (!\TYPO3\CMS\Core\Utility\GeneralUtility::inList($resArray['db_mountpoints'], $this->id)) {
 
-                $data['be_groups'][$resArray['uid']]['db_mountpoints'] = $resArray['db_mountpoints'].','.$this->id;
+                $data['be_groups'][$resArray['uid']]['db_mountpoints'] = $resArray['db_mountpoints'] . ',' . $this->id;
 
                 tx_dlf_helper::processDBasAdmin($data);
 
@@ -85,14 +85,14 @@ 
     protected function cmdAddMetadata() {
 
         // Include metadata definition file.
-        include_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($this->extKey).'modules/'.$this->modPath.'metadata.inc.php');
+        include_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($this->extKey) . 'modules/' . $this->modPath . 'metadata.inc.php');
 
         $i = 0;
 
         // Build data array.
         foreach ($metadata as $index_name => $values) {
 
-            $formatIds = array ();
+            $formatIds = array();
 
             foreach ($values['format'] as $format) {
 
@@ -106,7 +106,7 @@ 
 
             }
 
-            $data['tx_dlf_metadata'][uniqid('NEW')] = array (
+            $data['tx_dlf_metadata'][uniqid('NEW')] = array(
                 'pid' => intval($this->id),
                 'label' => $GLOBALS['LANG']->getLL($index_name),
                 'index_name' => $index_name,
@@ -168,9 +168,9 @@ 
     protected function cmdAddSolrCore() {
 
         // Build data array.
-        $data['tx_dlf_solrcores'][uniqid('NEW')] = array (
+        $data['tx_dlf_solrcores'][uniqid('NEW')] = array(
             'pid' => intval($this->id),
-            'label' => $GLOBALS['LANG']->getLL('solrcore').' (PID '.$this->id.')',
+            'label' => $GLOBALS['LANG']->getLL('solrcore') . ' (PID ' . $this->id . ')',
             'index_name' => '',
         );
 
@@ -215,12 +215,12 @@ 
     protected function cmdAddStructure() {
 
         // Include structure definition file.
-        include_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($this->extKey).'modules/'.$this->modPath.'structures.inc.php');
+        include_once(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($this->extKey) . 'modules/' . $this->modPath . 'structures.inc.php');
 
         // Build data array.
         foreach ($structures as $index_name => $values) {
 
-            $data['tx_dlf_structures'][uniqid('NEW')] = array (
+            $data['tx_dlf_structures'][uniqid('NEW')] = array(
                 'pid' => intval($this->id),
                 'toplevel' => $values['toplevel'],
                 'label' => $GLOBALS['LANG']->getLL($index_name),
@@ -301,7 +301,7 @@ 
             if (!empty($this->CMD)) {
 
                 // Sanitize input...
-                $_method = 'cmd'.ucfirst($this->CMD);
+                $_method = 'cmd' . ucfirst($this->CMD);
 
                 // ...and unset to prevent infinite looping.
                 unset ($this->CMD);
@@ -318,7 +318,7 @@ 
             $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
                 'uid',
                 'tx_dlf_structures',
-                'pid='.intval($this->id).tx_dlf_helper::whereClause('tx_dlf_structures')
+                'pid=' . intval($this->id) . tx_dlf_helper::whereClause('tx_dlf_structures')
             );
 
             if ($GLOBALS['TYPO3_DB']->sql_num_rows($result)) {
@@ -335,7 +335,7 @@ 
             } else {
 
                 // Configuration missing.
-                $_url = \TYPO3\CMS\Core\Utility\GeneralUtility::locationHeaderUrl(\TYPO3\CMS\Core\Utility\GeneralUtility::linkThisScript(array ('id' => $this->id, 'CMD' => 'addStructure')));
+                $_url = \TYPO3\CMS\Core\Utility\GeneralUtility::locationHeaderUrl(\TYPO3\CMS\Core\Utility\GeneralUtility::linkThisScript(array('id' => $this->id, 'CMD' => 'addStructure')));
 
                 $_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
                     'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
@@ -353,7 +353,7 @@ 
             $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
                 'uid',
                 'tx_dlf_metadata',
-                'pid='.intval($this->id).tx_dlf_helper::whereClause('tx_dlf_metadata')
+                'pid=' . intval($this->id) . tx_dlf_helper::whereClause('tx_dlf_metadata')
             );
 
             if ($GLOBALS['TYPO3_DB']->sql_num_rows($result)) {
@@ -370,7 +370,7 @@ 
             } else {
 
                 // Configuration missing.
-                $_url = \TYPO3\CMS\Core\Utility\GeneralUtility::locationHeaderUrl(\TYPO3\CMS\Core\Utility\GeneralUtility::linkThisScript(array ('id' => $this->id, 'CMD' => 'addMetadata')));
+                $_url = \TYPO3\CMS\Core\Utility\GeneralUtility::locationHeaderUrl(\TYPO3\CMS\Core\Utility\GeneralUtility::linkThisScript(array('id' => $this->id, 'CMD' => 'addMetadata')));
 
                 $_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
                     'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
@@ -388,7 +388,7 @@ 
             $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
                 'uid,db_mountpoints',
                 'be_groups',
-                'title='.$GLOBALS['TYPO3_DB']->fullQuoteStr('_cli_dlf', 'be_groups').' AND '.$GLOBALS['TCA']['be_groups']['ctrl']['enablecolumns']['disabled'].'=0'.\TYPO3\CMS\Backend\Utility\BackendUtility::deleteClause('be_groups')
+                'title=' . $GLOBALS['TYPO3_DB']->fullQuoteStr('_cli_dlf', 'be_groups') . ' AND ' . $GLOBALS['TCA']['be_groups']['ctrl']['enablecolumns']['disabled'] . '=0' . \TYPO3\CMS\Backend\Utility\BackendUtility::deleteClause('be_groups')
             );
 
             if ($GLOBALS['TYPO3_DB']->sql_num_rows($result)) {
@@ -409,7 +409,7 @@ 
                 } else {
 
                     // Configuration missing.
-                    $_url = \TYPO3\CMS\Core\Utility\GeneralUtility::locationHeaderUrl(\TYPO3\CMS\Core\Utility\GeneralUtility::linkThisScript(array ('id' => $this->id, 'CMD' => 'addAccessRights')));
+                    $_url = \TYPO3\CMS\Core\Utility\GeneralUtility::locationHeaderUrl(\TYPO3\CMS\Core\Utility\GeneralUtility::linkThisScript(array('id' => $this->id, 'CMD' => 'addAccessRights')));
 
                     $_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
                         'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
@@ -440,7 +440,7 @@ 
             $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
                 'uid,pid',
                 'tx_dlf_solrcores',
-                'pid IN ('.intval($this->id).',0)'.tx_dlf_helper::whereClause('tx_dlf_solrcores')
+                'pid IN (' . intval($this->id) . ',0)' . tx_dlf_helper::whereClause('tx_dlf_solrcores')
             );
 
             if ($GLOBALS['TYPO3_DB']->sql_num_rows($result)) {
@@ -461,7 +461,7 @@ 
                 } else {
 
                     // Default core available, but this is deprecated.
-                    $_url = \TYPO3\CMS\Core\Utility\GeneralUtility::locationHeaderUrl(\TYPO3\CMS\Core\Utility\GeneralUtility::linkThisScript(array ('id' => $this->id, 'CMD' => 'addSolrcore')));
+                    $_url = \TYPO3\CMS\Core\Utility\GeneralUtility::locationHeaderUrl(\TYPO3\CMS\Core\Utility\GeneralUtility::linkThisScript(array('id' => $this->id, 'CMD' => 'addSolrcore')));
 
                     $_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
                         'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
@@ -476,7 +476,7 @@ 
             } else {
 
                 // Solr core missing.
-                $_url = \TYPO3\CMS\Core\Utility\GeneralUtility::locationHeaderUrl(\TYPO3\CMS\Core\Utility\GeneralUtility::linkThisScript(array ('id' => $this->id, 'CMD' => 'addSolrcore')));
+                $_url = \TYPO3\CMS\Core\Utility\GeneralUtility::locationHeaderUrl(\TYPO3\CMS\Core\Utility\GeneralUtility::linkThisScript(array('id' => $this->id, 'CMD' => 'addSolrcore')));
 
                 $_message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
                     'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',

modules/newclient/structures.inc.php

Spacing +88 added lines, -88 removed lines

@@ -11,352 +11,352 @@
 
 // Define structure elements.
 // @see http://dfg-viewer.de/en/structural-data-set/
-$structures = array (
-    'act' => array (
+$structures = array(
+    'act' => array(
         'toplevel' => 1,
         'oai_name' => '',
     ),
-    'additional' => array (
+    'additional' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'address' => array (
+    'address' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'album' => array (
+    'album' => array(
         'toplevel' => 1,
         'oai_name' => '',
     ),
-    'annotation' => array (
+    'annotation' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'article' => array (
+    'article' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'atlas' => array (
+    'atlas' => array(
         'toplevel' => 1,
         'oai_name' => '',
     ),
-    'bachelor_thesis' => array (
+    'bachelor_thesis' => array(
         'toplevel' => 1,
         'oai_name' => '',
     ),
-    'binding' => array (
+    'binding' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'bookplate' => array (
+    'bookplate' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'cartulary' => array (
+    'cartulary' => array(
         'toplevel' => 1,
         'oai_name' => '',
     ),
-    'chapter' => array (
+    'chapter' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'collation' => array (
+    'collation' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'colophon' => array (
+    'colophon' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'contained_work' => array (
+    'contained_work' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'contents' => array (
+    'contents' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'corrigenda' => array (
+    'corrigenda' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'cover' => array (
+    'cover' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'cover_front' => array (
+    'cover_front' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'cover_back' => array (
+    'cover_back' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'day' => array (
+    'day' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'dedication' => array (
+    'dedication' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'diploma_thesis' => array (
+    'diploma_thesis' => array(
         'toplevel' => 1,
         'oai_name' => '',
     ),
-    'doctoral_thesis' => array (
+    'doctoral_thesis' => array(
         'toplevel' => 1,
         'oai_name' => '',
     ),
-    'document' => array (
+    'document' => array(
         'toplevel' => 1,
         'oai_name' => '',
     ),
-    'dossier' => array (
+    'dossier' => array(
         'toplevel' => 1,
         'oai_name' => '',
     ),
-    'edge' => array (
+    'edge' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'endsheet' => array (
+    'endsheet' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'engraved_titlepage' => array (
+    'engraved_titlepage' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'entry' => array (
+    'entry' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'fascicle' => array (
+    'fascicle' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'file' => array (
+    'file' => array(
         'toplevel' => 1,
         'oai_name' => '',
     ),
-    'folder' => array (
+    'folder' => array(
         'toplevel' => 1,
         'oai_name' => '',
     ),
-    'fragment' => array (
+    'fragment' => array(
         'toplevel' => 1,
         'oai_name' => ''
     ),
-    'ground_plan' => array (
+    'ground_plan' => array(
         'toplevel' => 1,
         'oai_name' => '',
     ),
-    'habilitation_thesis' => array (
+    'habilitation_thesis' => array(
         'toplevel' => 1,
         'oai_name' => '',
     ),
-    'illustration' => array (
+    'illustration' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'image' => array (
+    'image' => array(
         'toplevel' => 1,
         'oai_name' => '',
     ),
-    'imprint' => array (
+    'imprint' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'index' => array (
+    'index' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'initial_decoration' => array (
+    'initial_decoration' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'issue' => array (
+    'issue' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'judgement' => array (
+    'judgement' => array(
         'toplevel' => 1,
         'oai_name' => '',
     ),
-    'land_register' => array (
+    'land_register' => array(
         'toplevel' => 1,
         'oai_name' => '',
     ),
-    'leaflet' => array (
+    'leaflet' => array(
         'toplevel' => 1,
         'oai_name' => '',
     ),
-    'lecture' => array (
+    'lecture' => array(
         'toplevel' => 1,
         'oai_name' => '',
     ),
-    'letter' => array (
+    'letter' => array(
         'toplevel' => 0,
         'oai_name' => '',
     ),
-    'magister_thesis' => array (
+    'magister_thesis' => array(
         'toplevel' => 1,
         'oai_name' => '',
     ),
-    'master_thesis' => array (
+    'master_thesis' => array(
         'toplevel' => 1,
         'oai_name' => '',
     ),
-    'manuscript' => array (
+    'manuscript' => array(
         'toplevel' => 1,
         'oai_name' => ''
     ),
-    'map' => array (
+    'map' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'monograph' => array (
+    'monograph' => array(
         'toplevel' => 1,
         'oai_name' => ''
     ),
-    'month' => array (
+    'month' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'multivolume_work' => array (
+    'multivolume_work' => array(
         'toplevel' => 1,
         'oai_name' => ''
     ),
-    'musical_notation' => array (
+    'musical_notation' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'newspaper' => array (
+    'newspaper' => array(
         'toplevel' => 1,
         'oai_name' => ''
     ),
-    'note' => array (
+    'note' => array(
         'toplevel' => 0,
         'oai_name' => '',
     ),
-    'official_notification' => array (
+    'official_notification' => array(
         'toplevel' => 1,
         'oai_name' => '',
     ),
-    'ornament' => array (
+    'ornament' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'paper' => array (
+    'paper' => array(
         'toplevel' => 1,
         'oai_name' => '',
     ),
-    'paste_down' => array (
+    'paste_down' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'periodical' => array (
+    'periodical' => array(
         'toplevel' => 1,
         'oai_name' => ''
     ),
-    'photograph' => array (
+    'photograph' => array(
         'toplevel' => 1,
         'oai_name' => '',
     ),
-    'plan' => array (
+    'plan' => array(
         'toplevel' => 1,
         'oai_name' => '',
     ),
-    'poster' => array (
+    'poster' => array(
         'toplevel' => 1,
         'oai_name' => '',
     ),
-    'preface' => array (
+    'preface' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'preprint' => array (
+    'preprint' => array(
         'toplevel' => 1,
         'oai_name' => '',
     ),
-    'printed_archives' => array (
+    'printed_archives' => array(
         'toplevel' => 1,
         'oai_name' => '',
     ),
-    'printers_mark' => array (
+    'printers_mark' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'privileges' => array (
+    'privileges' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'proceeding' => array (
+    'proceeding' => array(
         'toplevel' => 1,
         'oai_name' => '',
     ),
-    'provenance' => array (
+    'provenance' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'register' => array (
+    'register' => array(
         'toplevel' => 1,
         'oai_name' => '',
     ),
-    'report' => array (
+    'report' => array(
         'toplevel' => 1,
         'oai_name' => '',
     ),
-    'research_paper' => array (
+    'research_paper' => array(
         'toplevel' => 1,
         'oai_name' => '',
     ),
-    'scheme' => array (
+    'scheme' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'seal' => array (
+    'seal' => array(
         'toplevel' => 0,
         'oai_name' => '',
     ),
-    'section' => array (
+    'section' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'spine' => array (
+    'spine' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'stamp' => array (
+    'stamp' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'study' => array (
+    'study' => array(
         'toplevel' => 1,
         'oai_name' => '',
     ),
-    'table' => array (
+    'table' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'text' => array (
+    'text' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'title_page' => array (
+    'title_page' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'verse' => array (
+    'verse' => array(
         'toplevel' => 0,
         'oai_name' => ''
     ),
-    'volume' => array (
+    'volume' => array(
         'toplevel' => 1,
         'oai_name' => ''
     ),
-    'year' => array (
+    'year' => array(
         'toplevel' => 1,
         'oai_name' => ''
     )

plugins/basket/class.tx_dlf_basket.php

Spacing +62 added lines, -62 removed lines

@@ -63,7 +63,7 @@ 
             $query = $GLOBALS['TYPO3_DB']->SELECTquery(
                 '*',
                 'tx_dlf_basket',
-                'tx_dlf_basket.fe_user_id='.intval($insertArray['fe_user_id']).tx_dlf_helper::whereClause('tx_dlf_basket'),
+                'tx_dlf_basket.fe_user_id=' . intval($insertArray['fe_user_id']) . tx_dlf_helper::whereClause('tx_dlf_basket'),
                 '',
                 '',
                 '1'
@@ -80,7 +80,7 @@ 
             $query = $GLOBALS['TYPO3_DB']->SELECTquery(
                 '*',
                 'tx_dlf_basket',
-                'tx_dlf_basket.session_id='.$GLOBALS['TYPO3_DB']->fullQuoteStr($sessionId, 'tx_dlf_basket').tx_dlf_helper::whereClause('tx_dlf_basket'),
+                'tx_dlf_basket.session_id=' . $GLOBALS['TYPO3_DB']->fullQuoteStr($sessionId, 'tx_dlf_basket') . tx_dlf_helper::whereClause('tx_dlf_basket'),
                 '',
                 '',
                 '1'
@@ -202,7 +202,7 @@ 
         $resultMail = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
             '*',
             'tx_dlf_mail',
-            '1'.tx_dlf_helper::whereClause('tx_dlf_mail'),
+            '1' . tx_dlf_helper::whereClause('tx_dlf_mail'),
             '',
             'tx_dlf_mail.sorting',
             ''
@@ -212,11 +212,11 @@ 
 
             $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 = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($resultMail)) {
 
-                $mailForm .= '<option value="'.$row['uid'].'">'.$row['name'].' ('.$row['mail'].')</option>';
+                $mailForm .= '<option value="' . $row['uid'] . '">' . $row['name'] . ' (' . $row['mail'] . ')</option>';
 
             }
 
@@ -230,9 +230,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">
 		';
@@ -241,7 +241,7 @@ 
         $resultPrinter = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
             '*',
             'tx_dlf_printer',
-            '1'.tx_dlf_helper::whereClause('tx_dlf_printer'),
+            '1' . tx_dlf_helper::whereClause('tx_dlf_printer'),
             '',
             '',
             ''
@@ -253,11 +253,11 @@ 
 
             $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 = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($resultPrinter)) {
 
-                $printForm .= '<option value="'.$row['uid'].'">'.$row['label'].'</option>';
+                $printForm .= '<option value="' . $row['uid'] . '">' . $row['label'] . '</option>';
 
             }
 
@@ -290,7 +290,7 @@ 
 
             $label = $this->pi_getLL('goBasket', '', TRUE);
 
-            $basketConf = array (
+            $basketConf = array(
                 'parameter' => $this->conf['targetBasket'],
                 'title' => $label
             );
@@ -343,38 +343,38 @@ 
 
         $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="' . $id . '" name="tx_dlf[selected][' . $arrayKey . '][id]" type="checkbox">';
 
-        $controlMark .= '<input value="'.$startpage.'" name="tx_dlf[selected]['.$arrayKey.'][startpage]" type="hidden">';
+        $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="' . $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 . '][startX]" value="' . $startX . '">';
 
-            $controlMark .= '<input type="hidden" name="tx_dlf[selected]['.$arrayKey.'][startY]"  value="'.$startY.'">';
+            $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 . '][endX]"  value="' . $endX . '">';
 
-            $controlMark .= '<input type="hidden" name="tx_dlf[selected]['.$arrayKey.'][endY]"  value="'.$endY.'">';
+            $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 . '][rotation]"  value="' . $rotation . '">';
 
         }
 
@@ -408,7 +408,7 @@ 
 
         if ($page != NULL || $_piVars['addToBasket'] == 'list') {
 
-            $documentItem = array (
+            $documentItem = array(
                 'id' => intval($_piVars['id']),
                 'startpage' => intval($_piVars['startpage']),
                 'endpage' => !isset($_piVars['endpage']) || $_piVars['endpage'] === "" ? "" : intval($_piVars['endpage']),
@@ -428,7 +428,7 @@ 
 
             } else {
 
-                $items = array ();
+                $items = array();
 
             }
 
@@ -453,17 +453,17 @@ 
 
             }
 
-            $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'];
 
             }
 
@@ -498,7 +498,7 @@ 
 
                 }
 
-                $pdfGenerateUrl = $this->conf['pdfgenerate'].$pdfParams;
+                $pdfGenerateUrl = $this->conf['pdfgenerate'] . $pdfParams;
 
                 if ($this->conf['pregeneration']) {
 
@@ -507,7 +507,7 @@ 
 					<script>
 						$(document).ready(function(){
 							$.ajax({
-							  url: "'.$pdfGenerateUrl.'",
+							  url: "'.$pdfGenerateUrl . '",
 							}).done(function() {
 							});
 						});
@@ -517,15 +517,15 @@ 
 
             }
 
-            $update = array ('doc_ids' => json_encode($items));
+            $update = array('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 array ('basketData' => $basketData, 'jsOutput' => $output);
+        return array('basketData' => $basketData, 'jsOutput' => $output);
 
     }
 
@@ -549,17 +549,17 @@ 
 
             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'];
 
                 }
 
@@ -575,15 +575,15 @@ 
 
         if (empty($items)) {
 
-            $update = array ('doc_ids' => '');
+            $update = array('doc_ids' => '');
 
         } else {
 
-            $update = array ('doc_ids' => json_encode($items));
+            $update = array('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;
 
@@ -607,13 +607,13 @@ 
 
                 $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();
 
@@ -661,7 +661,7 @@ 
 
             $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);
 
@@ -677,22 +677,22 @@ 
             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']) {
 
@@ -704,7 +704,7 @@ 
 
             }
 
-            return array (
+            return array(
                 'downloadUrl' => $downloadUrl,
                 'downloadLink' => $downloadLink,
                 'pageNums'	=> $pageNums,
@@ -730,7 +730,7 @@ 
         $resultMail = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
             '*',
             'tx_dlf_mail',
-            'tx_dlf_mail.uid="'.intval($mailId).'"'.tx_dlf_helper::whereClause('tx_dlf_mail'),
+            'tx_dlf_mail.uid="' . intval($mailId) . '"' . tx_dlf_helper::whereClause('tx_dlf_mail'),
             '',
             '',
             '1'
@@ -738,7 +738,7 @@ 
 
         $mailData = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($resultMail);
 
-        $mailText = $this->pi_getLL('mailBody', '', TRUE)."\n";
+        $mailText = $this->pi_getLL('mailBody', '', TRUE) . "\n";
 
         $numberOfPages = 0;
 
@@ -753,7 +753,7 @@ 
 
                 $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'])));
 
@@ -774,7 +774,7 @@ 
         // Remove leading/tailing pdfparamseperator
         $pdfUrl = trim($pdfUrl, $this->conf['pdfparamseparator']);
 
-        $mailBody = $mailText.$pdfUrl;
+        $mailBody = $mailText . $pdfUrl;
 
         // Get hook objects.
         $hookObjects = tx_dlf_helper::getHookObjects($this->scriptRelPath);
@@ -804,7 +804,7 @@ 
             ->setFrom($from)
 
             // Set the To addresses with an associative array
-            ->setTo(array ($mailData['mail'] => $mailData['name']))
+            ->setTo(array($mailData['mail'] => $mailData['name']))
 
             ->setBody($mailBody, 'text/html')
 
@@ -812,7 +812,7 @@ 
         ;
 
         // protocol
-        $insertArray = array (
+        $insertArray = array(
             'pid' => $this->conf['pages'],
             'file_name' => $pdfUrl,
             'count_pages' => $numberOfPages,
@@ -826,7 +826,7 @@ 
 
             $insertArray['name'] = $GLOBALS["TSFE"]->fe_user->user['username'];
 
-            $insertArray['label'] = 'Mail: '.$mailData['mail'];
+            $insertArray['label'] = 'Mail: ' . $mailData['mail'];
 
         } else {
 
@@ -835,7 +835,7 @@ 
 
             $insertArray['name'] = 'n/a';
 
-            $insertArray['label'] = 'Mail: '.$mailData['mail'];
+            $insertArray['label'] = 'Mail: ' . $mailData['mail'];
 
         }
 
@@ -859,7 +859,7 @@ 
 
                 $docData = $this->getDocumentData($docValue['id'], $docValue);
 
-                $pdfUrl .= $docData['urlParams'].$this->conf['pdfparamseparator'];
+                $pdfUrl .= $docData['urlParams'] . $this->conf['pdfparamseparator'];
 
                 $numberOfPages += $docData['pageNums'];
 
@@ -874,7 +874,7 @@ 
         $resultPrinter = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
             '*',
             'tx_dlf_printer',
-            'tx_dlf_printer.uid="'.intval($printerId).'"'.tx_dlf_helper::whereClause('tx_dlf_basket'),
+            'tx_dlf_printer.uid="' . intval($printerId) . '"' . tx_dlf_helper::whereClause('tx_dlf_basket'),
             '',
             '',
             '1'
@@ -897,7 +897,7 @@ 
 
                     $docData = $this->getDocumentData($explodeId[0], $docValue);
 
-                    $pdfUrl .= $docData['urlParams'].$this->conf['pdfparamseparator'];
+                    $pdfUrl .= $docData['urlParams'] . $this->conf['pdfparamseparator'];
 
                     $numberOfPages += $docData['pageNums'];
 
@@ -910,7 +910,7 @@ 
         }
 
         // protocol
-        $insertArray = array (
+        $insertArray = array(
             'pid' => $this->conf['pages'],
             'file_name' => $pdfUrl,
             'count_pages' => $numberOfPages,
@@ -924,7 +924,7 @@ 
 
             $insertArray['name'] = $GLOBALS["TSFE"]->fe_user->user['username'];
 
-            $insertArray['label'] = 'Print: '.$printerData['label'];
+            $insertArray['label'] = 'Print: ' . $printerData['label'];
 
         } else {
 
@@ -933,14 +933,14 @@ 
 
             $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();
 

plugins/oai/class.tx_dlf_oai.php

Spacing +47 added lines, -47 removed lines

@@ -43,21 +43,21 @@ 
      * @var	array
      * @access protected
      */
-    protected $formats = array (
-        'oai_dc' => array (
+    protected $formats = array(
+        'oai_dc' => array(
             'schema' => 'http://www.openarchives.org/OAI/2.0/oai_dc.xsd',
             'namespace' => 'http://www.openarchives.org/OAI/2.0/oai_dc/',
-            'requiredFields' => array ('record_id'),
+            'requiredFields' => array('record_id'),
         ),
-        'epicur' => array (
+        'epicur' => array(
             'schema' => 'http://www.persistent-identifier.de/xepicur/version1.0/xepicur.xsd',
             'namespace' => 'urn:nbn:de:1111-2004033116',
-            'requiredFields' => array ('purl', 'urn'),
+            'requiredFields' => array('purl', 'urn'),
         ),
-        'mets' => array (
+        'mets' => array(
             'schema' => 'http://www.loc.gov/standards/mets/version17/mets.v1-7.xsd',
             'namespace' => 'http://www.loc.gov/METS/',
-            'requiredFields' => array ('location'),
+            'requiredFields' => array('location'),
         )
     );
 
@@ -73,7 +73,7 @@ 
         // Delete expired resumption tokens.
         $result = $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) {
@@ -109,7 +109,7 @@ 
      */
     protected function getUrlParams() {
 
-        $allowedParams = array (
+        $allowedParams = array(
             'verb',
             'identifier',
             'metadataPrefix',
@@ -120,7 +120,7 @@ 
         );
 
         // Clear plugin variables.
-        $this->piVars = array ();
+        $this->piVars = array();
 
         // Set only allowed parameters.
         foreach ($allowedParams as $param) {
@@ -146,7 +146,7 @@ 
 
         $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')));
 
@@ -181,7 +181,7 @@ 
             $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
                 'tx_dlf_documents.record_id',
                 'tx_dlf_documents',
-                'tx_dlf_documents.uid='.intval($metadata['partof']).tx_dlf_helper::whereClause('tx_dlf_documents'),
+                'tx_dlf_documents.uid=' . intval($metadata['partof']) . tx_dlf_helper::whereClause('tx_dlf_documents'),
                 '',
                 '',
                 '1'
@@ -256,7 +256,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']) {
@@ -321,10 +321,10 @@ 
                 // Import node into DOMDocument.
                 $mets = $this->oai->importNode($root->item(0), TRUE);
             } else {
-                    $this->devLog('[tx_dlf_oai->getMetsData([data])] No METS part found in document with location "'.$metadata['location'].'"', SYSLOG_SEVERITY_ERROR, $metadata);
+                    $this->devLog('[tx_dlf_oai->getMetsData([data])] No METS part found in document with location "' . $metadata['location'] . '"', SYSLOG_SEVERITY_ERROR, $metadata);
             }
         } else {
-            $this->devLog('[tx_dlf_oai->getMetsData([data])] Could not load XML file from "'.$metadata['location'].'"', SYSLOG_SEVERITY_ERROR, $metadata);
+            $this->devLog('[tx_dlf_oai->getMetsData([data])] Could not load XML file from "' . $metadata['location'] . '"', SYSLOG_SEVERITY_ERROR, $metadata);
         }
 
         if ($mets === NULL) {
@@ -369,7 +369,7 @@ 
                 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;
                 }
             }
 
@@ -377,10 +377,10 @@ 
 
         } 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).'plugins/oai/transform.xsl');
+            $stylesheet = \TYPO3\CMS\Core\Utility\GeneralUtility::locationHeaderUrl(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'plugins/oai/transform.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');
@@ -422,7 +422,7 @@ 
         }
 
         // Add request.
-        $linkConf = array (
+        $linkConf = array(
             'parameter' => $GLOBALS['TSFE']->id,
             'forceAbsoluteUrl' => 1
         );
@@ -448,10 +448,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;
 
@@ -473,7 +473,7 @@ 
         $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
             'tx_dlf_tokens.options AS options',
             'tx_dlf_tokens',
-            'tx_dlf_tokens.ident="oai" AND tx_dlf_tokens.token='.$GLOBALS['TYPO3_DB']->fullQuoteStr($this->piVars['resumptionToken'], 'tx_dlf_tokens'),
+            'tx_dlf_tokens.ident="oai" AND tx_dlf_tokens.token=' . $GLOBALS['TYPO3_DB']->fullQuoteStr($this->piVars['resumptionToken'], 'tx_dlf_tokens'),
             '',
             '',
             '1'
@@ -520,7 +520,7 @@ 
             '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').$where.tx_dlf_helper::whereClause('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') . $where . tx_dlf_helper::whereClause('tx_dlf_collections'),
             '',
             '',
             '1'
@@ -608,7 +608,7 @@ 
         $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
             'tx_dlf_libraries.oai_label AS oai_label,tx_dlf_libraries.contact AS contact',
             'tx_dlf_libraries',
-            'tx_dlf_libraries.pid='.intval($this->conf['pages']).' AND tx_dlf_libraries.uid='.intval($this->conf['library']).tx_dlf_helper::whereClause('tx_dlf_libraries'),
+            'tx_dlf_libraries.pid=' . intval($this->conf['pages']) . ' AND tx_dlf_libraries.uid=' . intval($this->conf['library']) . tx_dlf_helper::whereClause('tx_dlf_libraries'),
             '',
             '',
             ''
@@ -631,7 +631,7 @@ 
         $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
             'tx_dlf_documents.tstamp AS tstamp',
             'tx_dlf_documents',
-            'tx_dlf_documents.pid='.intval($this->conf['pages']),
+            'tx_dlf_documents.pid=' . intval($this->conf['pages']),
             '',
             'tx_dlf_documents.tstamp ASC',
             '1'
@@ -641,10 +641,10 @@ 
             list ($timestamp) = $GLOBALS['TYPO3_DB']->sql_fetch_row($result);
             $earliestDatestamp = gmdate('Y-m-d\TH:i:s\Z', $timestamp);
         } else {
-            $this->devLog('[tx_dlf_oai->verbIdentify()] No records found with PID "'.$this->conf['pages'].'"', SYSLOG_SEVERITY_NOTICE);
+            $this->devLog('[tx_dlf_oai->verbIdentify()] No records found with PID "' . $this->conf['pages'] . '"', SYSLOG_SEVERITY_NOTICE);
         }
 
-        $linkConf = array (
+        $linkConf = array(
             'parameter' => $GLOBALS['TSFE']->id,
             'forceAbsoluteUrl' => 1
         );
@@ -701,7 +701,7 @@ 
 
         $resultSet->reset();
         $resultSet->add($documentSet);
-        $resultSet->metadata = array (
+        $resultSet->metadata = array(
             'completeListSize' => count($documentSet),
             'metadataPrefix' => $this->piVars['metadataPrefix'],
         );
@@ -719,7 +719,7 @@ 
      */
     protected function verbListMetadataFormats() {
 
-        $resArray = array ();
+        $resArray = array();
 
         // Check for invalid arguments.
         if (count($this->piVars) > 1) {
@@ -731,7 +731,7 @@ 
             $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
                 'tx_dlf_documents.*',
                 'tx_dlf_documents',
-                'tx_dlf_documents.pid='.intval($this->conf['pages']).' AND tx_dlf_documents.record_id='.$GLOBALS['TYPO3_DB']->fullQuoteStr($this->piVars['identifier'], 'tx_dlf_documents'),
+                'tx_dlf_documents.pid=' . intval($this->conf['pages']) . ' AND tx_dlf_documents.record_id=' . $GLOBALS['TYPO3_DB']->fullQuoteStr($this->piVars['identifier'], 'tx_dlf_documents'),
                 '',
                 '',
                 '1'
@@ -810,7 +810,7 @@ 
 
         $resultSet->reset();
         $resultSet->add($documentSet);
-        $resultSet->metadata = array (
+        $resultSet->metadata = array(
             'completeListSize' => count($documentSet),
             'metadataPrefix' => $this->piVars['metadataPrefix'],
         );
@@ -845,7 +845,7 @@ 
         $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
             'tx_dlf_collections.oai_name AS oai_name,tx_dlf_collections.label AS label',
             'tx_dlf_collections',
-            'tx_dlf_collections.sys_language_uid IN (-1,0) AND NOT tx_dlf_collections.oai_name=\'\' AND tx_dlf_collections.pid='.intval($this->conf['pages']).$where.tx_dlf_helper::whereClause('tx_dlf_collections'),
+            'tx_dlf_collections.sys_language_uid IN (-1,0) AND NOT tx_dlf_collections.oai_name=\'\' AND tx_dlf_collections.pid=' . intval($this->conf['pages']) . $where . tx_dlf_helper::whereClause('tx_dlf_collections'),
             'tx_dlf_collections.oai_name',
             'tx_dlf_collections.oai_name',
             ''
@@ -891,8 +891,8 @@ 
             $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
                 'tx_dlf_collections.index_name AS index_name, tx_dlf_collections.uid AS uid, tx_dlf_collections.index_search as index_query ',
                 'tx_dlf_collections',
-                'tx_dlf_collections.pid='.intval($this->conf['pages']).' AND tx_dlf_collections.oai_name='.$GLOBALS['TYPO3_DB']->fullQuoteStr($this->piVars['set'],
-                    'tx_dlf_collections').$where.tx_dlf_helper::whereClause('tx_dlf_collections'),
+                'tx_dlf_collections.pid=' . intval($this->conf['pages']) . ' AND tx_dlf_collections.oai_name=' . $GLOBALS['TYPO3_DB']->fullQuoteStr($this->piVars['set'],
+                    'tx_dlf_collections') . $where . tx_dlf_helper::whereClause('tx_dlf_collections'),
                 '',
                 '',
                 '1'
@@ -905,9 +905,9 @@ 
             $resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result);
 
             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 {
@@ -918,7 +918,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
@@ -935,7 +935,7 @@ 
                 $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');
@@ -953,7 +953,7 @@ 
                 $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');
@@ -971,9 +971,9 @@ 
             }
         }
 
-        $solr_query .= ' AND timestamp:['.$from.' TO '.$until.']';
+        $solr_query .= ' AND timestamp:[' . $from . ' TO ' . $until . ']';
 
-        $documentSet = array ();
+        $documentSet = array();
 
         $solr = tx_dlf_solr::getInstance($this->conf['solrcore']);
 
@@ -982,9 +982,9 @@ 
         }
 
         // We only care about the UID in the results and want them sorted
-        $parameters = array (
+        $parameters = array(
             "fields" => "uid",
-            "sort" => array (
+            "sort" => array(
                 "uid" => "asc"
             )
         );
@@ -1016,7 +1016,7 @@ 
             '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').tx_dlf_helper::whereClause('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') . tx_dlf_helper::whereClause('tx_dlf_collections'),
             'tx_dlf_documents.uid',
             'tx_dlf_documents.tstamp',
             $this->conf['limit']
@@ -1109,7 +1109,7 @@ 
 
             $GLOBALS['TYPO3_DB']->exec_INSERTquery(
                 'tx_dlf_tokens',
-                array (
+                array(
                     'tstamp' => $GLOBALS['EXEC_TIME'],
                     'token' => $token,
                     'options' => serialize($documentListSet),
@@ -1122,7 +1122,7 @@ 
                 $resumptionToken = $this->oai->createElementNS('http://www.openarchives.org/OAI/2.0/', 'resumptionToken', htmlspecialchars($token, ENT_NOQUOTES, 'UTF-8'));
 
             } else {
-                $this->devLog('[tx_dlf_oai->verb'.$this->piVars['verb'].'()] Could not create resumption token', SYSLOG_SEVERITY_ERROR);
+                $this->devLog('[tx_dlf_oai->verb' . $this->piVars['verb'] . '()] Could not create resumption token', SYSLOG_SEVERITY_ERROR);
 
             }
         } else {

plugins/search/class.tx_dlf_search_suggest.php

Spacing +2 added lines, -2 removed lines

@@ -32,7 +32,7 @@ 
      *
      * @return	void
      */
-    public function main($content = '', $conf = array ()) {
+    public function main($content = '', $conf = array()) {
 
         if (\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('encrypted') != '' && \TYPO3\CMS\Core\Utility\GeneralUtility::_GP('hashed') != '') {
 
@@ -42,7 +42,7 @@ 
 
         if (!empty($core)) {
 
-            $url = trim(tx_dlf_solr::getSolrUrl($core), '/').'/suggest/?wt=xml&q='.tx_dlf_solr::escapeQuery(\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('q'));
+            $url = trim(tx_dlf_solr::getSolrUrl($core), '/') . '/suggest/?wt=xml&q=' . tx_dlf_solr::escapeQuery(\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('q'));
 
             if ($stream = fopen($url, 'r')) {
 

plugins/toolbox/tools/fulltext/class.tx_dlf_toolsFulltext.php

Spacing +3 added lines, -3 removed lines

@@ -88,10 +88,10 @@
 
         if (!empty($fullTextFile)) {
             $markerArray['###FULLTEXT_SELECT###'] = '<a class="select switchoff" id="tx-dlf-tools-fulltext" title="" data-dic="fulltext-on:'
-                    .$this->pi_getLL('fulltext-on', '', TRUE).';fulltext-off:'
-                    .$this->pi_getLL('fulltext-off', '', TRUE).'">&nbsp;</a>';
+                    .$this->pi_getLL('fulltext-on', '', TRUE) . ';fulltext-off:'
+                    .$this->pi_getLL('fulltext-off', '', TRUE) . '">&nbsp;</a>';
         } else {
-            $markerArray['###FULLTEXT_SELECT###'] = '<span class="no-fulltext">'.$this->pi_getLL('fulltext-not-available', '', TRUE).'</span>';
+            $markerArray['###FULLTEXT_SELECT###'] = '<span class="no-fulltext">' . $this->pi_getLL('fulltext-not-available', '', TRUE) . '</span>';
         }
 
         $content .= $this->cObj->substituteMarkerArray($this->template, $markerArray);

plugins/toolbox/tools/pdf/class.tx_dlf_toolsPdf.php

Spacing +9 added lines, -9 removed lines

@@ -126,9 +126,9 @@ 
         }
 
         if (TYPO3_DLOG && empty($page1Link) && empty($page2Link)) {
-            \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_toolsPdf->getPageLink()] '.
-                        'File not found in fileGrp "'.
-                        $this->conf['fileGrpDownload'].'"',
+            \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_toolsPdf->getPageLink()] ' .
+                        'File not found in fileGrp "' .
+                        $this->conf['fileGrpDownload'] . '"',
                         $this->extKey,
                         SYSLOG_SEVERITY_WARNING);
         }
@@ -137,18 +137,18 @@ 
         if (!empty($page1Link)) {
             if ($this->piVars['double']) {
                 $page1Link = $this->cObj->typoLink($this->pi_getLL('leftPage', ''),
-                    array ('parameter' => $page1Link, 'title' => $this->pi_getLL('leftPage', '')));
+                    array('parameter' => $page1Link, 'title' => $this->pi_getLL('leftPage', '')));
             } else {
                 $page1Link = $this->cObj->typoLink($this->pi_getLL('singlePage', ''),
-                    array ('parameter' => $page1Link, 'title' => $this->pi_getLL('singlePage', '')));
+                    array('parameter' => $page1Link, 'title' => $this->pi_getLL('singlePage', '')));
             }
         }
         if (!empty($page2Link)) {
             $page2Link = $this->cObj->typoLink($this->pi_getLL('rightPage', ''),
-                array ('parameter' => $page2Link, 'title' => $this->pi_getLL('rightPage', '')));
+                array('parameter' => $page2Link, 'title' => $this->pi_getLL('rightPage', '')));
         }
 
-        return $page1Link.$page2Link;
+        return $page1Link . $page2Link;
     }
 
     /**
@@ -182,13 +182,13 @@ 
         // Wrap URLs with HTML.
         if (!empty($workLink)) {
 
-            $workLink = $this->cObj->typoLink($this->pi_getLL('work', ''), array ('parameter' => $workLink, 'title' => $this->pi_getLL('work', '')));
+            $workLink = $this->cObj->typoLink($this->pi_getLL('work', ''), array('parameter' => $workLink, 'title' => $this->pi_getLL('work', '')));
 
         } else {
 
             if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_toolsPdf->getWorkLink()] File not found in fileGrp "'.$this->conf['fileGrpDownload'].'"', $this->extKey, SYSLOG_SEVERITY_WARNING);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_toolsPdf->getWorkLink()] File not found in fileGrp "' . $this->conf['fileGrpDownload'] . '"', $this->extKey, SYSLOG_SEVERITY_WARNING);
 
             }
 

plugins/toolbox/tools/searchindocument/class.tx_dlf_toolsSearchindocument.php

Spacing +1 added lines, -1 removed lines

@@ -110,7 +110,7 @@
      */
     protected function addSearchInDocumentJS() {
         $pageRenderer = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Core\Page\PageRenderer::class);
-        $pageRenderer->addJsFooterFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'plugins/toolbox/tools/searchindocument/tx_dlf_search_in_document.js');
+        $pageRenderer->addJsFooterFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'plugins/toolbox/tools/searchindocument/tx_dlf_search_in_document.js');
     }
 
     /**

plugins/toolbox/tools/searchindocument/class.tx_dlf_search_in_document_eid.php

Spacing +3 added lines, -3 removed lines

@@ -31,7 +31,7 @@ 
      *
      * @return	string JSON response of search suggestions
      */
-    public function main($content = '', $conf = array ()) {
+    public function main($content = '', $conf = array()) {
 
         if (\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('encrypted') != '' && \TYPO3\CMS\Core\Utility\GeneralUtility::_GP('hashed') != '') {
 
@@ -41,9 +41,9 @@ 
 
         if (!empty($core)) {
 
-            $url = trim(tx_dlf_solr::getSolrUrl($core), '/').'/select?wt=json&q='.urlencode('fulltext:('.tx_dlf_solr::escapeQuery(\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('q'))).')%20AND%20uid:'.\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('uid')
+            $url = trim(tx_dlf_solr::getSolrUrl($core), '/') . '/select?wt=json&q=' . urlencode('fulltext:(' . tx_dlf_solr::escapeQuery(\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('q'))) . ')%20AND%20uid:' . \TYPO3\CMS\Core\Utility\GeneralUtility::_GP('uid')
               .'&hl=on&hl.fl=fulltext&fl=uid,id,page&hl.method=fastVector'
-              .'&start='.\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('start').'&rows=20';
+              .'&start=' . \TYPO3\CMS\Core\Utility\GeneralUtility::_GP('start') . '&rows=20';
 
             $output = \TYPO3\CMS\Core\Utility\GeneralUtility::getUrl($url);
         }