@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | */ |
| 66 | 66 | protected function getClass(FlashMessage $flashMessage): string |
| 67 | 67 | { |
| 68 | - return 'alert-' . self::$classes[$flashMessage->getSeverity()]; |
|
| 68 | + return 'alert-'.self::$classes[$flashMessage->getSeverity()]; |
|
| 69 | 69 | } |
| 70 | 70 | |
| 71 | 71 | /** |
@@ -95,19 +95,19 @@ discard block |
||
| 95 | 95 | $markup[] = '<div class="typo3-messages">'; |
| 96 | 96 | foreach ($flashMessages as $flashMessage) { |
| 97 | 97 | $messageTitle = $flashMessage->getTitle(); |
| 98 | - $markup[] = '<div class="alert ' . htmlspecialchars($this->getClass($flashMessage)) . '">'; |
|
| 98 | + $markup[] = '<div class="alert '.htmlspecialchars($this->getClass($flashMessage)).'">'; |
|
| 99 | 99 | $markup[] = ' <div class="media">'; |
| 100 | 100 | $markup[] = ' <div class="media-left">'; |
| 101 | 101 | $markup[] = ' <span class="fa-stack fa-lg">'; |
| 102 | 102 | $markup[] = ' <i class="fa fa-circle fa-stack-2x"></i>'; |
| 103 | - $markup[] = ' <i class="fa fa-' . htmlspecialchars($this->getIconName($flashMessage)) . ' fa-stack-1x"></i>'; |
|
| 103 | + $markup[] = ' <i class="fa fa-'.htmlspecialchars($this->getIconName($flashMessage)).' fa-stack-1x"></i>'; |
|
| 104 | 104 | $markup[] = ' </span>'; |
| 105 | 105 | $markup[] = ' </div>'; |
| 106 | 106 | $markup[] = ' <div class="media-body">'; |
| 107 | 107 | if ($messageTitle !== '') { |
| 108 | - $markup[] = ' <h4 class="alert-title">' . htmlspecialchars($messageTitle) . '</h4>'; |
|
| 108 | + $markup[] = ' <h4 class="alert-title">'.htmlspecialchars($messageTitle).'</h4>'; |
|
| 109 | 109 | } |
| 110 | - $markup[] = ' <p class="alert-message">' . $flashMessage->getMessage() . '</p>'; |
|
| 110 | + $markup[] = ' <p class="alert-message">'.$flashMessage->getMessage().'</p>'; |
|
| 111 | 111 | $markup[] = ' </div>'; |
| 112 | 112 | $markup[] = ' </div>'; |
| 113 | 113 | $markup[] = '</div>'; |
@@ -66,7 +66,7 @@ discard block |
||
| 66 | 66 | $entryArray['_OVERRIDE_HREF'] = $this->pi_linkTP_keepPIvars_url(['page' => $entry['points']], true, false, $this->conf['targetPid']); |
| 67 | 67 | $entryArray['doNotLinkIt'] = 0; |
| 68 | 68 | if ($this->conf['basketButton']) { |
| 69 | - $entryArray['basketButtonHref'] = '<a href="' . $this->pi_linkTP_keepPIvars_url(['addToBasket' => 'toc', 'logId' => $entry['id'], 'startpage' => $entry['points']], true, false, $this->conf['targetBasket']) . '">' . htmlspecialchars($this->pi_getLL('basketButton', '')) . '</a>'; |
|
| 69 | + $entryArray['basketButtonHref'] = '<a href="'.$this->pi_linkTP_keepPIvars_url(['addToBasket' => 'toc', 'logId' => $entry['id'], 'startpage' => $entry['points']], true, false, $this->conf['targetBasket']).'">'.htmlspecialchars($this->pi_getLL('basketButton', '')).'</a>'; |
|
| 70 | 70 | } |
| 71 | 71 | } elseif ( |
| 72 | 72 | !empty($entry['points']) |
@@ -75,13 +75,13 @@ discard block |
||
| 75 | 75 | $entryArray['_OVERRIDE_HREF'] = $this->pi_linkTP_keepPIvars_url(['id' => $entry['points'], 'page' => 1], true, false, $this->conf['targetPid']); |
| 76 | 76 | $entryArray['doNotLinkIt'] = 0; |
| 77 | 77 | if ($this->conf['basketButton']) { |
| 78 | - $entryArray['basketButtonHref'] = '<a href="' . $this->pi_linkTP_keepPIvars_url(['addToBasket' => 'toc', 'logId' => $entry['id'], 'startpage' => $entry['points']], true, false, $this->conf['targetBasket']) . '">' . htmlspecialchars($this->pi_getLL('basketButton', '')) . '</a>'; |
|
| 78 | + $entryArray['basketButtonHref'] = '<a href="'.$this->pi_linkTP_keepPIvars_url(['addToBasket' => 'toc', 'logId' => $entry['id'], 'startpage' => $entry['points']], true, false, $this->conf['targetBasket']).'">'.htmlspecialchars($this->pi_getLL('basketButton', '')).'</a>'; |
|
| 79 | 79 | } |
| 80 | 80 | } elseif (!empty($entry['targetUid'])) { |
| 81 | 81 | $entryArray['_OVERRIDE_HREF'] = $this->pi_linkTP_keepPIvars_url(['id' => $entry['targetUid'], 'page' => 1], true, false, $this->conf['targetPid']); |
| 82 | 82 | $entryArray['doNotLinkIt'] = 0; |
| 83 | 83 | if ($this->conf['basketButton']) { |
| 84 | - $entryArray['basketButtonHref'] = '<a href="' . $this->pi_linkTP_keepPIvars_url(['addToBasket' => 'toc', 'logId' => $entry['id'], 'startpage' => $entry['targetUid']], true, false, $this->conf['targetBasket']) . '">' . htmlspecialchars($this->pi_getLL('basketButton', '')) . '</a>'; |
|
| 84 | + $entryArray['basketButtonHref'] = '<a href="'.$this->pi_linkTP_keepPIvars_url(['addToBasket' => 'toc', 'logId' => $entry['id'], 'startpage' => $entry['targetUid']], true, false, $this->conf['targetBasket']).'">'.htmlspecialchars($this->pi_getLL('basketButton', '')).'</a>'; |
|
| 85 | 85 | } |
| 86 | 86 | } |
| 87 | 87 | // Set "ITEM_STATE" to "CUR" if this entry points to current page. |
@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | } |
| 115 | 115 | } |
| 116 | 116 | // Append "IFSUB" to "ITEM_STATE" if this entry has sub-entries. |
| 117 | - $entryArray['ITEM_STATE'] = ($entryArray['ITEM_STATE'] == 'NO' ? 'IFSUB' : $entryArray['ITEM_STATE'] . 'IFSUB'); |
|
| 117 | + $entryArray['ITEM_STATE'] = ($entryArray['ITEM_STATE'] == 'NO' ? 'IFSUB' : $entryArray['ITEM_STATE'].'IFSUB'); |
|
| 118 | 118 | } |
| 119 | 119 | return $entryArray; |
| 120 | 120 | } |
@@ -141,7 +141,7 @@ discard block |
||
| 141 | 141 | $this->getTemplate(); |
| 142 | 142 | $TSconfig = []; |
| 143 | 143 | $TSconfig['special'] = 'userfunction'; |
| 144 | - $TSconfig['special.']['userFunc'] = \Kitodo\Dlf\Plugin\TableOfContents::class . '->makeMenuArray'; |
|
| 144 | + $TSconfig['special.']['userFunc'] = \Kitodo\Dlf\Plugin\TableOfContents::class.'->makeMenuArray'; |
|
| 145 | 145 | $TSconfig = Helper::mergeRecursiveWithOverrule($this->conf['menuConf.'], $TSconfig); |
| 146 | 146 | $markerArray['###TOCMENU###'] = $this->cObj->cObjGetSingle('HMENU', $TSconfig); |
| 147 | 147 | $content .= $this->templateService->substituteMarkerArray($this->template, $markerArray); |
@@ -218,7 +218,7 @@ discard block |
||
| 218 | 218 | |
| 219 | 219 | $excludeOtherWhere = ''; |
| 220 | 220 | if ($this->conf['excludeOther']) { |
| 221 | - $excludeOtherWhere = 'tx_dlf_documents.pid=' . intval($this->conf['pages']); |
|
| 221 | + $excludeOtherWhere = 'tx_dlf_documents.pid='.intval($this->conf['pages']); |
|
| 222 | 222 | } |
| 223 | 223 | // Check if there are any metadata to suggest. |
| 224 | 224 | $result = $queryBuilder |
@@ -180,8 +180,8 @@ |
||
| 180 | 180 | '###VOLUMES###' |
| 181 | 181 | ], |
| 182 | 182 | 'value' => [ |
| 183 | - $countTitles . ($countTitles > 1 ? htmlspecialchars($this->pi_getLL('titles', '')) : htmlspecialchars($this->pi_getLL('title', ''))), |
|
| 184 | - $countVolumes . ($countVolumes > 1 ? htmlspecialchars($this->pi_getLL('volumes', '')) : htmlspecialchars($this->pi_getLL('volume', ''))) |
|
| 183 | + $countTitles.($countTitles > 1 ? htmlspecialchars($this->pi_getLL('titles', '')) : htmlspecialchars($this->pi_getLL('title', ''))), |
|
| 184 | + $countVolumes.($countVolumes > 1 ? htmlspecialchars($this->pi_getLL('volumes', '')) : htmlspecialchars($this->pi_getLL('volume', ''))) |
|
| 185 | 185 | ] |
| 186 | 186 | ]; |
| 187 | 187 | // Apply replacements. |
@@ -70,7 +70,7 @@ |
||
| 70 | 70 | if ($fetchedData) { |
| 71 | 71 | $response->getBody()->write($fetchedData); |
| 72 | 72 | $response = $response->withHeader('Access-Control-Allow-Methods', 'GET'); |
| 73 | - $response = $response->withHeader('Access-Control-Allow-Origin', $request->getHeaderLine('Origin') ?: '*'); |
|
| 73 | + $response = $response->withHeader('Access-Control-Allow-Origin', $request->getHeaderLine('Origin') ? : '*'); |
|
| 74 | 74 | $response = $response->withHeader('Access-Control-Max-Age', '86400'); |
| 75 | 75 | $response = $response->withHeader('Content-Type', finfo_buffer(finfo_open(FILEINFO_MIME), $fetchedData)); |
| 76 | 76 | } |
@@ -84,9 +84,9 @@ |
||
| 84 | 84 | $annotationContainers != null |
| 85 | 85 | && sizeof($annotationContainers) > 0 |
| 86 | 86 | ) { |
| 87 | - $markerArray['###ANNOTATION_SELECT###'] = '<a class="select switchoff" id="tx-dlf-tools-annotations" title="" data-dic="annotations-on:' . htmlspecialchars($this->pi_getLL('annotations-on', '')) . ';annotations-off:' . htmlspecialchars($this->pi_getLL('annotations-off', '')) . '"> </a>'; |
|
| 87 | + $markerArray['###ANNOTATION_SELECT###'] = '<a class="select switchoff" id="tx-dlf-tools-annotations" title="" data-dic="annotations-on:'.htmlspecialchars($this->pi_getLL('annotations-on', '')).';annotations-off:'.htmlspecialchars($this->pi_getLL('annotations-off', '')).'"> </a>'; |
|
| 88 | 88 | } else { |
| 89 | - $markerArray['###ANNOTATION_SELECT###'] = '<span class="no-annotations">' . htmlspecialchars($this->pi_getLL('annotations-not-available', '')) . '</span>'; |
|
| 89 | + $markerArray['###ANNOTATION_SELECT###'] = '<span class="no-annotations">'.htmlspecialchars($this->pi_getLL('annotations-not-available', '')).'</span>'; |
|
| 90 | 90 | } |
| 91 | 91 | $content .= $this->templateService->substituteMarkerArray($this->template, $markerArray); |
| 92 | 92 | return $this->pi_wrapInBaseClass($content); |
@@ -47,7 +47,7 @@ |
||
| 47 | 47 | $parentContainer = !empty($this->conf['parentContainer']) ? $this->conf['parentContainer'] : '.tx-dlf-imagemanipulationtool'; |
| 48 | 48 | // Load template file. |
| 49 | 49 | $this->getTemplate(); |
| 50 | - $markerArray['###IMAGEMANIPULATION_SELECT###'] = '<span class="tx-dlf-tools-imagetools" id="tx-dlf-tools-imagetools" data-dic="imagemanipulation-on:' . htmlspecialchars($this->pi_getLL('imagemanipulation-on', '')) . ';imagemanipulation-off:' . htmlspecialchars($this->pi_getLL('imagemanipulation-off', '')) . ';reset:' . htmlspecialchars($this->pi_getLL('reset', '')) . ';saturation:' . htmlspecialchars($this->pi_getLL('saturation', '')) . ';hue:' . htmlspecialchars($this->pi_getLL('hue', '')) . ';contrast:' . htmlspecialchars($this->pi_getLL('contrast', '')) . ';brightness:' . htmlspecialchars($this->pi_getLL('brightness', '')) . ';invert:' . htmlspecialchars($this->pi_getLL('invert', '')) . ';parentContainer:' . $parentContainer . '" title="' . htmlspecialchars($this->pi_getLL('no-support', '')) . '"></span>'; |
|
| 50 | + $markerArray['###IMAGEMANIPULATION_SELECT###'] = '<span class="tx-dlf-tools-imagetools" id="tx-dlf-tools-imagetools" data-dic="imagemanipulation-on:'.htmlspecialchars($this->pi_getLL('imagemanipulation-on', '')).';imagemanipulation-off:'.htmlspecialchars($this->pi_getLL('imagemanipulation-off', '')).';reset:'.htmlspecialchars($this->pi_getLL('reset', '')).';saturation:'.htmlspecialchars($this->pi_getLL('saturation', '')).';hue:'.htmlspecialchars($this->pi_getLL('hue', '')).';contrast:'.htmlspecialchars($this->pi_getLL('contrast', '')).';brightness:'.htmlspecialchars($this->pi_getLL('brightness', '')).';invert:'.htmlspecialchars($this->pi_getLL('invert', '')).';parentContainer:'.$parentContainer.'" title="'.htmlspecialchars($this->pi_getLL('no-support', '')).'"></span>'; |
|
| 51 | 51 | $content .= $this->templateService->substituteMarkerArray($this->template, $markerArray); |
| 52 | 52 | return $this->pi_wrapInBaseClass($content); |
| 53 | 53 | } |
@@ -164,9 +164,9 @@ discard block |
||
| 164 | 164 | |
| 165 | 165 | if ($resultMail->rowCount() > 0) { |
| 166 | 166 | $mailForm = '<select name="tx_dlf[mail_action]">'; |
| 167 | - $mailForm .= '<option value="">' . htmlspecialchars($this->pi_getLL('chooseMail', '')) . '</option>'; |
|
| 167 | + $mailForm .= '<option value="">'.htmlspecialchars($this->pi_getLL('chooseMail', '')).'</option>'; |
|
| 168 | 168 | while ($row = $resultMail->fetch()) { |
| 169 | - $mailForm .= '<option value="' . $row['uid'] . '">' . htmlspecialchars($row['name']) . ' (' . htmlspecialchars($row['mail']) . ')</option>'; |
|
| 169 | + $mailForm .= '<option value="'.$row['uid'].'">'.htmlspecialchars($row['name']).' ('.htmlspecialchars($row['mail']).')</option>'; |
|
| 170 | 170 | } |
| 171 | 171 | $mailForm .= '</select><input type="submit">'; |
| 172 | 172 | } |
@@ -175,9 +175,9 @@ discard block |
||
| 175 | 175 | // remove action form |
| 176 | 176 | $markerArray['###REMOVEACTION###'] = ' |
| 177 | 177 | <select name="tx_dlf[basket_action]"> |
| 178 | - <option value="">' . htmlspecialchars($this->pi_getLL('chooseAction', '')) . '</option> |
|
| 179 | - <option value="open">' . htmlspecialchars($this->pi_getLL('download', '')) . '</option> |
|
| 180 | - <option value="remove">' . htmlspecialchars($this->pi_getLL('remove', '')) . '</option> |
|
| 178 | + <option value="">' . htmlspecialchars($this->pi_getLL('chooseAction', '')).'</option> |
|
| 179 | + <option value="open">' . htmlspecialchars($this->pi_getLL('download', '')).'</option> |
|
| 180 | + <option value="remove">' . htmlspecialchars($this->pi_getLL('remove', '')).'</option> |
|
| 181 | 181 | </select> |
| 182 | 182 | <input type="submit"> |
| 183 | 183 | '; |
@@ -198,9 +198,9 @@ discard block |
||
| 198 | 198 | $printForm = ''; |
| 199 | 199 | if ($resultPrinter->rowCount() > 0) { |
| 200 | 200 | $printForm = '<select name="tx_dlf[print_action]">'; |
| 201 | - $printForm .= '<option value="">' . htmlspecialchars($this->pi_getLL('choosePrinter', '')) . '</option>'; |
|
| 201 | + $printForm .= '<option value="">'.htmlspecialchars($this->pi_getLL('choosePrinter', '')).'</option>'; |
|
| 202 | 202 | while ($row = $resultPrinter->fetch()) { |
| 203 | - $printForm .= '<option value="' . $row['uid'] . '">' . htmlspecialchars($row['label']) . '</option>'; |
|
| 203 | + $printForm .= '<option value="'.$row['uid'].'">'.htmlspecialchars($row['label']).'</option>'; |
|
| 204 | 204 | } |
| 205 | 205 | $printForm .= '</select><input type="submit" />'; |
| 206 | 206 | } |
@@ -257,23 +257,23 @@ discard block |
||
| 257 | 257 | $rotation = $data['rotation']; |
| 258 | 258 | $docData = $this->getDocumentData($id, $data); |
| 259 | 259 | $markerArray['###BASKETDATA###'] = $docData['downloadLink']; |
| 260 | - $arrayKey = $id . '_' . $startpage; |
|
| 260 | + $arrayKey = $id.'_'.$startpage; |
|
| 261 | 261 | if (isset($startX)) { |
| 262 | - $arrayKey .= '_' . $startX; |
|
| 262 | + $arrayKey .= '_'.$startX; |
|
| 263 | 263 | } |
| 264 | 264 | if (isset($endX)) { |
| 265 | - $arrayKey .= '_' . $endX; |
|
| 265 | + $arrayKey .= '_'.$endX; |
|
| 266 | 266 | } |
| 267 | - $controlMark = '<input value="' . $id . '" name="tx_dlf[selected][' . $arrayKey . '][id]" type="checkbox">'; |
|
| 268 | - $controlMark .= '<input value="' . $startpage . '" name="tx_dlf[selected][' . $arrayKey . '][startpage]" type="hidden">'; |
|
| 269 | - $controlMark .= '<input value="' . $endpage . '" name="tx_dlf[selected][' . $arrayKey . '][endpage]" type="hidden">'; |
|
| 267 | + $controlMark = '<input value="'.$id.'" name="tx_dlf[selected]['.$arrayKey.'][id]" type="checkbox">'; |
|
| 268 | + $controlMark .= '<input value="'.$startpage.'" name="tx_dlf[selected]['.$arrayKey.'][startpage]" type="hidden">'; |
|
| 269 | + $controlMark .= '<input value="'.$endpage.'" name="tx_dlf[selected]['.$arrayKey.'][endpage]" type="hidden">'; |
|
| 270 | 270 | // add hidden fields for detail information |
| 271 | 271 | if ($startX) { |
| 272 | - $controlMark .= '<input type="hidden" name="tx_dlf[selected][' . $arrayKey . '][startX]" value="' . $startX . '">'; |
|
| 273 | - $controlMark .= '<input type="hidden" name="tx_dlf[selected][' . $arrayKey . '][startY]" value="' . $startY . '">'; |
|
| 274 | - $controlMark .= '<input type="hidden" name="tx_dlf[selected][' . $arrayKey . '][endX]" value="' . $endX . '">'; |
|
| 275 | - $controlMark .= '<input type="hidden" name="tx_dlf[selected][' . $arrayKey . '][endY]" value="' . $endY . '">'; |
|
| 276 | - $controlMark .= '<input type="hidden" name="tx_dlf[selected][' . $arrayKey . '][rotation]" value="' . $rotation . '">'; |
|
| 272 | + $controlMark .= '<input type="hidden" name="tx_dlf[selected]['.$arrayKey.'][startX]" value="'.$startX.'">'; |
|
| 273 | + $controlMark .= '<input type="hidden" name="tx_dlf[selected]['.$arrayKey.'][startY]" value="'.$startY.'">'; |
|
| 274 | + $controlMark .= '<input type="hidden" name="tx_dlf[selected]['.$arrayKey.'][endX]" value="'.$endX.'">'; |
|
| 275 | + $controlMark .= '<input type="hidden" name="tx_dlf[selected]['.$arrayKey.'][endY]" value="'.$endY.'">'; |
|
| 276 | + $controlMark .= '<input type="hidden" name="tx_dlf[selected]['.$arrayKey.'][rotation]" value="'.$rotation.'">'; |
|
| 277 | 277 | } |
| 278 | 278 | // return one entry |
| 279 | 279 | $markerArray['###CONTROLS###'] = $controlMark; |
@@ -329,12 +329,12 @@ discard block |
||
| 329 | 329 | if ($_piVars['addToBasket'] == 'list') { |
| 330 | 330 | $documentItem['endpage'] = $document->numPages; |
| 331 | 331 | } |
| 332 | - $arrayKey = $documentItem['id'] . '_' . $page; |
|
| 332 | + $arrayKey = $documentItem['id'].'_'.$page; |
|
| 333 | 333 | if (!empty($documentItem['startX'])) { |
| 334 | - $arrayKey .= '_' . $documentItem['startX']; |
|
| 334 | + $arrayKey .= '_'.$documentItem['startX']; |
|
| 335 | 335 | } |
| 336 | 336 | if (!empty($documentItem['endX'])) { |
| 337 | - $arrayKey .= '_' . $documentItem['endX']; |
|
| 337 | + $arrayKey .= '_'.$documentItem['endX']; |
|
| 338 | 338 | } |
| 339 | 339 | // do not add more than one identical object |
| 340 | 340 | if (!in_array($arrayKey, $items)) { |
@@ -353,14 +353,14 @@ discard block |
||
| 353 | 353 | // remove parameter endpage |
| 354 | 354 | $pdfParams = str_replace(",##endpage##", '', $pdfParams); |
| 355 | 355 | } |
| 356 | - $pdfGenerateUrl = $this->conf['pdfgenerate'] . $pdfParams; |
|
| 356 | + $pdfGenerateUrl = $this->conf['pdfgenerate'].$pdfParams; |
|
| 357 | 357 | if ($this->conf['pregeneration']) { |
| 358 | 358 | // send ajax request to webapp |
| 359 | 359 | $output .= ' |
| 360 | 360 | <script> |
| 361 | 361 | $(document).ready(function(){ |
| 362 | 362 | $.ajax({ |
| 363 | - url: "' . $pdfGenerateUrl . '", |
|
| 363 | + url: "' . $pdfGenerateUrl.'", |
|
| 364 | 364 | }).done(function() { |
| 365 | 365 | }); |
| 366 | 366 | }); |
@@ -398,12 +398,12 @@ discard block |
||
| 398 | 398 | } |
| 399 | 399 | foreach ($_piVars['selected'] as $value) { |
| 400 | 400 | if (isset($value['id'])) { |
| 401 | - $arrayKey = $value['id'] . '_' . $value['startpage']; |
|
| 401 | + $arrayKey = $value['id'].'_'.$value['startpage']; |
|
| 402 | 402 | if (isset($value['startX'])) { |
| 403 | - $arrayKey .= '_' . $value['startX']; |
|
| 403 | + $arrayKey .= '_'.$value['startX']; |
|
| 404 | 404 | } |
| 405 | 405 | if (isset($value['endX'])) { |
| 406 | - $arrayKey .= '_' . $value['endX']; |
|
| 406 | + $arrayKey .= '_'.$value['endX']; |
|
| 407 | 407 | } |
| 408 | 408 | if (isset($items[$arrayKey])) { |
| 409 | 409 | unset($items[$arrayKey]); |
@@ -442,10 +442,10 @@ discard block |
||
| 442 | 442 | foreach ($this->piVars['selected'] as $docValue) { |
| 443 | 443 | if ($docValue['id']) { |
| 444 | 444 | $docData = $this->getDocumentData($docValue['id'], $docValue); |
| 445 | - $pdfUrl .= $docData['urlParams'] . $this->conf['pdfparamseparator']; |
|
| 445 | + $pdfUrl .= $docData['urlParams'].$this->conf['pdfparamseparator']; |
|
| 446 | 446 | } |
| 447 | 447 | } |
| 448 | - header('Location: ' . $pdfUrl); |
|
| 448 | + header('Location: '.$pdfUrl); |
|
| 449 | 449 | ob_end_flush(); |
| 450 | 450 | exit; |
| 451 | 451 | } |
@@ -479,7 +479,7 @@ discard block |
||
| 479 | 479 | $urlParams = str_replace("##endx##", $data['endX'] === "" ? "" : intval($data['endX']), $urlParams); |
| 480 | 480 | $urlParams = str_replace("##endy##", $data['endY'] === "" ? "" : intval($data['endY']), $urlParams); |
| 481 | 481 | $urlParams = str_replace("##rotation##", $data['rotation'] === "" ? "" : intval($data['rotation']), $urlParams); |
| 482 | - $downloadUrl = $this->conf['pdfgenerate'] . $urlParams; |
|
| 482 | + $downloadUrl = $this->conf['pdfgenerate'].$urlParams; |
|
| 483 | 483 | $title = $document->getTitle($id, true); |
| 484 | 484 | if (empty($title)) { |
| 485 | 485 | $title = $this->pi_getLL('noTitle', ''); |
@@ -488,15 +488,15 @@ discard block |
||
| 488 | 488 | $info = ''; |
| 489 | 489 | if ($data['startX'] != '' && $data['endX'] != '') { |
| 490 | 490 | // cutout |
| 491 | - $info .= htmlspecialchars($this->pi_getLL('cutout', '')) . ' '; |
|
| 491 | + $info .= htmlspecialchars($this->pi_getLL('cutout', '')).' '; |
|
| 492 | 492 | } |
| 493 | 493 | if ($data['startpage'] == $data['endpage']) { |
| 494 | 494 | // One page |
| 495 | - $info .= htmlspecialchars($this->pi_getLL('page', '')) . ' ' . $data['startpage']; |
|
| 495 | + $info .= htmlspecialchars($this->pi_getLL('page', '')).' '.$data['startpage']; |
|
| 496 | 496 | } else { |
| 497 | - $info .= htmlspecialchars($this->pi_getLL('page', '')) . ' ' . $data['startpage'] . '-' . $data['endpage']; |
|
| 497 | + $info .= htmlspecialchars($this->pi_getLL('page', '')).' '.$data['startpage'].'-'.$data['endpage']; |
|
| 498 | 498 | } |
| 499 | - $downloadLink = '<a href="' . $downloadUrl . '" target="_blank">' . htmlspecialchars($title) . '</a> (' . $info . ')'; |
|
| 499 | + $downloadLink = '<a href="'.$downloadUrl.'" target="_blank">'.htmlspecialchars($title).'</a> ('.$info.')'; |
|
| 500 | 500 | if ($data['startpage'] == $data['endpage']) { |
| 501 | 501 | $pageNums = 1; |
| 502 | 502 | } else { |
@@ -541,7 +541,7 @@ discard block |
||
| 541 | 541 | |
| 542 | 542 | $allResults = $resultMail->fetchAll(); |
| 543 | 543 | $mailData = $allResults[0]; |
| 544 | - $mailText = htmlspecialchars($this->pi_getLL('mailBody', '')) . "\n"; |
|
| 544 | + $mailText = htmlspecialchars($this->pi_getLL('mailBody', ''))."\n"; |
|
| 545 | 545 | $numberOfPages = 0; |
| 546 | 546 | $pdfUrl = $this->conf['pdfdownload']; |
| 547 | 547 | // prepare links |
@@ -549,7 +549,7 @@ discard block |
||
| 549 | 549 | if ($docValue['id']) { |
| 550 | 550 | $explodeId = explode("_", $docValue['id']); |
| 551 | 551 | $docData = $this->getDocumentData($explodeId[0], $docValue); |
| 552 | - $pdfUrl .= $docData['urlParams'] . $this->conf['pdfparamseparator']; |
|
| 552 | + $pdfUrl .= $docData['urlParams'].$this->conf['pdfparamseparator']; |
|
| 553 | 553 | $pages = (abs(intval($docValue['startpage']) - intval($docValue['endpage']))); |
| 554 | 554 | if ($pages === 0) { |
| 555 | 555 | $numberOfPages = $numberOfPages + 1; |
@@ -560,7 +560,7 @@ discard block |
||
| 560 | 560 | } |
| 561 | 561 | // Remove leading/tailing pdfparamseperator |
| 562 | 562 | $pdfUrl = trim($pdfUrl, $this->conf['pdfparamseparator']); |
| 563 | - $mailBody = $mailText . $pdfUrl; |
|
| 563 | + $mailBody = $mailText.$pdfUrl; |
|
| 564 | 564 | // Get hook objects. |
| 565 | 565 | $hookObjects = Helper::getHookObjects($this->scriptRelPath); |
| 566 | 566 | // Hook for getting a customized mail body. |
@@ -593,12 +593,12 @@ discard block |
||
| 593 | 593 | // internal user |
| 594 | 594 | $insertArray['user_id'] = $GLOBALS["TSFE"]->fe_user->user['uid']; |
| 595 | 595 | $insertArray['name'] = $GLOBALS["TSFE"]->fe_user->user['username']; |
| 596 | - $insertArray['label'] = 'Mail: ' . $mailData['mail']; |
|
| 596 | + $insertArray['label'] = 'Mail: '.$mailData['mail']; |
|
| 597 | 597 | } else { |
| 598 | 598 | // external user |
| 599 | 599 | $insertArray['user_id'] = 0; |
| 600 | 600 | $insertArray['name'] = 'n/a'; |
| 601 | - $insertArray['label'] = 'Mail: ' . $mailData['mail']; |
|
| 601 | + $insertArray['label'] = 'Mail: '.$mailData['mail']; |
|
| 602 | 602 | } |
| 603 | 603 | // add action to protocol |
| 604 | 604 | GeneralUtility::makeInstance(ConnectionPool::class) |
@@ -623,7 +623,7 @@ discard block |
||
| 623 | 623 | foreach ($this->piVars['selected'] as $docId => $docValue) { |
| 624 | 624 | if ($docValue['id']) { |
| 625 | 625 | $docData = $this->getDocumentData($docValue['id'], $docValue); |
| 626 | - $pdfUrl .= $docData['urlParams'] . $this->conf['pdfparamseparator']; |
|
| 626 | + $pdfUrl .= $docData['urlParams'].$this->conf['pdfparamseparator']; |
|
| 627 | 627 | $numberOfPages += $docData['pageNums']; |
| 628 | 628 | } |
| 629 | 629 | } |
@@ -654,7 +654,7 @@ discard block |
||
| 654 | 654 | if ($docValue['id']) { |
| 655 | 655 | $explodeId = explode("_", $docId); |
| 656 | 656 | $docData = $this->getDocumentData($explodeId[0], $docValue); |
| 657 | - $pdfUrl .= $docData['urlParams'] . $this->conf['pdfparamseparator']; |
|
| 657 | + $pdfUrl .= $docData['urlParams'].$this->conf['pdfparamseparator']; |
|
| 658 | 658 | $numberOfPages += $docData['pageNums']; |
| 659 | 659 | } |
| 660 | 660 | } |
@@ -671,12 +671,12 @@ discard block |
||
| 671 | 671 | // internal user |
| 672 | 672 | $insertArray['user_id'] = $GLOBALS["TSFE"]->fe_user->user['uid']; |
| 673 | 673 | $insertArray['name'] = $GLOBALS["TSFE"]->fe_user->user['username']; |
| 674 | - $insertArray['label'] = 'Print: ' . $printerData['label']; |
|
| 674 | + $insertArray['label'] = 'Print: '.$printerData['label']; |
|
| 675 | 675 | } else { |
| 676 | 676 | // external user |
| 677 | 677 | $insertArray['user_id'] = 0; |
| 678 | 678 | $insertArray['name'] = 'n/a'; |
| 679 | - $insertArray['label'] = 'Print: ' . $printerData['label']; |
|
| 679 | + $insertArray['label'] = 'Print: '.$printerData['label']; |
|
| 680 | 680 | } |
| 681 | 681 | // add action to protocol |
| 682 | 682 | GeneralUtility::makeInstance(ConnectionPool::class) |
@@ -685,7 +685,7 @@ discard block |
||
| 685 | 685 | 'tx_dlf_actionlog', |
| 686 | 686 | $insertArray |
| 687 | 687 | ); |
| 688 | - header('Location: ' . $pdfUrl); |
|
| 688 | + header('Location: '.$pdfUrl); |
|
| 689 | 689 | ob_end_flush(); |
| 690 | 690 | exit; |
| 691 | 691 | } |
@@ -81,12 +81,12 @@ discard block |
||
| 81 | 81 | return ''; |
| 82 | 82 | } |
| 83 | 83 | // Get separator. |
| 84 | - $separator = '<span class="separator">' . htmlspecialchars($this->pi_getLL('separator', ' - ')) . '</span>'; |
|
| 84 | + $separator = '<span class="separator">'.htmlspecialchars($this->pi_getLL('separator', ' - ')).'</span>'; |
|
| 85 | 85 | // Add link to previous page. |
| 86 | 86 | if ($this->piVars['pointer'] > 0) { |
| 87 | - $output = $this->pi_linkTP_keepPIvars(htmlspecialchars($this->pi_getLL('prevPage', '<')), ['pointer' => $this->piVars['pointer'] - 1], true) . $separator; |
|
| 87 | + $output = $this->pi_linkTP_keepPIvars(htmlspecialchars($this->pi_getLL('prevPage', '<')), ['pointer' => $this->piVars['pointer'] - 1], true).$separator; |
|
| 88 | 88 | } else { |
| 89 | - $output = '<span>' . htmlspecialchars($this->pi_getLL('prevPage', '<')) . '</span>' . $separator; |
|
| 89 | + $output = '<span>'.htmlspecialchars($this->pi_getLL('prevPage', '<')).'</span>'.$separator; |
|
| 90 | 90 | } |
| 91 | 91 | $i = 0; |
| 92 | 92 | $skip = null; |
@@ -94,13 +94,13 @@ discard block |
||
| 94 | 94 | while ($i < $maxPages) { |
| 95 | 95 | if ($i < 3 || ($i > $this->piVars['pointer'] - 3 && $i < $this->piVars['pointer'] + 3) || $i > $maxPages - 4) { |
| 96 | 96 | if ($this->piVars['pointer'] != $i) { |
| 97 | - $output .= $this->pi_linkTP_keepPIvars(htmlspecialchars(sprintf($this->pi_getLL('page', '%d'), $i + 1)), ['pointer' => $i], true) . $separator; |
|
| 97 | + $output .= $this->pi_linkTP_keepPIvars(htmlspecialchars(sprintf($this->pi_getLL('page', '%d'), $i + 1)), ['pointer' => $i], true).$separator; |
|
| 98 | 98 | } else { |
| 99 | - $output .= '<span class="active">' . htmlspecialchars(sprintf($this->pi_getLL('page', '%d'), $i + 1)) . '</span>' . $separator; |
|
| 99 | + $output .= '<span class="active">'.htmlspecialchars(sprintf($this->pi_getLL('page', '%d'), $i + 1)).'</span>'.$separator; |
|
| 100 | 100 | } |
| 101 | 101 | $skip = true; |
| 102 | 102 | } elseif ($skip === true) { |
| 103 | - $output .= '<span class="skip">' . htmlspecialchars($this->pi_getLL('skip', '...')) . '</span>' . $separator; |
|
| 103 | + $output .= '<span class="skip">'.htmlspecialchars($this->pi_getLL('skip', '...')).'</span>'.$separator; |
|
| 104 | 104 | $skip = false; |
| 105 | 105 | } |
| 106 | 106 | $i++; |
@@ -109,7 +109,7 @@ discard block |
||
| 109 | 109 | if ($this->piVars['pointer'] < $maxPages - 1) { |
| 110 | 110 | $output .= $this->pi_linkTP_keepPIvars(htmlspecialchars($this->pi_getLL('nextPage', '>')), ['pointer' => $this->piVars['pointer'] + 1], true); |
| 111 | 111 | } else { |
| 112 | - $output .= '<span>' . htmlspecialchars($this->pi_getLL('nextPage', '>')) . '</span>'; |
|
| 112 | + $output .= '<span>'.htmlspecialchars($this->pi_getLL('nextPage', '>')).'</span>'; |
|
| 113 | 113 | } |
| 114 | 114 | return $output; |
| 115 | 115 | } |
@@ -146,7 +146,7 @@ discard block |
||
| 146 | 146 | if (empty($value) && $this->conf['getTitle']) { |
| 147 | 147 | $superiorTitle = Document::getTitle($this->list[$number]['uid'], true); |
| 148 | 148 | if (!empty($superiorTitle)) { |
| 149 | - $value = '[' . $superiorTitle . ']'; |
|
| 149 | + $value = '['.$superiorTitle.']'; |
|
| 150 | 150 | } |
| 151 | 151 | } |
| 152 | 152 | // Set fake title if still not present. |
@@ -195,7 +195,7 @@ discard block |
||
| 195 | 195 | } |
| 196 | 196 | // Add thumbnail. |
| 197 | 197 | if (!empty($this->list[$number]['thumbnail'])) { |
| 198 | - $markerArray['###THUMBNAIL###'] = '<img alt="' . $imgAlt . '" src="' . $this->list[$number]['thumbnail'] . '" />'; |
|
| 198 | + $markerArray['###THUMBNAIL###'] = '<img alt="'.$imgAlt.'" src="'.$this->list[$number]['thumbnail'].'" />'; |
|
| 199 | 199 | } |
| 200 | 200 | // Add preview. |
| 201 | 201 | if (!empty($this->list[$number]['preview'])) { |
@@ -265,28 +265,28 @@ discard block |
||
| 265 | 265 | $linkConf['additionalParams'] = \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, ['logicalPage' => $this->piVars['logicalPage']], '', true, false); |
| 266 | 266 | } |
| 267 | 267 | // Build HTML form. |
| 268 | - $sorting = '<form action="' . $this->cObj->typoLink_URL($linkConf) . '" method="get"><div><input type="hidden" name="id" value="' . $GLOBALS['TSFE']->id . '" />'; |
|
| 268 | + $sorting = '<form action="'.$this->cObj->typoLink_URL($linkConf).'" method="get"><div><input type="hidden" name="id" value="'.$GLOBALS['TSFE']->id.'" />'; |
|
| 269 | 269 | foreach ($this->piVars as $piVar => $value) { |
| 270 | 270 | if ($piVar != 'order' && $piVar != 'DATA' && !empty($value)) { |
| 271 | - $sorting .= '<input type="hidden" name="' . $this->prefixId . '[' . preg_replace('/[^A-Za-z0-9_-]/', '', $piVar) . ']" value="' . htmlspecialchars($value) . '" />'; |
|
| 271 | + $sorting .= '<input type="hidden" name="'.$this->prefixId.'['.preg_replace('/[^A-Za-z0-9_-]/', '', $piVar).']" value="'.htmlspecialchars($value).'" />'; |
|
| 272 | 272 | } |
| 273 | 273 | } |
| 274 | 274 | // Select sort field. |
| 275 | - $uniqId = uniqid($prefix . '-'); |
|
| 276 | - $sorting .= '<label for="' . $uniqId . '">' . htmlspecialchars($this->pi_getLL('orderBy', '')) . '</label><select id="' . $uniqId . '" name="' . $this->prefixId . '[order]" onchange="javascript:this.form.submit();">'; |
|
| 275 | + $uniqId = uniqid($prefix.'-'); |
|
| 276 | + $sorting .= '<label for="'.$uniqId.'">'.htmlspecialchars($this->pi_getLL('orderBy', '')).'</label><select id="'.$uniqId.'" name="'.$this->prefixId.'[order]" onchange="javascript:this.form.submit();">'; |
|
| 277 | 277 | // Add relevance sorting if this is a search result list. |
| 278 | 278 | if ($this->list->metadata['options']['source'] == 'search') { |
| 279 | - $sorting .= '<option value="score"' . (($this->list->metadata['options']['order'] == 'score') ? ' selected="selected"' : '') . '>' . htmlspecialchars($this->pi_getLL('relevance', '')) . '</option>'; |
|
| 279 | + $sorting .= '<option value="score"'.(($this->list->metadata['options']['order'] == 'score') ? ' selected="selected"' : '').'>'.htmlspecialchars($this->pi_getLL('relevance', '')).'</option>'; |
|
| 280 | 280 | } |
| 281 | 281 | foreach ($this->sortables as $index_name => $label) { |
| 282 | - $sorting .= '<option value="' . htmlspecialchars($index_name) . '"' . (($this->list->metadata['options']['order'] == $index_name) ? ' selected="selected"' : '') . '>' . htmlspecialchars($label) . '</option>'; |
|
| 282 | + $sorting .= '<option value="'.htmlspecialchars($index_name).'"'.(($this->list->metadata['options']['order'] == $index_name) ? ' selected="selected"' : '').'>'.htmlspecialchars($label).'</option>'; |
|
| 283 | 283 | } |
| 284 | 284 | $sorting .= '</select>'; |
| 285 | 285 | // Select sort direction. |
| 286 | - $uniqId = uniqid($prefix . '-'); |
|
| 287 | - $sorting .= '<label for="' . $uniqId . '">' . htmlspecialchars($this->pi_getLL('direction', '')) . '</label><select id="' . $uniqId . '" name="' . $this->prefixId . '[asc]" onchange="javascript:this.form.submit();">'; |
|
| 288 | - $sorting .= '<option value="1" ' . ($this->list->metadata['options']['order.asc'] ? ' selected="selected"' : '') . '>' . htmlspecialchars($this->pi_getLL('direction.asc', '')) . '</option>'; |
|
| 289 | - $sorting .= '<option value="0" ' . (!$this->list->metadata['options']['order.asc'] ? ' selected="selected"' : '') . '>' . htmlspecialchars($this->pi_getLL('direction.desc', '')) . '</option>'; |
|
| 286 | + $uniqId = uniqid($prefix.'-'); |
|
| 287 | + $sorting .= '<label for="'.$uniqId.'">'.htmlspecialchars($this->pi_getLL('direction', '')).'</label><select id="'.$uniqId.'" name="'.$this->prefixId.'[asc]" onchange="javascript:this.form.submit();">'; |
|
| 288 | + $sorting .= '<option value="1" '.($this->list->metadata['options']['order.asc'] ? ' selected="selected"' : '').'>'.htmlspecialchars($this->pi_getLL('direction.asc', '')).'</option>'; |
|
| 289 | + $sorting .= '<option value="0" '.(!$this->list->metadata['options']['order.asc'] ? ' selected="selected"' : '').'>'.htmlspecialchars($this->pi_getLL('direction.desc', '')).'</option>'; |
|
| 290 | 290 | $sorting .= '</select></div></form>'; |
| 291 | 291 | return $sorting; |
| 292 | 292 | } |
@@ -322,7 +322,7 @@ discard block |
||
| 322 | 322 | if (empty($value) && $this->conf['getTitle']) { |
| 323 | 323 | $superiorTitle = Document::getTitle($subpart['uid'], true); |
| 324 | 324 | if (!empty($superiorTitle)) { |
| 325 | - $value = '[' . $superiorTitle . ']'; |
|
| 325 | + $value = '['.$superiorTitle.']'; |
|
| 326 | 326 | } |
| 327 | 327 | } |
| 328 | 328 | // Set fake title if still not present. |
@@ -356,7 +356,7 @@ discard block |
||
| 356 | 356 | $value = htmlspecialchars(Helper::translate($value, 'tx_dlf_structures', $this->conf['pages'])); |
| 357 | 357 | // Add page number for single pages. |
| 358 | 358 | if ($_value == 'page') { |
| 359 | - $value .= ' ' . intval($subpart['page']); |
|
| 359 | + $value .= ' '.intval($subpart['page']); |
|
| 360 | 360 | } |
| 361 | 361 | } elseif ($index_name == 'language' && !empty($value)) { |
| 362 | 362 | // Translate ISO 639 language code. |
@@ -377,7 +377,7 @@ discard block |
||
| 377 | 377 | } |
| 378 | 378 | // Add thumbnail. |
| 379 | 379 | if (!empty($subpart['thumbnail'])) { |
| 380 | - $markerArray['###SUBTHUMBNAIL###'] = '<img alt="' . $imgAlt . '" src="' . $subpart['thumbnail'] . '" />'; |
|
| 380 | + $markerArray['###SUBTHUMBNAIL###'] = '<img alt="'.$imgAlt.'" src="'.$subpart['thumbnail'].'" />'; |
|
| 381 | 381 | } |
| 382 | 382 | // Add preview. |
| 383 | 383 | if (!empty($subpart['preview'])) { |
@@ -491,7 +491,7 @@ discard block |
||
| 491 | 491 | || (isset($this->piVars['asc']) && $this->piVars['asc'] != $listMetadata['options']['order.asc']) |
| 492 | 492 | ) { |
| 493 | 493 | // Update list's metadata. |
| 494 | - $listMetadata['options']['params']['sort'] = [$this->piVars['order'] . "_sorting" => (bool) $this->piVars['asc'] ? 'asc' : 'desc']; |
|
| 494 | + $listMetadata['options']['params']['sort'] = [$this->piVars['order']."_sorting" => (bool) $this->piVars['asc'] ? 'asc' : 'desc']; |
|
| 495 | 495 | $listMetadata['options']['order'] = $this->piVars['order']; |
| 496 | 496 | $listMetadata['options']['order.asc'] = (bool) $this->piVars['asc']; |
| 497 | 497 | // Reset pointer. |
@@ -515,7 +515,7 @@ discard block |
||
| 515 | 515 | $this->list = $solr->search(); |
| 516 | 516 | } |
| 517 | 517 | // Add list description |
| 518 | - $listMetadata['description'] = '<p class="tx-dlf-search-numHits">' . htmlspecialchars(sprintf($this->pi_getLL('hits', ''), $this->list->metadata['options']['numberOfHits'], $this->list->metadata['options']['numberOfToplevelHits'])) . '</p>'; |
|
| 518 | + $listMetadata['description'] = '<p class="tx-dlf-search-numHits">'.htmlspecialchars(sprintf($this->pi_getLL('hits', ''), $this->list->metadata['options']['numberOfHits'], $this->list->metadata['options']['numberOfToplevelHits'])).'</p>'; |
|
| 519 | 519 | $this->list->metadata = $listMetadata; |
| 520 | 520 | // Save updated list. |
| 521 | 521 | $this->list->save(); |
@@ -544,7 +544,7 @@ discard block |
||
| 544 | 544 | $markerArray['###LISTTITLE###'] = $this->list->metadata['label']; |
| 545 | 545 | $markerArray['###LISTDESCRIPTION###'] = $this->list->metadata['description']; |
| 546 | 546 | if (!empty($this->list->metadata['thumbnail'])) { |
| 547 | - $markerArray['###LISTTHUMBNAIL###'] = '<img alt="" src="' . $this->list->metadata['thumbnail'] . '" />'; |
|
| 547 | + $markerArray['###LISTTHUMBNAIL###'] = '<img alt="" src="'.$this->list->metadata['thumbnail'].'" />'; |
|
| 548 | 548 | } else { |
| 549 | 549 | $markerArray['###LISTTHUMBNAIL###'] = ''; |
| 550 | 550 | } |
@@ -69,18 +69,18 @@ discard block |
||
| 69 | 69 | 'forceAbsoluteUrl' => !empty($this->conf['forceAbsoluteUrl']) ? 1 : 0, |
| 70 | 70 | 'forceAbsoluteUrl.' => ['scheme' => !empty($this->conf['forceAbsoluteUrl']) && !empty($this->conf['forceAbsoluteUrlHttps']) ? 'https' : 'http'] |
| 71 | 71 | ]; |
| 72 | - $output = '<form action="' . $this->cObj->typoLink_URL($linkConf) . '" method="get"><div><input type="hidden" name="id" value="' . $GLOBALS['TSFE']->id . '" />'; |
|
| 72 | + $output = '<form action="'.$this->cObj->typoLink_URL($linkConf).'" method="get"><div><input type="hidden" name="id" value="'.$GLOBALS['TSFE']->id.'" />'; |
|
| 73 | 73 | // Add plugin variables. |
| 74 | 74 | foreach ($this->piVars as $piVar => $value) { |
| 75 | 75 | if ($piVar != 'page' && $piVar != 'DATA' && !empty($value)) { |
| 76 | - $output .= '<input type="hidden" name="' . $this->prefixId . '[' . preg_replace('/[^A-Za-z0-9_-]/', '', $piVar) . ']" value="' . htmlspecialchars($value) . '" />'; |
|
| 76 | + $output .= '<input type="hidden" name="'.$this->prefixId.'['.preg_replace('/[^A-Za-z0-9_-]/', '', $piVar).']" value="'.htmlspecialchars($value).'" />'; |
|
| 77 | 77 | } |
| 78 | 78 | } |
| 79 | 79 | // Add page selector. |
| 80 | - $uniqId = uniqid(Helper::getUnqualifiedClassName(get_class($this)) . '-'); |
|
| 81 | - $output .= '<label for="' . $uniqId . '">' . htmlspecialchars($this->pi_getLL('selectPage', '')) . '</label><select id="' . $uniqId . '" name="' . $this->prefixId . '[page]" onchange="javascript:this.form.submit();"' . ($this->doc->numPages < 1 ? ' disabled="disabled"' : '') . '>'; |
|
| 80 | + $uniqId = uniqid(Helper::getUnqualifiedClassName(get_class($this)).'-'); |
|
| 81 | + $output .= '<label for="'.$uniqId.'">'.htmlspecialchars($this->pi_getLL('selectPage', '')).'</label><select id="'.$uniqId.'" name="'.$this->prefixId.'[page]" onchange="javascript:this.form.submit();"'.($this->doc->numPages < 1 ? ' disabled="disabled"' : '').'>'; |
|
| 82 | 82 | for ($i = 1; $i <= $this->doc->numPages; $i++) { |
| 83 | - $output .= '<option value="' . $i . '"' . ($this->piVars['page'] == $i ? ' selected="selected"' : '') . '>[' . $i . ']' . ($this->doc->physicalStructureInfo[$this->doc->physicalStructure[$i]]['orderlabel'] ? ' - ' . htmlspecialchars($this->doc->physicalStructureInfo[$this->doc->physicalStructure[$i]]['orderlabel']) : '') . '</option>'; |
|
| 83 | + $output .= '<option value="'.$i.'"'.($this->piVars['page'] == $i ? ' selected="selected"' : '').'>['.$i.']'.($this->doc->physicalStructureInfo[$this->doc->physicalStructure[$i]]['orderlabel'] ? ' - '.htmlspecialchars($this->doc->physicalStructureInfo[$this->doc->physicalStructure[$i]]['orderlabel']) : '').'</option>'; |
|
| 84 | 84 | } |
| 85 | 85 | $output .= '</select></div></form>'; |
| 86 | 86 | return $output; |
@@ -138,53 +138,53 @@ discard block |
||
| 138 | 138 | if ($this->piVars['page'] > 1) { |
| 139 | 139 | $markerArray['###FIRST###'] = $this->makeLink(htmlspecialchars($this->pi_getLL('firstPage', '')), ['page' => 1]); |
| 140 | 140 | } else { |
| 141 | - $markerArray['###FIRST###'] = '<span title="' . htmlspecialchars($this->pi_getLL('firstPage', '')) . '">' . htmlspecialchars($this->pi_getLL('firstPage', '')) . '</span>'; |
|
| 141 | + $markerArray['###FIRST###'] = '<span title="'.htmlspecialchars($this->pi_getLL('firstPage', '')).'">'.htmlspecialchars($this->pi_getLL('firstPage', '')).'</span>'; |
|
| 142 | 142 | } |
| 143 | 143 | // Link back X pages. |
| 144 | 144 | if ($this->piVars['page'] > $pageSteps) { |
| 145 | 145 | $markerArray['###BACK###'] = $this->makeLink(htmlspecialchars(sprintf($this->pi_getLL('backXPages', ''), $pageSteps)), ['page' => $this->piVars['page'] - $pageSteps]); |
| 146 | 146 | } else { |
| 147 | - $markerArray['###BACK###'] = '<span title="' . htmlspecialchars(sprintf($this->pi_getLL('backXPages', ''), $pageSteps)) . '">' . htmlspecialchars(sprintf($this->pi_getLL('backXPages', ''), $pageSteps)) . '</span>'; |
|
| 147 | + $markerArray['###BACK###'] = '<span title="'.htmlspecialchars(sprintf($this->pi_getLL('backXPages', ''), $pageSteps)).'">'.htmlspecialchars(sprintf($this->pi_getLL('backXPages', ''), $pageSteps)).'</span>'; |
|
| 148 | 148 | } |
| 149 | 149 | // Link to previous page. |
| 150 | 150 | if ($this->piVars['page'] > (1 + $this->piVars['double'])) { |
| 151 | 151 | $markerArray['###PREVIOUS###'] = $this->makeLink(htmlspecialchars($this->pi_getLL('prevPage', '')), ['page' => $this->piVars['page'] - (1 + $this->piVars['double'])]); |
| 152 | 152 | } else { |
| 153 | - $markerArray['###PREVIOUS###'] = '<span title="' . htmlspecialchars($this->pi_getLL('prevPage', '')) . '">' . htmlspecialchars($this->pi_getLL('prevPage', '')) . '</span>'; |
|
| 153 | + $markerArray['###PREVIOUS###'] = '<span title="'.htmlspecialchars($this->pi_getLL('prevPage', '')).'">'.htmlspecialchars($this->pi_getLL('prevPage', '')).'</span>'; |
|
| 154 | 154 | } |
| 155 | 155 | // Link to next page. |
| 156 | 156 | if ($this->piVars['page'] < ($this->doc->numPages - $this->piVars['double'])) { |
| 157 | 157 | $markerArray['###NEXT###'] = $this->makeLink(htmlspecialchars($this->pi_getLL('nextPage', '')), ['page' => $this->piVars['page'] + (1 + $this->piVars['double'])]); |
| 158 | 158 | } else { |
| 159 | - $markerArray['###NEXT###'] = '<span title="' . htmlspecialchars($this->pi_getLL('nextPage', '')) . '">' . htmlspecialchars($this->pi_getLL('nextPage', '')) . '</span>'; |
|
| 159 | + $markerArray['###NEXT###'] = '<span title="'.htmlspecialchars($this->pi_getLL('nextPage', '')).'">'.htmlspecialchars($this->pi_getLL('nextPage', '')).'</span>'; |
|
| 160 | 160 | } |
| 161 | 161 | // Link forward X pages. |
| 162 | 162 | if ($this->piVars['page'] <= ($this->doc->numPages - $pageSteps)) { |
| 163 | 163 | $markerArray['###FORWARD###'] = $this->makeLink(htmlspecialchars(sprintf($this->pi_getLL('forwardXPages', ''), $pageSteps)), ['page' => $this->piVars['page'] + $pageSteps]); |
| 164 | 164 | } else { |
| 165 | - $markerArray['###FORWARD###'] = '<span title="' . htmlspecialchars(sprintf($this->pi_getLL('forwardXPages', ''), $pageSteps)) . '">' . htmlspecialchars(sprintf($this->pi_getLL('forwardXPages', ''), $pageSteps)) . '</span>'; |
|
| 165 | + $markerArray['###FORWARD###'] = '<span title="'.htmlspecialchars(sprintf($this->pi_getLL('forwardXPages', ''), $pageSteps)).'">'.htmlspecialchars(sprintf($this->pi_getLL('forwardXPages', ''), $pageSteps)).'</span>'; |
|
| 166 | 166 | } |
| 167 | 167 | // Link to last page. |
| 168 | 168 | if ($this->piVars['page'] < $this->doc->numPages) { |
| 169 | 169 | $markerArray['###LAST###'] = $this->makeLink(htmlspecialchars($this->pi_getLL('lastPage', '')), ['page' => $this->doc->numPages]); |
| 170 | 170 | } else { |
| 171 | - $markerArray['###LAST###'] = '<span title="' . htmlspecialchars($this->pi_getLL('lastPage', '')) . '">' . htmlspecialchars($this->pi_getLL('lastPage', '')) . '</span>'; |
|
| 171 | + $markerArray['###LAST###'] = '<span title="'.htmlspecialchars($this->pi_getLL('lastPage', '')).'">'.htmlspecialchars($this->pi_getLL('lastPage', '')).'</span>'; |
|
| 172 | 172 | } |
| 173 | 173 | // Add double page switcher. |
| 174 | 174 | if ($this->doc->numPages > 0) { |
| 175 | 175 | if (!$this->piVars['double']) { |
| 176 | - $markerArray['###DOUBLEPAGE###'] = $this->makeLink(htmlspecialchars($this->pi_getLL('doublePageOn', '')), ['double' => 1], 'class="tx-dlf-navigation-doubleOn" title="' . htmlspecialchars($this->pi_getLL('doublePageOn', '')) . '"'); |
|
| 176 | + $markerArray['###DOUBLEPAGE###'] = $this->makeLink(htmlspecialchars($this->pi_getLL('doublePageOn', '')), ['double' => 1], 'class="tx-dlf-navigation-doubleOn" title="'.htmlspecialchars($this->pi_getLL('doublePageOn', '')).'"'); |
|
| 177 | 177 | } else { |
| 178 | - $markerArray['###DOUBLEPAGE###'] = $this->makeLink(htmlspecialchars($this->pi_getLL('doublePageOff', '')), ['double' => 0], 'class="tx-dlf-navigation-doubleOff" title="' . htmlspecialchars($this->pi_getLL('doublePageOff', '')) . '"'); |
|
| 178 | + $markerArray['###DOUBLEPAGE###'] = $this->makeLink(htmlspecialchars($this->pi_getLL('doublePageOff', '')), ['double' => 0], 'class="tx-dlf-navigation-doubleOff" title="'.htmlspecialchars($this->pi_getLL('doublePageOff', '')).'"'); |
|
| 179 | 179 | } |
| 180 | 180 | if ($this->piVars['double'] && $this->piVars['page'] < $this->doc->numPages) { |
| 181 | - $markerArray['###DOUBLEPAGE+1###'] = $this->makeLink(htmlspecialchars($this->pi_getLL('doublePage+1', '')), ['page' => $this->piVars['page'] + 1], 'title="' . htmlspecialchars($this->pi_getLL('doublePage+1', '')) . '"'); |
|
| 181 | + $markerArray['###DOUBLEPAGE+1###'] = $this->makeLink(htmlspecialchars($this->pi_getLL('doublePage+1', '')), ['page' => $this->piVars['page'] + 1], 'title="'.htmlspecialchars($this->pi_getLL('doublePage+1', '')).'"'); |
|
| 182 | 182 | } else { |
| 183 | - $markerArray['###DOUBLEPAGE+1###'] = '<span title="' . htmlspecialchars($this->pi_getLL('doublePage+1', '')) . '">' . htmlspecialchars($this->pi_getLL('doublePage+1', '')) . '</span>'; |
|
| 183 | + $markerArray['###DOUBLEPAGE+1###'] = '<span title="'.htmlspecialchars($this->pi_getLL('doublePage+1', '')).'">'.htmlspecialchars($this->pi_getLL('doublePage+1', '')).'</span>'; |
|
| 184 | 184 | } |
| 185 | 185 | } else { |
| 186 | - $markerArray['###DOUBLEPAGE###'] = '<span title="' . htmlspecialchars($this->pi_getLL('doublePageOn', '')) . '">' . htmlspecialchars($this->pi_getLL('doublePageOn', '')) . '</span>'; |
|
| 187 | - $markerArray['###DOUBLEPAGE+1###'] = '<span title="' . htmlspecialchars($this->pi_getLL('doublePage+1', '')) . '">' . htmlspecialchars($this->pi_getLL('doublePage+1', '')) . '</span>'; |
|
| 186 | + $markerArray['###DOUBLEPAGE###'] = '<span title="'.htmlspecialchars($this->pi_getLL('doublePageOn', '')).'">'.htmlspecialchars($this->pi_getLL('doublePageOn', '')).'</span>'; |
|
| 187 | + $markerArray['###DOUBLEPAGE+1###'] = '<span title="'.htmlspecialchars($this->pi_getLL('doublePage+1', '')).'">'.htmlspecialchars($this->pi_getLL('doublePage+1', '')).'</span>'; |
|
| 188 | 188 | } |
| 189 | 189 | // Add page selector. |
| 190 | 190 | $markerArray['###PAGESELECT###'] = $this->getPageSelector(); |