kitodo / kitodo-publication

Classes/Plugins/DownloadTool/DownloadTool.php

Spacing +5 added lines, -5 removed lines

@@ -72,7 +72,7 @@ 
         $content = '';
         if (is_array($attachments)) {
             foreach ($attachments as $id => $file) {
-                $conf = array(
+                $conf = array (
                     'useCacheHash'     => 0,
                     'parameter'        => $this->conf['apiPid'] . ' - piwik_download',
                     'additionalParams' => '&tx_dpf[qid]=' . $this->doc->recordId . '&tx_dpf[action]=attachment' . '&tx_dpf[attachment]=' . $file['ID'],
@@ -81,7 +81,7 @@ 
                 $title = $file['LABEL'] ? $file['LABEL'] : $file['ID'];
                 $markerArray['###FILE###'] = $this->cObj->typoLink($title, $conf);
 
-                if(!empty($vgwort)) {
+                if (!empty($vgwort)) {
                     $markerArray['###VGWORT###'] = "<div class='div_vgwpixel' data-url='" . $vgwort . "'></div>";
                 } else {
                     $markerArray['###VGWORT###'] = "";
@@ -103,10 +103,10 @@ 
         $xPath = 'mets:fileSec/mets:fileGrp[@USE="' . $this->conf['fileGrpDownload'] . '"]/mets:file';
         $files = $this->doc->mets->xpath($xPath);
         if (!is_array($files)) {
-            return array();
+            return array ();
         }
         foreach ($files as $key => $file) {
-            $singleFile = array();
+            $singleFile = array ();
             foreach ($file->attributes('mext', 1) as $attribute => $value) {
                 $singleFile[$attribute] = $value;
             }
@@ -128,7 +128,7 @@ 
         $xPath = '//slub:info/slub:vgwortOpenKey';
         $vgwortOpenKey = $this->doc->mets->xpath($xPath)[0];
 
-        if (!empty($vgwortOpenKey) or $vgwortOpenKey != FALSE ) {
+        if (!empty($vgwortOpenKey) or $vgwortOpenKey != FALSE) {
             if (GeneralUtility::getIndpEnv('TYPO3_SSL')) {
                 $vgwortserver = 'https://ssl-vg03.met.vgwort.de/na/';
             } else {

Braces +4 added lines, -8 removed lines

@@ -24,8 +24,7 @@ 
  * @subpackage    tx_dpf
  * @access    public
  */
-class DownloadTool extends \Kitodo\Dlf\Common\AbstractPlugin
-{
+class DownloadTool extends \Kitodo\Dlf\Common\AbstractPlugin {
     public $scriptRelPath = 'Classes/Plugins/DownloadTool.php';
 
     /**
@@ -38,8 +37,7 @@ 
      *
      * @return    string        The content that is displayed on the website
      */
-    public function main($content, $conf)
-    {
+    public function main($content, $conf) {
         $this->init($conf);
 
         // get the tx_dpf.settings too
@@ -97,8 +95,7 @@ 
 
      * @return array of attachments
      */
-    protected function getAttachments()
-    {
+    protected function getAttachments() {
         // Get pdf documents
         $xPath = 'mets:fileSec/mets:fileGrp[@USE="' . $this->conf['fileGrpDownload'] . '"]/mets:file';
         $files = $this->doc->mets->xpath($xPath);
@@ -121,8 +118,7 @@ 
         return $attachments;
     }
 
-    protected function getVGWortUrl()
-    {
+    protected function getVGWortUrl() {
         // Get VG-Wort-OpenKey for document
         $this->doc->mets->registerXPathNamespace("slub", 'http://slub-dresden.de/');
         $xPath = '//slub:info/slub:vgwortOpenKey';

Upper-Lower-Casing +4 added lines, -4 removed lines

@@ -46,13 +46,13 @@ 
         // Flexform wins over TS
         $dpfTSconfig = $GLOBALS['TSFE']->tmpl->setup['plugin.']['tx_dpf.'];
         if (is_array($dpfTSconfig['settings.'])) {
-            \TYPO3\CMS\Core\Utility\ArrayUtility::mergeRecursiveWithOverrule($dpfTSconfig['settings.'], $this->conf, true, false);
+            \TYPO3\CMS\Core\Utility\ArrayUtility::mergeRecursiveWithOverrule($dpfTSconfig['settings.'], $this->conf, TRUE, FALSE);
             $this->conf = $dpfTSconfig['settings.'];
         }
 
         // Load current document.
         $this->loadDocument();
-        if ($this->doc === null || empty($this->conf['fileGrpDownload'])) {
+        if ($this->doc === NULL || empty($this->conf['fileGrpDownload'])) {
             // Quit without doing anything if required variables are not set.
             return $content;
         }
@@ -76,7 +76,7 @@ 
                     'useCacheHash'     => 0,
                     'parameter'        => $this->conf['apiPid'] . ' - piwik_download',
                     'additionalParams' => '&tx_dpf[qid]=' . $this->doc->recordId . '&tx_dpf[action]=attachment' . '&tx_dpf[attachment]=' . $file['ID'],
-                    'forceAbsoluteUrl' => true,
+                    'forceAbsoluteUrl' => TRUE,
                 );
                 $title = $file['LABEL'] ? $file['LABEL'] : $file['ID'];
                 $markerArray['###FILE###'] = $this->cObj->typoLink($title, $conf);
@@ -89,7 +89,7 @@ 
                 $content .= $this->cObj->substituteMarkerArray($subpartArray['downloads'], $markerArray);
             }
         }
-        return $this->cObj->substituteSubpart($this->template, '###DOWNLOADS###', $content, true);
+        return $this->cObj->substituteSubpart($this->template, '###DOWNLOADS###', $content, TRUE);
     }
 
     /**

Classes/Plugins/RelatedListTool/RelatedListTool.php

Spacing +9 added lines, -9 removed lines

@@ -71,7 +71,7 @@ 
             foreach ($relatedItems as $key => $value) {
                 // set link
                 if ($value['type'] == 'local') {
-                    $confApi = array(
+                    $confApi = array (
                         'useCacheHash'     => 0,
                         'parameter'        => $this->conf['apiPid'],
                         'additionalParams' => '&tx_dpf[qid]=' . $value['docId'] . '&tx_dpf[action]=mets',
@@ -79,7 +79,7 @@ 
                     );
 
                     $metsApiUrl = urlencode($this->cObj->typoLink_URL($confApi));
-                    $conf = array(
+                    $conf = array (
                         'useCacheHash'     => 1,
                         'parameter'        => $GLOBALS['TSFE']->page['uid'],
                         'additionalParams' => '&tx_dlf[id]=' . $metsApiUrl,
@@ -87,13 +87,13 @@ 
                     );
                 } elseif ($value['type'] == 'urn') {
                     // use urn link
-                    $conf = array(
+                    $conf = array (
                         'useCacheHash'     => 0,
                         'parameter'        => 'https://nbn-resolving.de/' . $value['docId'],
                         'forceAbsoluteUrl' => true,
                     );
                 } else {
-                    $conf = array(
+                    $conf = array (
                         'useCacheHash'     => 0,
                         'forceAbsoluteUrl' => true,
                     );
@@ -109,8 +109,8 @@ 
 
     private function compareByOrderVolumeTitle($a, $b)
     {
-        $s1 = join(' ', array($a['order'], $a['volume'], $a['title']));
-        $s2 = join(' ', array($b['order'], $b['volume'], $b['title']));
+        $s1 = join(' ', array ($a['order'], $a['volume'], $a['title']));
+        $s2 = join(' ', array ($b['order'], $b['volume'], $b['title']));
         return strnatcmp($s1, $s2);
     }
 
@@ -118,7 +118,7 @@ 
     {
         $xPath = '//mods:relatedItem[@type="constituent"]';
         $items = $this->doc->mets->xpath($xPath);
-        $relatedItems = array();
+        $relatedItems = array ();
 
         foreach ($items as $index => $relatedItemXmlElement) {
             $relatedItemXmlElement->registerXPathNamespace('mods', 'http://www.loc.gov/mods/v3');
@@ -130,7 +130,7 @@ 
             $order = (string) $relatedItemXmlElement->xpath('mods:extension/slub:info/slub:sortingKey')[0];
             $volume = (string) $relatedItemXmlElement->xpath('mods:part[@type="volume" or @type="issue"]/mods:detail/mods:number')[0];
 
-            $element = array();
+            $element = array ();
             $element['type'] = $type;
             $element['title'] = $title;
             $element['docId'] = $docId;
@@ -139,7 +139,7 @@ 
 
             $relatedItems[$index] = $element;
         }
-        usort($relatedItems, array('EWW\Dpf\Plugins\RelatedListTool\RelatedListTool', 'compareByOrderVolumeTitle'));
+        usort($relatedItems, array ('EWW\Dpf\Plugins\RelatedListTool\RelatedListTool', 'compareByOrderVolumeTitle'));
         return $relatedItems;
     }
 

Braces +4 added lines, -8 removed lines

@@ -24,8 +24,7 @@ 
  * @subpackage    tx_dpf
  * @access    public
  */
-class RelatedListTool extends \Kitodo\Dlf\Common\AbstractPlugin
-{
+class RelatedListTool extends \Kitodo\Dlf\Common\AbstractPlugin {
     public $scriptRelPath = 'Classes/Plugins/RelatedListTool.php';
 
     /**
@@ -38,8 +37,7 @@ 
      *
      * @return    string        The content that is displayed on the website
      */
-    public function main($content, $conf)
-    {
+    public function main($content, $conf) {
         $this->init($conf);
 
         // get the tx_dpf.settings too
@@ -107,15 +105,13 @@ 
         return $this->cObj->substituteSubpart($this->template, '###ITEMS###', $content, true);
     }
 
-    private function compareByOrderVolumeTitle($a, $b)
-    {
+    private function compareByOrderVolumeTitle($a, $b) {
         $s1 = join(' ', array($a['order'], $a['volume'], $a['title']));
         $s2 = join(' ', array($b['order'], $b['volume'], $b['title']));
         return strnatcmp($s1, $s2);
     }
 
-    public function getRelatedItems()
-    {
+    public function getRelatedItems() {
         $xPath = '//mods:relatedItem[@type="constituent"]';
         $items = $this->doc->mets->xpath($xPath);
         $relatedItems = array();

Upper-Lower-Casing +9 added lines, -9 removed lines

@@ -46,13 +46,13 @@ 
         // Flexform wins over TS
         $dpfTSconfig = $GLOBALS['TSFE']->tmpl->setup['plugin.']['tx_dpf.'];
         if (is_array($dpfTSconfig['settings.'])) {
-            \TYPO3\CMS\Core\Utility\ArrayUtility::mergeRecursiveWithOverrule($dpfTSconfig['settings.'], $this->conf, true, false);
+            \TYPO3\CMS\Core\Utility\ArrayUtility::mergeRecursiveWithOverrule($dpfTSconfig['settings.'], $this->conf, TRUE, FALSE);
             $this->conf = $dpfTSconfig['settings.'];
         }
 
         // Load current document.
         $this->loadDocument();
-        if ($this->doc === null) {
+        if ($this->doc === NULL) {
             // Quit without doing anything if required variables are not set.
             return $content;
         }
@@ -75,7 +75,7 @@ 
                         'useCacheHash'     => 0,
                         'parameter'        => $this->conf['apiPid'],
                         'additionalParams' => '&tx_dpf[qid]=' . $value['docId'] . '&tx_dpf[action]=mets',
-                        'forceAbsoluteUrl' => true,
+                        'forceAbsoluteUrl' => TRUE,
                     );
 
                     $metsApiUrl = urlencode($this->cObj->typoLink_URL($confApi));
@@ -83,19 +83,19 @@ 
                         'useCacheHash'     => 1,
                         'parameter'        => $GLOBALS['TSFE']->page['uid'],
                         'additionalParams' => '&tx_dlf[id]=' . $metsApiUrl,
-                        'forceAbsoluteUrl' => true,
+                        'forceAbsoluteUrl' => TRUE,
                     );
                 } elseif ($value['type'] == 'urn') {
                     // use urn link
                     $conf = array(
                         'useCacheHash'     => 0,
                         'parameter'        => 'https://nbn-resolving.de/' . $value['docId'],
-                        'forceAbsoluteUrl' => true,
+                        'forceAbsoluteUrl' => TRUE,
                     );
                 } else {
                     $conf = array(
                         'useCacheHash'     => 0,
-                        'forceAbsoluteUrl' => true,
+                        'forceAbsoluteUrl' => TRUE,
                     );
                 }
                 $title = $value['title'] ? $value['title'] : $value['docId'];
@@ -104,7 +104,7 @@ 
                 $content .= $this->cObj->substituteMarkerArray($subpartArray['items'], $markerArray);
             }
         }
-        return $this->cObj->substituteSubpart($this->template, '###ITEMS###', $content, true);
+        return $this->cObj->substituteSubpart($this->template, '###ITEMS###', $content, TRUE);
     }
 
     private function compareByOrderVolumeTitle($a, $b)
@@ -134,8 +134,8 @@ 
             $element['type'] = $type;
             $element['title'] = $title;
             $element['docId'] = $docId;
-            $element['order'] = (!empty($order)) ? $order : null;
-            $element['volume'] = (!empty($volume)) ? $volume : null;
+            $element['order'] = (!empty($order)) ? $order : NULL;
+            $element['volume'] = (!empty($volume)) ? $volume : NULL;
 
             $relatedItems[$index] = $element;
         }

Classes/Plugins/MetaTags/MetaTags.php

Spacing +6 added lines, -6 removed lines

@@ -71,7 +71,7 @@ 
             }
         }
 
-        $metadata = array();
+        $metadata = array ();
         $metadata = $this->doc->getTitleData($this->conf['pages']);
 
         // Collect files from download file group
@@ -126,7 +126,7 @@ 
                 case 'title':
                     if (is_array($values)) {
                         $outArray['citation_title'][] = $values[0];
-                        $GLOBALS['TSFE']->page['title'] =  $values[0];
+                        $GLOBALS['TSFE']->page['title'] = $values[0];
                     }
                     break;
 
@@ -148,8 +148,8 @@ 
                     break;
 
                 case 'attachments':
-                    foreach($values as $attachment) {
-                        $conf = array(
+                    foreach ($values as $attachment) {
+                        $conf = array (
                             'useCacheHash'     => 0,
                             'parameter'        => $this->conf['apiPid'],
                             'additionalParams' => '&tx_dpf[qid]=' . $this->doc->recordId . '&tx_dpf[action]=attachment&tx_dpf[attachment]=' . $attachment['ID'],
@@ -209,14 +209,14 @@ 
      */
     protected function getAttachments()
     {
-        $attachments = array();
+        $attachments = array ();
 
         $xPath = 'mets:fileSec/mets:fileGrp[@USE="' . $this->conf['fileGrpDownload'] . '"]/mets:file';
         $files = $this->doc->mets->xpath($xPath);
 
         if (is_array($files)) {
             foreach ($files as $key => $file) {
-                $singleFile = array();
+                $singleFile = array ();
                 foreach ($file->attributes('mext', 1) as $attribute => $value) {
                     $singleFile[$attribute] = $value;
                 }

Braces +5 added lines, -10 removed lines

@@ -25,8 +25,7 @@ 
  * @subpackage    tx_dpf
  * @access    public
  */
-class MetaTags extends \Kitodo\Dlf\Common\AbstractPlugin
-{
+class MetaTags extends \Kitodo\Dlf\Common\AbstractPlugin {
     public $scriptRelPath = 'Classes/Plugins/MetaTags.php';
 
     /**
@@ -45,8 +44,7 @@ 
      *
      * @return    string        The content that is displayed on the website
      */
-    public function main($content, $conf)
-    {
+    public function main($content, $conf) {
 
         $this->init($conf);
 
@@ -107,8 +105,7 @@ 
      *
      * @return    string        The metadata array ready for output
      */
-    protected function printMetaTags(array $metadata)
-    {
+    protected function printMetaTags(array $metadata) {
 
         $output = '';
         // Load all the metadata values into the content object's data array.
@@ -196,8 +193,7 @@ 
      *
      * @return Formatted date
      */
-    protected function safelyFormatDate($format, $date)
-    {
+    protected function safelyFormatDate($format, $date) {
         return (strlen($date) == 4) ? $date : date($format, strtotime($date));
     }
 
@@ -207,8 +203,7 @@ 
 
      * @return array of attachments
      */
-    protected function getAttachments()
-    {
+    protected function getAttachments() {
         $attachments = array();
 
         $xPath = 'mets:fileSec/mets:fileGrp[@USE="' . $this->conf['fileGrpDownload'] . '"]/mets:file';

Upper-Lower-Casing +4 added lines, -4 removed lines

@@ -54,14 +54,14 @@ 
         // Flexform wins over TS
         $dpfTSconfig = $GLOBALS['TSFE']->tmpl->setup['plugin.']['tx_dpf.'];
         if (is_array($dpfTSconfig['settings.'])) {
-            \TYPO3\CMS\Core\Utility\ArrayUtility::mergeRecursiveWithOverrule($dpfTSconfig['settings.'], $this->conf, true, false);
+            \TYPO3\CMS\Core\Utility\ArrayUtility::mergeRecursiveWithOverrule($dpfTSconfig['settings.'], $this->conf, TRUE, FALSE);
             $this->conf = $dpfTSconfig['settings.'];
         }
         // Turn cache on.
-        $this->setCache(true);
+        $this->setCache(TRUE);
         // Load current document.
         $this->loadDocument();
-        if ($this->doc === null) {
+        if ($this->doc === NULL) {
             // Quit without doing anything if required variables are not set.
             return $content;
         } else {
@@ -153,7 +153,7 @@ 
                             'useCacheHash'     => 0,
                             'parameter'        => $this->conf['apiPid'],
                             'additionalParams' => '&tx_dpf[qid]=' . $this->doc->recordId . '&tx_dpf[action]=attachment&tx_dpf[attachment]=' . $attachment['ID'],
-                            'forceAbsoluteUrl' => true,
+                            'forceAbsoluteUrl' => TRUE,
                         );
                         $outArray['citation_pdf_url'][] = $this->cObj->typoLink_URL($conf);
                     }

ext_emconf.php

Spacing +5 added lines, -5 removed lines

@@ -16,7 +16,7 @@ 
  * Extension Manager/Repository config file for ext: "dpf"
  ***************************************************************/
 
-$EM_CONF[$_EXTKEY] = array(
+$EM_CONF[$_EXTKEY] = array (
     'title'            => 'Kitodo.Publication',
     'description'      => '',
     'category'         => 'plugin',
@@ -28,13 +28,13 @@ 
     'createDirs'       => 'uploads/tx_dpf',
     'clearCacheOnLoad' => 0,
     'version'          => '5.0.0',
-    'constraints'      => array(
-        'depends'   => array(
+    'constraints'      => array (
+        'depends'   => array (
             'typo3' => '9.5.0-9.5.99',
         ),
-        'conflicts' => array(
+        'conflicts' => array (
         ),
-        'suggests'  => array(
+        'suggests'  => array (
         ),
     ),
 );