Erikmitk / kitodo-presentation

Classes/Plugin/AudioPlayer.php

Spacing +4 added lines, -4 removed lines

@@ -55,12 +55,12 @@
             $(document).ready(function() {
                 AudioPlayer = new dlfAudioPlayer({
                     audio: {
-                        mimeType: "' . $this->audio['mimetype'] . '",
-                        title: "' . $this->audio['label'] . '",
-                        url:  "' . $this->audio['url'] . '"
+                        mimeType: "' . $this->audio['mimetype'].'",
+                        title: "' . $this->audio['label'].'",
+                        url:  "' . $this->audio['url'].'"
                     },
                     parentElId: "tx-dlf-audio",
-                    swfPath: "' . PathUtility::stripPathSitePrefix(ExtensionManagementUtility::extPath($this->extKey)) . 'Resources/Public/Javascript/jPlayer/jquery.jplayer.swf"
+                    swfPath: "' . PathUtility::stripPathSitePrefix(ExtensionManagementUtility::extPath($this->extKey)).'Resources/Public/Javascript/jPlayer/jquery.jplayer.swf"
                 });
             });
         ';

Braces +3 added lines, -6 removed lines

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

Classes/Plugin/PageView.php

Spacing +17 added lines, -17 removed lines

@@ -78,12 +78,12 @@ 
             $(document).ready(function() {
                 if (dlfUtils.exists(dlfViewer)) {
                     tx_dlf_viewer = new dlfViewer({
-                        controls: ["' . implode('", "', $this->controls) . '"],
-                        div: "' . $this->conf['elementId'] . '",
-                        images: ' . json_encode($this->images) . ',
-                        fulltexts: ' . json_encode($this->fulltexts) . ',
-                        annotationContainers: ' . json_encode($this->annotationContainers) . ',
-                        useInternalProxy: ' . ($this->conf['useInternalProxy'] ? 1 : 0) . '
+                        controls: ["' . implode('", "', $this->controls).'"],
+                        div: "' . $this->conf['elementId'].'",
+                        images: ' . json_encode($this->images).',
+                        fulltexts: ' . json_encode($this->fulltexts).',
+                        annotationContainers: ' . json_encode($this->annotationContainers).',
+                        useInternalProxy: ' . ($this->conf['useInternalProxy'] ? 1 : 0).'
                     });
                 }
             });
@@ -105,14 +105,14 @@ 
         $markerArray = [];
         if ($this->piVars['id']) {
             if ($this->conf['crop']) {
-                $markerArray['###EDITBUTTON###'] = '<a href="javascript: tx_dlf_viewer.activateSelection();" title="' . htmlspecialchars($this->pi_getLL('editMode', '')) . '">' . htmlspecialchars($this->pi_getLL('editMode', '')) . '</a>';
-                $markerArray['###EDITREMOVE###'] = '<a href="javascript: tx_dlf_viewer.resetCropSelection();" title="' . htmlspecialchars($this->pi_getLL('editRemove', '')) . '">' . htmlspecialchars($this->pi_getLL('editRemove', '')) . '</a>';
+                $markerArray['###EDITBUTTON###'] = '<a href="javascript: tx_dlf_viewer.activateSelection();" title="'.htmlspecialchars($this->pi_getLL('editMode', '')).'">'.htmlspecialchars($this->pi_getLL('editMode', '')).'</a>';
+                $markerArray['###EDITREMOVE###'] = '<a href="javascript: tx_dlf_viewer.resetCropSelection();" title="'.htmlspecialchars($this->pi_getLL('editRemove', '')).'">'.htmlspecialchars($this->pi_getLL('editRemove', '')).'</a>';
             } else {
                 $markerArray['###EDITBUTTON###'] = '';
                 $markerArray['###EDITREMOVE###'] = '';
             }
             if ($this->conf['magnifier']) {
-                $markerArray['###MAGNIFIER###'] = '<a href="javascript: tx_dlf_viewer.activateMagnifier();" title="' . htmlspecialchars($this->pi_getLL('magnifier', '')) . '">' . htmlspecialchars($this->pi_getLL('magnifier', '')) . '</a>';
+                $markerArray['###MAGNIFIER###'] = '<a href="javascript: tx_dlf_viewer.activateMagnifier();" title="'.htmlspecialchars($this->pi_getLL('magnifier', '')).'">'.htmlspecialchars($this->pi_getLL('magnifier', '')).'</a>';
             } else {
                 $markerArray['###MAGNIFIER###'] = '';
             }
@@ -147,15 +147,15 @@ 
                 'additionalParams' => GeneralUtility::implodeArrayForUrl($this->prefixId, $params, '', true, false),
                 'title' => $label
             ];
