kitodo / kitodo-presentation

plugins/search/class.tx_dlf_search_suggest.php

Spacing +2 added lines, -2 removed lines

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

Braces +4 added lines, -2 removed lines

@@ -18,7 +18,8 @@ 
  * @subpackage	tx_dlf
  * @access	public
  */
-class tx_dlf_search_suggest extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
+class tx_dlf_search_suggest extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin
+{
 
     public $scriptRelPath = 'plugins/search/class.tx_dlf_search_suggest.php';
 
@@ -32,7 +33,8 @@ 
      *
      * @return	void
      */
-    public function main($content = '', $conf = array ()) {
+    public function main($content = '', $conf = array ())
+    {
 
         if (\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('encrypted') != '' && \TYPO3\CMS\Core\Utility\GeneralUtility::_GP('hashed') != '') {
 

plugins/collection/class.tx_dlf_collection.php

Braces +8 added lines, -4 removed lines

@@ -17,7 +17,8 @@ 
  * @subpackage	tx_dlf
  * @access	public
  */
-class tx_dlf_collection extends tx_dlf_plugin {
+class tx_dlf_collection extends tx_dlf_plugin
+{
 
     public $scriptRelPath = 'plugins/collection/class.tx_dlf_collection.php';
 
@@ -39,7 +40,8 @@ 
      *
      * @return	string		The content that is displayed on the website
      */
-    public function main($content, $conf) {
+    public function main($content, $conf)
+    {
 
         $this->init($conf);
 
@@ -94,7 +96,8 @@ 
      *
      * @return	string		The list of collections ready to output
      */
-    protected function showCollectionList() {
+    protected function showCollectionList()
+    {
 
         $selectedCollections = 'tx_dlf_collections.uid != 0';
 
@@ -334,7 +337,8 @@ 
      *
      * @return	void
      */
-    protected function showSingleCollection($id) {
+    protected function showSingleCollection($id)
+    {
 
         $additionalWhere = '';
 

Indentation +4 added lines, -4 removed lines

@@ -487,10 +487,10 @@
             } else {
 
                 $subparts[$resArray['partof']][$resArray['volume_sorting']] = array (
-                   'u' => $resArray['uid'],
-                   'h' => '',
-                   's' => $sorting,
-                   'p' => array ()
+                    'u' => $resArray['uid'],
+                    'h' => '',
+                    's' => $sorting,
+                    'p' => array ()
                 );
 
             }

Spacing +38 added lines, -38 removed lines

@@ -27,7 +27,7 @@ 
      * @var	array
      * @access protected
      */
-    protected $hookObjects = array ();
+    protected $hookObjects = array();
 
     /**
      * The main method of the PlugIn
@@ -51,7 +51,7 @@ 
 
             if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_collection->main('.$content.', [data])] Incomplete plugin configuration', $this->extKey, SYSLOG_SEVERITY_WARNING, $conf);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_collection->main(' . $content . ', [data])] Incomplete plugin configuration', $this->extKey, SYSLOG_SEVERITY_WARNING, $conf);
 
             }
 
@@ -111,9 +111,9 @@ 
 
             }
 
-            $selectedCollections = 'tx_dlf_collections.uid IN ('.$GLOBALS['TYPO3_DB']->cleanIntList($this->conf['collections']).')';
+            $selectedCollections = 'tx_dlf_collections.uid IN (' . $GLOBALS['TYPO3_DB']->cleanIntList($this->conf['collections']) . ')';
 
-            $orderBy = 'FIELD(tx_dlf_collections.uid,'.$GLOBALS['TYPO3_DB']->cleanIntList($this->conf['collections']).')';
+            $orderBy = 'FIELD(tx_dlf_collections.uid,' . $GLOBALS['TYPO3_DB']->cleanIntList($this->conf['collections']) . ')';
 
         }
 
@@ -126,7 +126,7 @@ 
 
             if (!empty($GLOBALS['TSFE']->fe_user->user['uid'])) {
 
-                $showUserDefinedColls = ' AND tx_dlf_collections.fe_cruser_id='.intval($GLOBALS['TSFE']->fe_user->user['uid']);
+                $showUserDefinedColls = ' AND tx_dlf_collections.fe_cruser_id=' . intval($GLOBALS['TSFE']->fe_user->user['uid']);
 
             } else {
 
@@ -140,7 +140,7 @@ 
         $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
             'tx_dlf_collections.index_name AS index_name,tx_dlf_collections.index_search as index_query,tx_dlf_collections.uid AS uid,tx_dlf_collections.sys_language_uid AS sys_language_uid,tx_dlf_collections.label AS label,tx_dlf_collections.thumbnail AS thumbnail,tx_dlf_collections.description AS description,tx_dlf_collections.priority AS priority',
             'tx_dlf_collections',
-            $selectedCollections.$showUserDefinedColls.' AND tx_dlf_collections.pid='.intval($this->conf['pages']).' AND (tx_dlf_collections.sys_language_uid IN (-1,0) OR (tx_dlf_collections.sys_language_uid = '.$GLOBALS['TSFE']->sys_language_uid.' AND tx_dlf_collections.l18n_parent = 0))'.tx_dlf_helper::whereClause('tx_dlf_collections'),
+            $selectedCollections . $showUserDefinedColls . ' AND tx_dlf_collections.pid=' . intval($this->conf['pages']) . ' AND (tx_dlf_collections.sys_language_uid IN (-1,0) OR (tx_dlf_collections.sys_language_uid = ' . $GLOBALS['TSFE']->sys_language_uid . ' AND tx_dlf_collections.l18n_parent = 0))' . tx_dlf_helper::whereClause('tx_dlf_collections'),
             '',
             $orderBy,
             ''
@@ -162,9 +162,9 @@ 
 
         // We only care about the UID and partOf in the results and want them sorted
         $params['fields'] = 'uid,partof';
-        $params['sort'] = array ('uid' => 'asc');
+        $params['sort'] = array('uid' => 'asc');
 
-        $collections = array ();
+        $collections = array();
 
         while ($collectionData = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
 
@@ -180,7 +180,7 @@ 
 
         }
 
-        $markerArray = array ();
+        $markerArray = array();
 
         // Process results.
         foreach ($collections as $collection) {
@@ -189,20 +189,20 @@ 
 
             if ($collection['index_query'] != '') {
 
-                $solr_query .= '('.$collection['index_query'].')';
+                $solr_query .= '(' . $collection['index_query'] . ')';
 
             } else {
 
-                $solr_query .= 'collection:("'.$collection['index_name'].'")';
+                $solr_query .= 'collection:("' . $collection['index_name'] . '")';
 
             }
 
-            $partOfNothing = $solr->search_raw($solr_query.' AND partof:0 AND toplevel:true', $params);
+            $partOfNothing = $solr->search_raw($solr_query . ' AND partof:0 AND toplevel:true', $params);
 
-            $partOfSomething = $solr->search_raw($solr_query.' AND NOT partof:0 AND toplevel:true', $params);
+            $partOfSomething = $solr->search_raw($solr_query . ' AND NOT partof:0 AND toplevel:true', $params);
 
             // Titles are all documents that are "root" elements i.e. partof == 0
-            $collection['titles'] = array ();
+            $collection['titles'] = array();
 
             foreach ($partOfNothing as $doc) {
 
@@ -232,7 +232,7 @@ 
             } while (!empty($markerArray[$_key]));
 
             // Merge plugin variables with new set of values.
-            $additionalParams = array ('collection' => $collection['uid']);
+            $additionalParams = array('collection' => $collection['uid']);
 
             if (is_array($this->piVars)) {
 
@@ -245,7 +245,7 @@ 
             }
 
             // Build typolink configuration array.
-            $conf = array (
+            $conf = array(
                 'useCacheHash' => 1,
                 'parameter' => $GLOBALS['TSFE']->id,
                 'additionalParams' => \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, $additionalParams, '', TRUE, FALSE)
@@ -257,9 +257,9 @@ 
             // Add feed link if applicable.
             if (!empty($this->conf['targetFeed'])) {
 
-                $img = '<img src="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'res/icons/txdlffeeds.png" alt="'.$this->pi_getLL('feedAlt', '', TRUE).'" title="'.$this->pi_getLL('feedTitle', '', TRUE).'" />';
+                $img = '<img src="' . \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'res/icons/txdlffeeds.png" alt="' . $this->pi_getLL('feedAlt', '', TRUE) . '" title="' . $this->pi_getLL('feedTitle', '', TRUE) . '" />';
 
-                $markerArray[$_key]['###FEED###'] = $this->pi_linkTP($img, array ($this->prefixId => array ('collection' => $collection['uid'])), FALSE, $this->conf['targetFeed']);
+                $markerArray[$_key]['###FEED###'] = $this->pi_linkTP($img, array($this->prefixId => array('collection' => $collection['uid'])), FALSE, $this->conf['targetFeed']);
 
             } else {
 
@@ -270,7 +270,7 @@ 
             // Add thumbnail.
             if (!empty($collection['thumbnail'])) {
 
-                $markerArray[$_key]['###THUMBNAIL###'] = '<img alt="" title="'.htmlspecialchars($collection['label']).'" src="'.$collection['thumbnail'].'" />';
+                $markerArray[$_key]['###THUMBNAIL###'] = '<img alt="" title="' . htmlspecialchars($collection['label']) . '" src="' . $collection['thumbnail'] . '" />';
 
             } else {
 
@@ -284,11 +284,11 @@ 
             // Build statistic's output.
             $labelTitles = $this->pi_getLL((count($collection['titles']) > 1 ? 'titles' : 'title'), '', FALSE);
 
-            $markerArray[$_key]['###COUNT_TITLES###'] = htmlspecialchars(count($collection['titles']).$labelTitles);
+            $markerArray[$_key]['###COUNT_TITLES###'] = htmlspecialchars(count($collection['titles']) . $labelTitles);
 
             $labelVolumes = $this->pi_getLL((count($collection['volumes']) > 1 ? 'volumes' : 'volume'), '', FALSE);
 
-            $markerArray[$_key]['###COUNT_VOLUMES###'] = htmlspecialchars(count($collection['volumes']).$labelVolumes);
+            $markerArray[$_key]['###COUNT_VOLUMES###'] = htmlspecialchars(count($collection['volumes']) . $labelVolumes);
 
         }
 
@@ -353,7 +353,7 @@ 
         $collection = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
             'tx_dlf_collections.index_name AS index_name, tx_dlf_collections.index_search as index_query, tx_dlf_collections.label AS collLabel, tx_dlf_collections.description AS collDesc, tx_dlf_collections.thumbnail AS collThumb, tx_dlf_collections.fe_cruser_id',
             'tx_dlf_collections',
-            'tx_dlf_collections.pid='.intval($this->conf['pages']).' AND tx_dlf_collections.uid='.intval($id).$additionalWhere.tx_dlf_helper::whereClause('tx_dlf_collections'),
+            'tx_dlf_collections.pid=' . intval($this->conf['pages']) . ' AND tx_dlf_collections.uid=' . intval($id) . $additionalWhere . tx_dlf_helper::whereClause('tx_dlf_collections'),
             '',
             '',
             '1'
@@ -366,11 +366,11 @@ 
 
         if ($collectionData['index_query'] != '') {
 
-            $solr_query .= '('.$collectionData['index_query'].')';
+            $solr_query .= '(' . $collectionData['index_query'] . ')';
 
         } else {
 
-            $solr_query .= 'collection:("'.$collectionData['index_name'].'") AND toplevel:true';
+            $solr_query .= 'collection:("' . $collectionData['index_name'] . '") AND toplevel:true';
 
         }
 
@@ -380,7 +380,7 @@ 
 
             if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_collection->showSingleCollection('.intval($id).')] Apache Solr not available', $this->extKey, SYSLOG_SEVERITY_ERROR);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_collection->showSingleCollection(' . intval($id) . ')] Apache Solr not available', $this->extKey, SYSLOG_SEVERITY_ERROR);
 
             }
 
@@ -389,7 +389,7 @@ 
         }
 
         $params['fields'] = 'uid';
-        $params['sort'] = array ('uid' => 'asc');
+        $params['sort'] = array('uid' => 'asc');
 
         $solrResult = $solr->search_raw($solr_query, $params);
 
@@ -412,17 +412,17 @@ 
         $documents = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
             'tx_dlf_documents.uid AS uid, tx_dlf_documents.metadata_sorting AS metadata_sorting, tx_dlf_documents.volume_sorting AS volume_sorting, tx_dlf_documents.partof AS partof',
             'tx_dlf_documents',
-            'tx_dlf_documents.pid='.intval($this->conf['pages']).' AND tx_dlf_documents.uid IN ('.implode(',', $documentSet).')'.tx_dlf_helper::whereClause('tx_dlf_documents'),
+            'tx_dlf_documents.pid=' . intval($this->conf['pages']) . ' AND tx_dlf_documents.uid IN (' . implode(',', $documentSet) . ')' . tx_dlf_helper::whereClause('tx_dlf_documents'),
             '',
             '',
             ''
         );
 
-        $toplevel = array ();
+        $toplevel = array();
 
-        $subparts = array ();
+        $subparts = array();
 
-        $listMetadata = array ();
+        $listMetadata = array();
 
         // Process results.
         while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($documents)) {
@@ -435,15 +435,15 @@ 
 
             if (empty($listMetadata)) {
 
-                $listMetadata = array (
+                $listMetadata = array(
                     'label' => !empty($l10nOverlay['label']) ? htmlspecialchars($l10nOverlay['label']) : htmlspecialchars($collectionData['collLabel']),
                     'description' => !empty($l10nOverlay['description']) ? $this->pi_RTEcssText($l10nOverlay['description']) : $this->pi_RTEcssText($collectionData['collDesc']),
                     'thumbnail' => htmlspecialchars($collectionData['collThumb']),
-                    'options' => array (
+                    'options' => array(
                         'source' => 'collection',
                         'select' => $id,
                         'userid' => $collectionData['userid'],
-                        'params' => array ('filterquery' => array (array ('query' => 'collection_faceting:("'.$collectionData['index_name'].'")'))),
+                        'params' => array('filterquery' => array(array('query' => 'collection_faceting:("' . $collectionData['index_name'] . '")'))),
                         'core' => '',
                         'pid' => $this->conf['pages'],
                         'order' => 'title',
@@ -477,20 +477,20 @@ 
             // Split toplevel documents from volumes.
             if ($resArray['partof'] == 0) {
 
-                $toplevel[$resArray['uid']] = array (
+                $toplevel[$resArray['uid']] = array(
                     'u' => $resArray['uid'],
                     'h' => '',
                     's' => $sorting,
-                    'p' => array ()
+                    'p' => array()
                 );
 
             } else {
 
-                $subparts[$resArray['partof']][$resArray['volume_sorting']] = array (
+                $subparts[$resArray['partof']][$resArray['volume_sorting']] = array(
                    'u' => $resArray['uid'],
                    'h' => '',
                    's' => $sorting,
-                   'p' => array ()
+                   'p' => array()
                 );
 
             }
@@ -535,7 +535,7 @@ 
         \TYPO3\CMS\Core\Utility\GeneralUtility::cleanOutputBuffers();
 
         // Send headers.
-        header('Location: '.\TYPO3\CMS\Core\Utility\GeneralUtility::locationHeaderUrl($this->cObj->typoLink_URL(array ('parameter' => $this->conf['targetPid']))));
+        header('Location: ' . \TYPO3\CMS\Core\Utility\GeneralUtility::locationHeaderUrl($this->cObj->typoLink_URL(array('parameter' => $this->conf['targetPid']))));
 
         // Flush output buffer and end script processing.
         ob_end_flush();

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

@@ -44,7 +44,7 @@ 
         $this->init($conf);
 
         // Turn cache on.
-        $this->setCache(TRUE);
+        $this->setCache(true);
 
         // Quit without doing anything if required configuration variables are not set.
         if (empty($this->conf['pages'])) {
@@ -248,7 +248,7 @@ 
             $conf = array (
                 'useCacheHash' => 1,
                 'parameter' => $GLOBALS['TSFE']->id,
-                'additionalParams' => \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, $additionalParams, '', TRUE, FALSE)
+                'additionalParams' => \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, $additionalParams, '', true, false)
             );
 
             // Link collection's title to list view.
@@ -257,9 +257,9 @@ 
             // Add feed link if applicable.
             if (!empty($this->conf['targetFeed'])) {
 
-                $img = '<img src="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'res/icons/txdlffeeds.png" alt="'.$this->pi_getLL('feedAlt', '', TRUE).'" title="'.$this->pi_getLL('feedTitle', '', TRUE).'" />';
+                $img = '<img src="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'res/icons/txdlffeeds.png" alt="'.$this->pi_getLL('feedAlt', '', true).'" title="'.$this->pi_getLL('feedTitle', '', true).'" />';
 
-                $markerArray[$_key]['###FEED###'] = $this->pi_linkTP($img, array ($this->prefixId => array ('collection' => $collection['uid'])), FALSE, $this->conf['targetFeed']);
+                $markerArray[$_key]['###FEED###'] = $this->pi_linkTP($img, array ($this->prefixId => array ('collection' => $collection['uid'])), false, $this->conf['targetFeed']);
 
             } else {
 
@@ -282,11 +282,11 @@ 
             $markerArray[$_key]['###DESCRIPTION###'] = $this->pi_RTEcssText($collection['description']);
 
             // Build statistic's output.
-            $labelTitles = $this->pi_getLL((count($collection['titles']) > 1 ? 'titles' : 'title'), '', FALSE);
+            $labelTitles = $this->pi_getLL((count($collection['titles']) > 1 ? 'titles' : 'title'), '', false);
 
             $markerArray[$_key]['###COUNT_TITLES###'] = htmlspecialchars(count($collection['titles']).$labelTitles);
 
-            $labelVolumes = $this->pi_getLL((count($collection['volumes']) > 1 ? 'volumes' : 'volume'), '', FALSE);
+            $labelVolumes = $this->pi_getLL((count($collection['volumes']) > 1 ? 'volumes' : 'volume'), '', false);
 
             $markerArray[$_key]['###COUNT_VOLUMES###'] = htmlspecialchars(count($collection['volumes']).$labelVolumes);
 
@@ -298,7 +298,7 @@ 
             ksort($markerArray, SORT_NUMERIC);
 
             // Don't cache the output.
-            $this->setCache(FALSE);
+            $this->setCache(false);
 
         }
 
@@ -321,7 +321,7 @@ 
 
         }
 
-        return $this->cObj->substituteSubpart($this->template, '###ENTRY###', $content, TRUE);
+        return $this->cObj->substituteSubpart($this->template, '###ENTRY###', $content, true);
 
     }
 
@@ -447,7 +447,7 @@ 
                         'core' => '',
                         'pid' => $this->conf['pages'],
                         'order' => 'title',
-                        'order.asc' => TRUE
+                        'order.asc' => true
                     )
                 );
 

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

Spacing +3 added lines, -3 removed lines

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

Braces +4 added lines, -2 removed lines

@@ -18,7 +18,8 @@ 
  * @subpackage	tx_dlf
  * @access	public
  */
-class tx_dlf_toolsFulltext extends tx_dlf_plugin {
+class tx_dlf_toolsFulltext extends tx_dlf_plugin
+{
 
     public $scriptRelPath = 'plugins/toolbox/tools/fulltext/class.tx_dlf_toolsFulltext.php';
 
@@ -32,7 +33,8 @@ 
      *
      * @return	string		The content that is displayed on the website
      */
-    public function main($content, $conf) {
+    public function main($content, $conf)
+    {
 
         $this->init($conf);
 

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

@@ -42,7 +42,7 @@ 
         // Load current document.
         $this->loadDocument();
 
-        if ($this->doc === NULL || $this->doc->numPages < 1 || empty($this->conf['fileGrpFulltext'])) {
+        if ($this->doc === null || $this->doc->numPages < 1 || empty($this->conf['fileGrpFulltext'])) {
 
             // Quit without doing anything if required variables are not set.
             return $content;
@@ -88,10 +88,10 @@ 
 
         if (!empty($fullTextFile)) {
             $markerArray['###FULLTEXT_SELECT###'] = '<a class="select switchoff" id="tx-dlf-tools-fulltext" title="" data-dic="fulltext-on:'
-                    .$this->pi_getLL('fulltext-on', '', TRUE).';fulltext-off:'
-                    .$this->pi_getLL('fulltext-off', '', TRUE).'">&nbsp;</a>';
+                    .$this->pi_getLL('fulltext-on', '', true).';fulltext-off:'
+                    .$this->pi_getLL('fulltext-off', '', true).'">&nbsp;</a>';
         } else {
-            $markerArray['###FULLTEXT_SELECT###'] = '<span class="no-fulltext">'.$this->pi_getLL('fulltext-not-available', '', TRUE).'</span>';
+            $markerArray['###FULLTEXT_SELECT###'] = '<span class="no-fulltext">'.$this->pi_getLL('fulltext-not-available', '', true).'</span>';
         }
 
         $content .= $this->cObj->substituteMarkerArray($this->template, $markerArray);

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

Spacing +9 added lines, -9 removed lines

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

Braces +8 added lines, -4 removed lines

@@ -18,7 +18,8 @@ 
  * @subpackage	tx_dlf
  * @access	public
  */
-class tx_dlf_toolsPdf extends tx_dlf_plugin {
+class tx_dlf_toolsPdf extends tx_dlf_plugin
+{
 
     public $scriptRelPath = 'plugins/toolbox/tools/pdf/class.tx_dlf_toolsPdf.php';
 
@@ -32,7 +33,8 @@ 
      *
      * @return	string		The content that is displayed on the website
      */
-    public function main($content, $conf) {
+    public function main($content, $conf)
+    {
 
         $this->init($conf);
 
@@ -103,7 +105,8 @@ 
      *
      * @return	string		Link to downloadable page
      */
-    protected function getPageLink() {
+    protected function getPageLink()
+    {
 
         $page1Link = '';
         $page2Link = '';
@@ -158,7 +161,8 @@ 
      *
      * @return	string		Link to downloadable work
      */
-    protected function getWorkLink() {
+    protected function getWorkLink()
+    {
 
         $workLink = '';
 

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

@@ -42,7 +42,7 @@
         // Load current document.
         $this->loadDocument();
 
-        if ($this->doc === NULL || $this->doc->numPages < 1 || empty($this->conf['fileGrpDownload'])) {
+        if ($this->doc === null || $this->doc->numPages < 1 || empty($this->conf['fileGrpDownload'])) {
 
             // Quit without doing anything if required variables are not set.
             return $content;

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

Spacing +1 added lines, -1 removed lines

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

Braces +8 added lines, -4 removed lines

@@ -17,7 +17,8 @@ 
  * @subpackage	tx_dlf
  * @access	public
  */
-class tx_dlf_toolsSearchindocument extends tx_dlf_plugin {
+class tx_dlf_toolsSearchindocument extends tx_dlf_plugin
+{
 
     public $scriptRelPath = 'plugins/toolbox/tools/searchindocument/class.tx_dlf_toolsSearchindocument.php';
 
@@ -31,7 +32,8 @@ 
      *
      * @return	string		The content that is displayed on the website
      */
-    public function main($content, $conf) {
+    public function main($content, $conf)
+    {
 
         $this->init($conf);
 
@@ -108,7 +110,8 @@ 
      *
      * @return void
      */
-    protected function addSearchInDocumentJS() {
+    protected function addSearchInDocumentJS()
+    {
         $pageRenderer = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Core\Page\PageRenderer::class);
         $pageRenderer->addJsFooterFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'plugins/toolbox/tools/searchindocument/tx_dlf_search_in_document.js');
     }
@@ -120,7 +123,8 @@ 
      *
      * @return array with encrypted core name and hash
      */
-    protected function getEncryptedCoreName() {
+    protected function getEncryptedCoreName()
+    {
         // Get core name.
         $name = tx_dlf_helper::getIndexName($this->conf['solrcore'], 'tx_dlf_solrcores');
         // Encrypt core name.

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

@@ -45,7 +45,7 @@
         // Load current document.
         $this->loadDocument();
 
-        if ($this->doc === NULL || $this->doc->numPages < 1 || empty($this->conf['fileGrpFulltext']) || empty($this->conf['solrcore'])) {
+        if ($this->doc === null || $this->doc->numPages < 1 || empty($this->conf['fileGrpFulltext']) || empty($this->conf['solrcore'])) {
 
             // Quit without doing anything if required variables are not set.
             return $content;

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

Indentation +2 added lines, -2 removed lines

@@ -42,8 +42,8 @@
         if (!empty($core)) {
 
             $url = trim(tx_dlf_solr::getSolrUrl($core), '/').'/select?wt=json&q='.urlencode('fulltext:('.tx_dlf_solr::escapeQuery(\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('q'))).')%20AND%20uid:'.\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('uid')
-              .'&hl=on&hl.fl=fulltext&fl=uid,id,page&hl.method=fastVector'
-              .'&start='.\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('start').'&rows=20';
+                .'&hl=on&hl.fl=fulltext&fl=uid,id,page&hl.method=fastVector'
+                .'&start='.\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('start').'&rows=20';
 
             $output = \TYPO3\CMS\Core\Utility\GeneralUtility::getUrl($url);
         }

Spacing +3 added lines, -3 removed lines

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

Braces +4 added lines, -2 removed lines

@@ -17,7 +17,8 @@ 
  * @subpackage	tx_dlf
  * @access	public
  */
-class tx_dlf_search_in_document_eid extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
+class tx_dlf_search_in_document_eid extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin
+{
 
     public $scriptRelPath = 'plugins/toolbox/tools/searchindocument/class.tx_dlf_search_in_document.php';
 
@@ -31,7 +32,8 @@ 
      *
      * @return	string JSON response of search suggestions
      */
-    public function main($content = '', $conf = array ()) {
+    public function main($content = '', $conf = array ())
+    {
 
         if (\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('encrypted') != '' && \TYPO3\CMS\Core\Utility\GeneralUtility::_GP('hashed') != '') {
 

plugins/toolbox/tools/imagedownload/class.tx_dlf_toolsImagedownload.php

Spacing +5 added lines, -5 removed lines

@@ -108,7 +108,7 @@ 
      */
     protected function getImage($page, $label) {
 
-        $image = array ();
+        $image = array();
 
         // Get @USE value of METS fileGrp.
         $fileGrps = \TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(',', $this->conf['fileGrpsImageDownload']);
@@ -129,13 +129,13 @@ 
                             break;
                     default:	$mimetypeLabel = '';
                 }
-                $linkConf = array (
+                $linkConf = array(
                     'parameter' => $image['url'],
-                    'title' => $label.' '.$mimetypeLabel,
+                    'title' => $label . ' ' . $mimetypeLabel,
                     'additionalParams' => '',
                 );
 
-                $imageLink = $this->cObj->typoLink($label.' '.$mimetypeLabel, $linkConf);
+                $imageLink = $this->cObj->typoLink($label . ' ' . $mimetypeLabel, $linkConf);
 
                 break;
 
@@ -143,7 +143,7 @@ 
 
                 if (TYPO3_DLOG) {
 
-                    \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_toolsImagedownload->getImage('.$page.')] File not found in fileGrp "'.$fileGrp.'"', $this->extKey, SYSLOG_SEVERITY_WARNING);
+                    \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_toolsImagedownload->getImage(' . $page . ')] File not found in fileGrp "' . $fileGrp . '"', $this->extKey, SYSLOG_SEVERITY_WARNING);
 
                 }
 

Braces +6 added lines, -3 removed lines

@@ -17,7 +17,8 @@ 
  * @subpackage	tx_dlf
  * @access	public
  */
-class tx_dlf_toolsImagedownload extends tx_dlf_plugin {
+class tx_dlf_toolsImagedownload extends tx_dlf_plugin
+{
 
     public $scriptRelPath = 'plugins/toolbox/tools/imagedownload/class.tx_dlf_toolsImagedownload.php';
 
@@ -31,7 +32,8 @@ 
      *
      * @return	string		The content that is displayed on the website
      */
-    public function main($content, $conf) {
+    public function main($content, $conf)
+    {
 
         $this->init($conf);
 
@@ -106,7 +108,8 @@ 
      *
      * @return	string	linkt to image file with given label
      */
-    protected function getImage($page, $label) {
+    protected function getImage($page, $label)
+    {
 
         $image = array ();
 

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

@@ -41,7 +41,7 @@
         // Load current document.
         $this->loadDocument();
 
-        if ($this->doc === NULL || $this->doc->numPages < 1 || empty($this->conf['fileGrpsImageDownload'])) {
+        if ($this->doc === null || $this->doc->numPages < 1 || empty($this->conf['fileGrpsImageDownload'])) {
 
             // Quit without doing anything if required variables are not set.
             return $content;

plugins/toolbox/tools/imagemanipulation/class.tx_dlf_toolsImagemanipulation.php

Spacing +9 added lines, -9 removed lines

@@ -53,15 +53,15 @@
         }
 
         $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>';
+            .$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->cObj->substituteMarkerArray($this->template, $markerArray);
 

Braces +4 added lines, -2 removed lines

@@ -17,7 +17,8 @@ 
  * @subpackage	tx_dlf
  * @access	public
  */
-class tx_dlf_toolsImagemanipulation extends tx_dlf_plugin {
+class tx_dlf_toolsImagemanipulation extends tx_dlf_plugin
+{
 
     public $scriptRelPath = 'plugins/toolbox/tools/imagemanipulation/class.tx_dlf_toolsImagemanipulation.php';
 
@@ -31,7 +32,8 @@ 
      *
      * @return	string		The content that is displayed on the website
      */
-    public function main($content, $conf) {
+    public function main($content, $conf)
+    {
 
         $this->init($conf);
 

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

@@ -53,15 +53,15 @@
         }
 
         $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>';
+            .$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->cObj->substituteMarkerArray($this->template, $markerArray);
 

plugins/toolbox/class.tx_dlf_toolbox.php

Spacing +2 added lines, -2 removed lines

@@ -54,7 +54,7 @@ 
         }
 
         // Build data array.
-        $data = array (
+        $data = array(
             'conf' => $this->conf,
             'piVars' => $this->piVars,
         );
@@ -73,7 +73,7 @@ 
 
             $cObj->data = $data;
 
-            $content .= $this->cObj->substituteMarkerArray($subpart, array ('###TOOL###' => $cObj->cObjGetSingle($GLOBALS['TSFE']->tmpl->setup['plugin.'][$tool], $GLOBALS['TSFE']->tmpl->setup['plugin.'][$tool.'.'])));
+            $content .= $this->cObj->substituteMarkerArray($subpart, array('###TOOL###' => $cObj->cObjGetSingle($GLOBALS['TSFE']->tmpl->setup['plugin.'][$tool], $GLOBALS['TSFE']->tmpl->setup['plugin.'][$tool . '.'])));
 
         }
 

Braces +4 added lines, -2 removed lines

@@ -17,7 +17,8 @@ 
  * @subpackage	tx_dlf
  * @access	public
  */
-class tx_dlf_toolbox extends tx_dlf_plugin {
+class tx_dlf_toolbox extends tx_dlf_plugin
+{
 
     public $scriptRelPath = 'plugins/toolbox/class.tx_dlf_toolbox.php';
 
@@ -31,7 +32,8 @@ 
      *
      * @return	string		The content that is displayed on the website
      */
-    public function main($content, $conf) {
+    public function main($content, $conf)
+    {
 
         $this->init($conf);
 

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

@@ -77,7 +77,7 @@
 
         }
 
-        return $this->pi_wrapInBaseClass($this->cObj->substituteSubpart($this->template, '###TOOLS###', $content, TRUE));
+        return $this->pi_wrapInBaseClass($this->cObj->substituteSubpart($this->template, '###TOOLS###', $content, true));
 
     }