Erikmitk / kitodo-presentation

Classes/Plugin/Eid/SearchInDocument.php

Spacing +7 added lines, -7 removed lines

@@ -39,8 +39,8 @@ 
     public function main(ServerRequestInterface $request)
     {
         $parameters = $request->getParsedBody();
-        $encrypted = (string)$parameters['encrypted'];
-        $hashed = (string)$parameters['hashed'];
+        $encrypted = (string) $parameters['encrypted'];
+        $hashed = (string) $parameters['hashed'];
         if (empty($encrypted) || empty($hashed)) {
             throw new \InvalidArgumentException('No valid parameter passed!', 1580585079);
         }
@@ -48,12 +48,12 @@ 
 
         $output = '';
         if (!empty($core)) {
-            $query = (string)$parameters['q'];
-            $uid = (string)$parameters['uid'];
-            $start = (string)$parameters['start'];
-            $url = trim(Solr::getSolrUrl($core), '/') . '/select?wt=json&q=fulltext:(' . Solr::escapeQuery($query) . ')%20AND%20uid:' . $uid
+            $query = (string) $parameters['q'];
+            $uid = (string) $parameters['uid'];
+            $start = (string) $parameters['start'];
+            $url = trim(Solr::getSolrUrl($core), '/').'/select?wt=json&q=fulltext:('.Solr::escapeQuery($query).')%20AND%20uid:'.$uid
                 . '&hl=on&hl.fl=fulltext&fl=uid,id,page&hl.method=fastVector'
-                . '&start=' . $start . '&rows=20';
+                . '&start='.$start.'&rows=20';
             $output = GeneralUtility::getUrl($url);
         }
 

Braces +2 added lines, -4 removed lines

@@ -28,16 +28,14 @@
  * @subpackage dlf
  * @access public
  */
-class SearchInDocument
-{
+class SearchInDocument {
     /**
      * The main method of the eID script
      *
      * @param ServerRequestInterface $request
      * @return ResponseInterface JSON response of search suggestions
      */
-    public function main(ServerRequestInterface $request)
-    {
+    public function main(ServerRequestInterface $request) {
         $parameters = $request->getParsedBody();
         $encrypted = (string)$parameters['encrypted'];
         $hashed = (string)$parameters['hashed'];

Classes/Plugin/Eid/SearchSuggest.php

Indentation +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
     /**
      * The main method of the eID script
      *
-    *  @param ServerRequestInterface $request
+     *  @param ServerRequestInterface $request
      * @return ResponseInterface XML response of search suggestions
      */
     public function main(ServerRequestInterface $request)

Spacing +4 added lines, -4 removed lines

@@ -40,8 +40,8 @@ 
     public function main(ServerRequestInterface $request)
     {
         $parameters = $request->getParsedBody();
-        $encrypted = (string)$parameters['encrypted'];
-        $hashed = (string)$parameters['hashed'];
+        $encrypted = (string) $parameters['encrypted'];
+        $hashed = (string) $parameters['hashed'];
         if (empty($encrypted) || empty($hashed)) {
             throw new \InvalidArgumentException('No valid parameter passed!', 1580585079);
         }
@@ -49,8 +49,8 @@ 
 
         $output = '';
         if (!empty($core)) {
-            $query = (string)$parameters['q'];
-            $url = trim(Solr::getSolrUrl($core), '/') . '/suggest/?wt=xml&q=' . Solr::escapeQuery($query);
+            $query = (string) $parameters['q'];
+            $url = trim(Solr::getSolrUrl($core), '/').'/suggest/?wt=xml&q='.Solr::escapeQuery($query);
             $output = GeneralUtility::getUrl($url);
         }
 

Braces +2 added lines, -4 removed lines

@@ -29,16 +29,14 @@
  * @subpackage dlf
  * @access public
  */
-class SearchSuggest
-{
+class SearchSuggest {
     /**
      * The main method of the eID script
      *
     *  @param ServerRequestInterface $request
      * @return ResponseInterface XML response of search suggestions
      */
-    public function main(ServerRequestInterface $request)
-    {
+    public function main(ServerRequestInterface $request) {
         $parameters = $request->getParsedBody();
         $encrypted = (string)$parameters['encrypted'];
         $hashed = (string)$parameters['hashed'];

Classes/Plugin/Eid/PageViewProxy.php

Spacing +2 added lines, -2 removed lines

@@ -38,11 +38,11 @@
     public function main(ServerRequestInterface $request)
     {
         // header parameter for getUrl(); allowed values 0,1,2; default 0
-        $header = (int)$request->getQueryParams()['header'];
+        $header = (int) $request->getQueryParams()['header'];
         $header = \TYPO3\CMS\Core\Utility\MathUtility::forceIntegerInRange($header, 0, 2, 0);
 
         // the URI to fetch data or header from
-        $url = (string)$request->getQueryParams()['url'];
+        $url = (string) $request->getQueryParams()['url'];
         if (!GeneralUtility::isValidUrl($url)) {
             throw new \InvalidArgumentException('No valid url passed!', 1580482805);
         }

Braces +2 added lines, -4 removed lines

@@ -24,8 +24,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class PageViewProxy
-{
+class PageViewProxy {
 
     /**
      * The main method of the eID script
@@ -35,8 +34,7 @@ 
      * @param ServerRequestInterface $request
      * @return ResponseInterface
      */
-    public function main(ServerRequestInterface $request)
-    {
+    public function main(ServerRequestInterface $request) {
         // header parameter for getUrl(); allowed values 0,1,2; default 0
         $header = (int)$request->getQueryParams()['header'];
         $header = \TYPO3\CMS\Core\Utility\MathUtility::forceIntegerInRange($header, 0, 2, 0);

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

@@ -56,7 +56,7 @@
             if (!empty($fetchedHeaderString)) {
                 $fetchedHeader = explode("\n", $fetchedHeaderString);
                 foreach ($fetchedHeader as $headerline) {
-                    if (stripos($headerline, 'Last-Modified:') !== false) {
+                    if (stripos($headerline, 'Last-Modified:') !== FALSE) {
                         $lastModified = trim(substr($headerline, strpos($headerline, ':') + 1));
                         break;
                     }

Classes/Plugin/Calendar.php

Braces +5 added lines, -10 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';
 
     /**
@@ -47,8 +46,7 @@ 
      *
      * @return string The content that is displayed on the website
      */
-    public function main($content, $conf)
-    {
+    public function main($content, $conf) {
         $this->init($conf);
 
         // Set initial document (anchor or year file) if configured.
@@ -95,8 +93,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();
@@ -241,8 +238,7 @@ 
      *
      * @return string Content for template subpart
      */
-    protected function getCalendarYear($calendarIssuesByMonth, $year, $firstMonth = 1, $lastMonth = 12)
-    {
+    protected function getCalendarYear($calendarIssuesByMonth, $year, $firstMonth = 1, $lastMonth = 12) {
         // Get subpart templates.
         $subPartContent = '';
         $subParts['month'] = $this->templateService->getSubpart($this->template, '###CALMONTH###');
@@ -360,8 +356,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();

Spacing +17 added lines, -17 removed lines

@@ -157,7 +157,7 @@ 
                 $_day = date('j', $dateTimestamp);
                 $calendarIssuesByYear[$_year][$_month][$_day][] = $issue;
             } else {
-                Helper::devLog('Document with UID ' . $issue['uid'] . 'has no valid date of publication', DEVLOG_SEVERITY_WARNING);
+                Helper::devLog('Document with UID '.$issue['uid'].'has no valid date of publication', DEVLOG_SEVERITY_WARNING);
             }
         }
         // Sort by years.
@@ -206,7 +206,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' => '&' . $this->prefixId . '[id]=' . urlencode($this->doc->uid),
+            'additionalParams' => '&'.$this->prefixId.'[id]='.urlencode($this->doc->uid),
         ];
         $linkTitleData = $this->doc->getTitledata();
         $linkTitle = !empty($linkTitleData['mets_orderlabel'][0]) ? $linkTitleData['mets_orderlabel'][0] : $linkTitleData['mets_label'][0];
@@ -217,9 +217,9 @@ 
             'parameter' => $GLOBALS['TSFE']->id,
             'forceAbsoluteUrl' => !empty($this->conf['forceAbsoluteUrl']) ? 1 : 0,
             'forceAbsoluteUrl.' => ['scheme' => !empty($this->conf['forceAbsoluteUrl']) && !empty($this->conf['forceAbsoluteUrlHttps']) ? 'https' : 'http'],
-            '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);
         // Fill marker array.
         $markerArray = [
             '###CALENDARVIEWACTIVE###' => count($this->allIssues) > 5 ? 'active' : '',
@@ -260,19 +260,19 @@ 
                 '###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')) . ' ' . $year,
-                '###CALYEAR###' => ($i == $firstMonth) ? '<div class="year">' . $year . '</div>' : ''
+                '###MONTHNAME###'  => strftime('%B', strtotime($year.'-'.$i.'-1')).' '.$year,
+                '###CALYEAR###' => ($i == $firstMonth) ? '<div class="year">'.$year.'</div>' : ''
             ];
             // Fill the month markers.
             $subPartContentMonth = $this->templateService->substituteMarkerArray($subParts['month'], $markerArray);
             // Reset week content of new month.
             $subPartContentWeek = '';
-            $firstOfMonth = strtotime($year . '-' . $i . '-1');
+            $firstOfMonth = strtotime($year.'-'.$i.'-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;',
@@ -284,7 +284,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
@@ -304,7 +304,7 @@ 
                                             'parameter' => $this->conf['targetPid'],
                                             'forceAbsoluteUrl' => !empty($this->conf['forceAbsoluteUrl']) ? 1 : 0,
                                             'forceAbsoluteUrl.' => ['scheme' => !empty($this->conf['forceAbsoluteUrl']) && !empty($this->conf['forceAbsoluteUrlHttps']) ? 'https' : 'http'],
-                                            'additionalParams' => '&' . $this->prefixId . '[id]=' . urlencode($issue['uid']),
+                                            'additionalParams' => '&'.$this->prefixId.'[id]='.urlencode($issue['uid']),
                                             'ATagParams' => ' class="title"',
                                         ];
                                         $dayLinksText[] = $this->cObj->typoLink($dayLinkLabel, $linkConf);
@@ -316,13 +316,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;
@@ -418,8 +418,8 @@ 
                     'parameter' => $GLOBALS['TSFE']->id,
                     'forceAbsoluteUrl' => !empty($this->conf['forceAbsoluteUrl']) ? 1 : 0,
                     'forceAbsoluteUrl.' => ['scheme' => !empty($this->conf['forceAbsoluteUrl']) && !empty($this->conf['forceAbsoluteUrlHttps']) ? 'https' : 'http'],
-                    '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),
@@ -433,9 +433,9 @@ 
             'parameter' => $GLOBALS['TSFE']->id,
             'forceAbsoluteUrl' => !empty($this->conf['forceAbsoluteUrl']) ? 1 : 0,
             'forceAbsoluteUrl.' => ['scheme' => !empty($this->conf['forceAbsoluteUrl']) && !empty($this->conf['forceAbsoluteUrlHttps']) ? 'https' : 'http'],
-            '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'),

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

@@ -58,7 +58,7 @@ 
 
         // 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;
         }
@@ -100,7 +100,7 @@ 
         $this->init($conf);
         // 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;
         }
@@ -137,7 +137,7 @@ 
                 $title = $resArray['title'];
             } else {
                 $title = !empty($resArray['label']) ? $resArray['label'] : $resArray['orderlabel'];
-                if (strtotime($title) !== false) {
+                if (strtotime($title) !== FALSE) {
                     $title = strftime('%x', strtotime($title));
                 }
             }
@@ -151,7 +151,7 @@ 
         $calendarIssuesByYear = [];
         foreach ($issues as $issue) {
             $dateTimestamp = strtotime($issue['year']);
-            if ($dateTimestamp !== false) {
+            if ($dateTimestamp !== FALSE) {
                 $_year = date('Y', $dateTimestamp);
                 $_month = date('n', $dateTimestamp);
                 $_day = date('j', $dateTimestamp);
@@ -219,7 +219,7 @@ 
             'forceAbsoluteUrl.' => ['scheme' => !empty($this->conf['forceAbsoluteUrl']) && !empty($this->conf['forceAbsoluteUrlHttps']) ? 'https' : 'http'],
             '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);
         // Fill marker array.
         $markerArray = [
             '###CALENDARVIEWACTIVE###' => count($this->allIssues) > 5 ? 'active' : '',
@@ -371,7 +371,7 @@ 
         $this->init($conf);
         // 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;
         }
@@ -435,7 +435,7 @@ 
             'forceAbsoluteUrl.' => ['scheme' => !empty($this->conf['forceAbsoluteUrl']) && !empty($this->conf['forceAbsoluteUrlHttps']) ? 'https' : 'http'],
             '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'),

Classes/Plugin/Validator.php

Braces +2 added lines, -4 removed lines

@@ -20,8 +20,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class Validator extends \Kitodo\Dlf\Common\AbstractPlugin
-{
+class Validator extends \Kitodo\Dlf\Common\AbstractPlugin {
     public $scriptRelPath = 'Classes/Plugin/Validator.php';
 
     /**
@@ -34,8 +33,7 @@ 
      *
      * @return string The content that is displayed on the website
      */
-    public function main($content, $conf)
-    {
+    public function main($content, $conf) {
         $this->init($conf);
         // Disable caching for this plugin.
         $this->setCache(false);

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

@@ -38,12 +38,12 @@
     {
         $this->init($conf);
         // Disable caching for this plugin.
-        $this->setCache(false);
+        $this->setCache(FALSE);
         // Load template file.
         $this->getTemplate();
         // Load current document.
         $this->loadDocument();
-        if ($this->doc === null) {
+        if ($this->doc === NULL) {
             // Document could not be loaded.
             // Check:
             // - if document location is valid URL

Classes/Plugin/Basket.php

Spacing +47 added lines, -47 removed lines

@@ -55,7 +55,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'),
                 '',
                 '',
@@ -68,7 +68,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'),
                 '',
                 '',
@@ -157,9 +157,9 @@ 
 
         if ($resultMail->rowCount() > 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">';
         }
@@ -168,9 +168,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">
   ';
@@ -191,9 +191,9 @@ 
         $printForm = '';
         if ($resultPrinter->rowCount() > 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" />';
         }
@@ -248,23 +248,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;
@@ -320,12 +320,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)) {
@@ -344,14 +344,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() {
        });
       });
@@ -359,7 +359,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];
@@ -383,12 +383,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]);
@@ -400,7 +400,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;
     }
@@ -421,10 +421,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;
     }
@@ -458,7 +458,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);
@@ -467,15 +467,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 {
@@ -520,7 +520,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
@@ -528,7 +528,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;
@@ -539,7 +539,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.
@@ -572,12 +572,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);
@@ -597,7 +597,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'];
             }
         }
@@ -628,7 +628,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'];
                 }
             }
@@ -645,16 +645,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

@@ -25,8 +25,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';
 
     /**
@@ -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);
         // Don't cache the output.
         $this->setCache(false);
@@ -233,8 +231,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);
         }
@@ -282,8 +279,7 @@ 
      *
      * @return array Basket data and Javascript output
      */
-    protected function addToBasket($_piVars, $basketData)
-    {
+    protected function addToBasket($_piVars, $basketData) {
         $output = '';
         if (!$_piVars['startpage']) {
             $page = 0;
@@ -375,8 +371,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);
@@ -415,8 +410,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']) {
@@ -438,8 +432,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) {
@@ -499,8 +492,7 @@ 
      *
      * @return void
      */
-    protected function sendMail()
-    {
+    protected function sendMail() {
         // send mail
         $mailId = $this->piVars['mail_action'];
 
@@ -590,8 +582,7 @@ 
      *
      * @return void
      */
-    protected function printDocument()
-    {
+    protected function printDocument() {
         $pdfUrl = $this->conf['pdfprint'];
         $numberOfPages = 0;
         foreach ($this->piVars['selected'] as $docId => $docValue) {

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

@@ -43,7 +43,7 @@ 
     {
         $this->init($conf);
         // Don't cache the output.
-        $this->setCache(false);
+        $this->setCache(FALSE);
         // Load template file.
         $this->getTemplate();
         $subpartArray['entry'] = $this->templateService->getSubpart($this->template, '###ENTRY###');
@@ -63,7 +63,7 @@ 
             );
         } else {
             $GLOBALS['TSFE']->fe_user->setKey('ses', 'tx_dlf_basket', '');
-            $GLOBALS['TSFE']->fe_user->sesData_change = true;
+            $GLOBALS['TSFE']->fe_user->sesData_change = TRUE;
             $GLOBALS['TSFE']->fe_user->storeSessionData();
             $query = $GLOBALS['TYPO3_DB']->SELECTquery(
                 '*',
@@ -132,7 +132,7 @@ 
         // set marker
         $linkToCurrentPage = $this->pi_linkTP('|');
         $markerArray['###ACTION###'] = !empty($linkToCurrentPage) ? $this->cObj->lastTypoLinkUrl : '';
-        $markerArray['###LISTTITLE###'] = $this->pi_getLL('basket', '', true);
+        $markerArray['###LISTTITLE###'] = $this->pi_getLL('basket', '', TRUE);
         if ($basketData['doc_ids']) {
             if (is_object($basketData['doc_ids'])) {
                 $basketData['doc_ids'] = get_object_vars($basketData['doc_ids']);
@@ -158,7 +158,7 @@ 
 
         if ($resultMail->rowCount() > 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>';
             }
@@ -169,9 +169,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">
   ';
@@ -192,7 +192,7 @@ 
         $printForm = '';
         if ($resultPrinter->rowCount() > 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>';
             }
@@ -211,7 +211,7 @@ 
         }
         // basket go to
         if ($this->conf['targetBasket'] && $this->conf['basketGoToButton'] && $this->piVars['id']) {
-            $label = $this->pi_getLL('goBasket', '', true);
+            $label = $this->pi_getLL('goBasket', '', TRUE);
             $basketConf = [
                 'parameter' => $this->conf['targetBasket'],
                 'forceAbsoluteUrl' => !empty($this->conf['forceAbsoluteUrl']) ? 1 : 0,
@@ -222,7 +222,7 @@ 
         } else {
             $markerArray['###BASKET###'] = '';
         }
-        $content = $this->templateService->substituteMarkerArray($this->templateService->substituteSubpart($this->template, '###ENTRY###', $entries, true), $markerArray);
+        $content = $this->templateService->substituteMarkerArray($this->templateService->substituteSubpart($this->template, '###ENTRY###', $entries, TRUE), $markerArray);
         return $this->pi_wrapInBaseClass($content);
     }
 
@@ -272,7 +272,7 @@ 
         // return one entry
         $markerArray['###CONTROLS###'] = $controlMark;
         $markerArray['###NUMBER###'] = $docData['record_id'];
-        return $this->templateService->substituteMarkerArray($this->templateService->substituteSubpart($template['entry'], '###ENTRY###', '', true), $markerArray);
+        return $this->templateService->substituteMarkerArray($this->templateService->substituteSubpart($template['entry'], '###ENTRY###', '', TRUE), $markerArray);
     }
 
     /**
@@ -293,7 +293,7 @@ 
         } else {
             $page = intval($_piVars['startpage']);
         }
-        if ($page != null || $_piVars['addToBasket'] == 'list') {
+        if ($page != NULL || $_piVars['addToBasket'] == 'list') {
             $documentItem = [
                 'id' => intval($_piVars['id']),
                 'startpage' => intval($_piVars['startpage']),
@@ -462,21 +462,21 @@ 
             $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;
-            $title = $document->getTitle($id, true);
+            $title = $document->getTitle($id, TRUE);
             if (empty($title)) {
-                $title = $this->pi_getLL('noTitle', '', true);
+                $title = $this->pi_getLL('noTitle', '', TRUE);
             }
             // Set page and cutout information
             $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 . ')';
             if ($data['startpage'] == $data['endpage']) {
@@ -492,7 +492,7 @@ 
                 'record_id' => $document->recordId,
             ];
         }
-        return false;
+        return FALSE;
     }
 
     /**
@@ -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
@@ -557,7 +557,7 @@ 
         // Prepare and send the message
         $mail
             // subject
-            ->setSubject($this->pi_getLL('mailSubject', '', true))
+            ->setSubject($this->pi_getLL('mailSubject', '', TRUE))
             // Set the From address with an associative array
             ->setFrom($from)
             // Set the To addresses with an associative array

Classes/Plugin/Tools/AnnotationTool.php

Spacing +3 added lines, -3 removed lines

@@ -76,11 +76,11 @@
         $annotationContainers = $this->doc->physicalStructureInfo[$this->doc->physicalStructure[$this->piVars['page']]]['annotationContainers'];
         if ($annotationContainers != null && sizeof($annotationContainers) > 0) {
             $markerArray['###ANNOTATION_SELECT###'] = '<a class="select switchoff" id="tx-dlf-tools-annotations" title="" data-dic="annotations-on:'
-                . $this->pi_getLL('annotations-on', '', true) . ';annotations-off:'
-                . $this->pi_getLL('annotations-off', '', true) . '">&nbsp;</a>';
+                . $this->pi_getLL('annotations-on', '', true).';annotations-off:'
+                . $this->pi_getLL('annotations-off', '', true).'">&nbsp;</a>';
             // TODO selector for different motivations
         } else {
-            $markerArray['###ANNOTATION_SELECT###'] = '<span class="no-annotations">' . $this->pi_getLL('annotations-not-available', '', true) . '</span>';
+            $markerArray['###ANNOTATION_SELECT###'] = '<span class="no-annotations">'.$this->pi_getLL('annotations-not-available', '', true).'</span>';
         }
         $content .= $this->templateService->substituteMarkerArray($this->template, $markerArray);
         return $this->pi_wrapInBaseClass($content);

Braces +2 added lines, -4 removed lines

@@ -26,8 +26,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class AnnotationTool extends AbstractPlugin
-{
+class AnnotationTool extends AbstractPlugin {
     /**
      * @access public
      * @var string
@@ -44,8 +43,7 @@ 
      *
      * @return string  The content that is displayed on the website
      */
-    public function main($content, $conf)
-    {
+    public function main($content, $conf) {
         $this->init($conf);
         // Merge configuration with conf array of toolbox.
         if (!empty($this->cObj->data['conf'])) {

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

@@ -53,7 +53,7 @@ 
         }
         // Load current document.
         $this->loadDocument();
-        if ($this->doc === null || $this->doc->numPages < 1) {
+        if ($this->doc === NULL || $this->doc->numPages < 1) {
             // Quit without doing anything if required variables are not set.
             return $content;
         } else {
@@ -74,13 +74,13 @@ 
         // Load template file.
         $this->getTemplate();
         $annotationContainers = $this->doc->physicalStructureInfo[$this->doc->physicalStructure[$this->piVars['page']]]['annotationContainers'];
-        if ($annotationContainers != null && sizeof($annotationContainers) > 0) {
+        if ($annotationContainers != NULL && sizeof($annotationContainers) > 0) {
             $markerArray['###ANNOTATION_SELECT###'] = '<a class="select switchoff" id="tx-dlf-tools-annotations" title="" data-dic="annotations-on:'
-                . $this->pi_getLL('annotations-on', '', true) . ';annotations-off:'
-                . $this->pi_getLL('annotations-off', '', true) . '">&nbsp;</a>';
+                . $this->pi_getLL('annotations-on', '', TRUE) . ';annotations-off:'
+                . $this->pi_getLL('annotations-off', '', TRUE) . '">&nbsp;</a>';
             // TODO selector for different motivations
         } else {
-            $markerArray['###ANNOTATION_SELECT###'] = '<span class="no-annotations">' . $this->pi_getLL('annotations-not-available', '', true) . '</span>';
+            $markerArray['###ANNOTATION_SELECT###'] = '<span class="no-annotations">' . $this->pi_getLL('annotations-not-available', '', TRUE) . '</span>';
         }
         $content .= $this->templateService->substituteMarkerArray($this->template, $markerArray);
         return $this->pi_wrapInBaseClass($content);

Classes/Plugin/Tools/SearchInDocumentTool.php

Spacing +1 added lines, -1 removed lines

@@ -124,7 +124,7 @@
     protected function addSearchInDocumentJS()
     {
         $pageRenderer = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Page\PageRenderer::class);
-        $pageRenderer->addJsFooterFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'Resources/Public/Javascript/Search/SearchInDocument.js');
+        $pageRenderer->addJsFooterFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'Resources/Public/Javascript/Search/SearchInDocument.js');
     }
 
     /**

Braces +4 added lines, -8 removed lines

@@ -24,8 +24,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class SearchInDocumentTool extends \Kitodo\Dlf\Common\AbstractPlugin
-{
+class SearchInDocumentTool extends \Kitodo\Dlf\Common\AbstractPlugin {
     public $scriptRelPath = 'Classes/Plugin/Tools/SearchInDocumentTool.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);
 
@@ -121,8 +119,7 @@ 
      *
      * @return void
      */
-    protected function addSearchInDocumentJS()
-    {
+    protected function addSearchInDocumentJS() {
         $pageRenderer = GeneralUtility::makeInstance(\TYPO3\CMS\Core\Page\PageRenderer::class);
         $pageRenderer->addJsFooterFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'Resources/Public/Javascript/Search/SearchInDocument.js');
     }
@@ -134,8 +131,7 @@ 
      *
      * @return array with encrypted core name and hash
      */
-    protected function getEncryptedCoreName()
-    {
+    protected function getEncryptedCoreName() {
         // Get core name.
         $name = Helper::getIndexNameFromUid($this->conf['solrcore'], 'tx_dlf_solrcores');
         // Encrypt core name.

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

@@ -53,7 +53,7 @@
         // Load current document.
         $this->loadDocument();
         if (
-            $this->doc === null
+            $this->doc === NULL
             || $this->doc->numPages < 1
             || empty($this->conf['fileGrpFulltext'])
             || empty($this->conf['solrcore'])

Classes/Plugin/Tools/ImageManipulationTool.php

Spacing +1 added lines, -1 removed lines

@@ -45,7 +45,7 @@
         }
         // Load template file.
         $this->getTemplate();
-        $markerArray['###IMAGEMANIPULATION_SELECT###'] = '<span class="tx-dlf-tools-imagetools" id="tx-dlf-tools-imagetools" data-dic="imagemanipulation-on:' . $this->pi_getLL('imagemanipulation-on', '', true) . ';imagemanipulation-off:' . $this->pi_getLL('imagemanipulation-off', '', true) . ';reset:' . $this->pi_getLL('reset', '', true) . ';saturation:' . $this->pi_getLL('saturation', '', true) . ';hue:' . $this->pi_getLL('hue', '', true) . ';contrast:' . $this->pi_getLL('contrast', '', true) . ';brightness:' . $this->pi_getLL('brightness', '', true) . ';invert:' . $this->pi_getLL('invert', '', true) . '" title="' . $this->pi_getLL('no-support', '', true) . '"></span>';
+        $markerArray['###IMAGEMANIPULATION_SELECT###'] = '<span class="tx-dlf-tools-imagetools" id="tx-dlf-tools-imagetools" data-dic="imagemanipulation-on:'.$this->pi_getLL('imagemanipulation-on', '', true).';imagemanipulation-off:'.$this->pi_getLL('imagemanipulation-off', '', true).';reset:'.$this->pi_getLL('reset', '', true).';saturation:'.$this->pi_getLL('saturation', '', true).';hue:'.$this->pi_getLL('hue', '', true).';contrast:'.$this->pi_getLL('contrast', '', true).';brightness:'.$this->pi_getLL('brightness', '', true).';invert:'.$this->pi_getLL('invert', '', true).'" title="'.$this->pi_getLL('no-support', '', true).'"></span>';
         $content .= $this->templateService->substituteMarkerArray($this->template, $markerArray);
         return $this->pi_wrapInBaseClass($content);
     }

Braces +2 added lines, -4 removed lines

@@ -22,8 +22,7 @@ 
  * @subpackage dlf
  * @access public
  */
-class ImageManipulationTool extends \Kitodo\Dlf\Common\AbstractPlugin
-{
+class ImageManipulationTool extends \Kitodo\Dlf\Common\AbstractPlugin {
     public $scriptRelPath = 'Classes/Plugin/Tools/ImageManipulationTool.php';
 
     /**
@@ -36,8 +35,7 @@ 
      *
      * @return string The content that is displayed on the website
      */
-    public function main($content, $conf)
-    {
+    public function main($content, $conf) {
         $this->init($conf);
         // Merge configuration with conf array of toolbox.
         if (!empty($this->cObj->data['conf'])) {

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

@@ -45,7 +45,7 @@
         }
         // Load template file.
         $this->getTemplate();
-        $markerArray['###IMAGEMANIPULATION_SELECT###'] = '<span class="tx-dlf-tools-imagetools" id="tx-dlf-tools-imagetools" data-dic="imagemanipulation-on:' . $this->pi_getLL('imagemanipulation-on', '', true) . ';imagemanipulation-off:' . $this->pi_getLL('imagemanipulation-off', '', true) . ';reset:' . $this->pi_getLL('reset', '', true) . ';saturation:' . $this->pi_getLL('saturation', '', true) . ';hue:' . $this->pi_getLL('hue', '', true) . ';contrast:' . $this->pi_getLL('contrast', '', true) . ';brightness:' . $this->pi_getLL('brightness', '', true) . ';invert:' . $this->pi_getLL('invert', '', true) . '" title="' . $this->pi_getLL('no-support', '', true) . '"></span>';
+        $markerArray['###IMAGEMANIPULATION_SELECT###'] = '<span class="tx-dlf-tools-imagetools" id="tx-dlf-tools-imagetools" data-dic="imagemanipulation-on:' . $this->pi_getLL('imagemanipulation-on', '', TRUE) . ';imagemanipulation-off:' . $this->pi_getLL('imagemanipulation-off', '', TRUE) . ';reset:' . $this->pi_getLL('reset', '', TRUE) . ';saturation:' . $this->pi_getLL('saturation', '', TRUE) . ';hue:' . $this->pi_getLL('hue', '', TRUE) . ';contrast:' . $this->pi_getLL('contrast', '', TRUE) . ';brightness:' . $this->pi_getLL('brightness', '', TRUE) . ';invert:' . $this->pi_getLL('invert', '', TRUE) . '" title="' . $this->pi_getLL('no-support', '', TRUE) . '"></span>';
         $content .= $this->templateService->substituteMarkerArray($this->template, $markerArray);
         return $this->pi_wrapInBaseClass($content);
     }