-            $output = '<form id="addToBasketForm" action="' . $this->cObj->typoLink_URL($basketConf) . '" method="post">';
-            $output .= '<input type="hidden" name="tx_dlf[startpage]" id="startpage" value="' . htmlspecialchars($this->piVars['page']) . '">';
-            $output .= '<input type="hidden" name="tx_dlf[endpage]" id="endpage" value="' . htmlspecialchars($this->piVars['page']) . '">';
+            $output = '<form id="addToBasketForm" action="'.$this->cObj->typoLink_URL($basketConf).'" method="post">';
+            $output .= '<input type="hidden" name="tx_dlf[startpage]" id="startpage" value="'.htmlspecialchars($this->piVars['page']).'">';
+            $output .= '<input type="hidden" name="tx_dlf[endpage]" id="endpage" value="'.htmlspecialchars($this->piVars['page']).'">';
             $output .= '<input type="hidden" name="tx_dlf[startX]" id="startX">';
             $output .= '<input type="hidden" name="tx_dlf[startY]" id="startY">';
             $output .= '<input type="hidden" name="tx_dlf[endX]" id="endX">';
             $output .= '<input type="hidden" name="tx_dlf[endY]" id="endY">';
             $output .= '<input type="hidden" name="tx_dlf[rotation]" id="rotation">';
-            $output .= '<button id="submitBasketForm" onclick="this.form.submit()">' . $label . '</button>';
+            $output .= '<button id="submitBasketForm" onclick="this.form.submit()">'.$label.'</button>';
             $output .= '</form>';
             $output .= '<script>';
             $output .= '$(document).ready(function() { $("#submitBasketForm").click(function() { $("#addToBasketForm").submit(); }); });';
@@ -191,14 +191,14 @@ 
                         'parameter' => $GLOBALS['TSFE']->id,
                         'forceAbsoluteUrl' => !empty($this->conf['forceAbsoluteUrl']) ? 1 : 0,
                         'forceAbsoluteUrl.' => ['scheme' => !empty($this->conf['forceAbsoluteUrl']) && !empty($this->conf['forceAbsoluteUrlHttps']) ? 'https' : 'http'],
-                        'additionalParams' => '&eID=tx_dlf_pageview_proxy&url=' . urlencode($image['url']),
+                        'additionalParams' => '&eID=tx_dlf_pageview_proxy&url='.urlencode($image['url']),
                     ];
                     $image['url'] = $this->cObj->typoLink_URL($linkConf);
                 }
                 $image['mimetype'] = $this->doc->getFileMimeType($this->doc->physicalStructureInfo[$this->doc->physicalStructure[$page]]['files'][$fileGrpImages]);
                 break;
             } else {
-                Helper::devLog('File not found in fileGrp "' . $fileGrpImages . '"', DEVLOG_SEVERITY_WARNING);
+                Helper::devLog('File not found in fileGrp "'.$fileGrpImages.'"', DEVLOG_SEVERITY_WARNING);
             }
         }
         return $image;
@@ -227,7 +227,7 @@ 
                         'parameter' => $GLOBALS['TSFE']->id,
                         'forceAbsoluteUrl' => !empty($this->conf['forceAbsoluteUrl']) ? 1 : 0,
                         'forceAbsoluteUrl.' => ['scheme' => !empty($this->conf['forceAbsoluteUrl']) && !empty($this->conf['forceAbsoluteUrlHttps']) ? 'https' : 'http'],
-                        'additionalParams' => '&eID=tx_dlf_pageview_proxy&url=' . urlencode($fulltext['url']),
+                        'additionalParams' => '&eID=tx_dlf_pageview_proxy&url='.urlencode($fulltext['url']),
                     ];
                     $fulltext['url'] = $this->cObj->typoLink_URL($linkConf);
                 }
@@ -236,7 +236,7 @@ 
             }
         }
         if (empty($fulltext)) {
-            Helper::devLog('File not found in fileGrp "' . $this->conf['fileGrpFulltext'] . '"', DEVLOG_SEVERITY_WARNING);
+            Helper::devLog('File not found in fileGrp "'.$this->conf['fileGrpFulltext'].'"', DEVLOG_SEVERITY_WARNING);
         }
         return $fulltext;
     }

Braces +8 added lines, -16 removed lines

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