kitodo / kitodo-presentation

plugins/listview/class.tx_dlf_listview.php

Braces +16 added lines, -8 removed lines

@@ -19,7 +19,8 @@ 
  * @subpackage	tx_dlf
  * @access	public
  */
-class tx_dlf_listview extends tx_dlf_plugin {
+class tx_dlf_listview extends tx_dlf_plugin
+{
 
     public $scriptRelPath = 'plugins/listview/class.tx_dlf_listview.php';
 
@@ -62,7 +63,8 @@ 
      *
      * @return	string		The rendered page browser ready for output
      */
-    protected function getPageBrowser() {
+    protected function getPageBrowser()
+    {
 
         // Get overall number of pages.
         $maxPages = intval(ceil($this->list->metadata['options']['numberOfToplevelHits'] / $this->conf['limit']));
@@ -146,7 +148,8 @@ 
      *
      * @return	string		The rendered entry ready for output
      */
-    protected function getEntry($number, $template) {
+    protected function getEntry($number, $template)
+    {
 
         $markerArray['###NUMBER###'] = $number + 1;
 
@@ -314,7 +317,8 @@ 
      *
      * @return	array		The parsed fieldwrap
      */
-    private function getFieldWrap($index_name, $wrap) {
+    private function getFieldWrap($index_name, $wrap)
+    {
 
         if (isset($this->fieldwrap[$index_name])) {
 
@@ -335,7 +339,8 @@ 
      *
      * @return	string		The rendered sorting dialog ready for output
      */
-    protected function getSortingForm() {
+    protected function getSortingForm()
+    {
 
         // Return nothing if there are no sortable metadata fields.
         if (!count($this->sortables)) {
@@ -416,7 +421,8 @@ 
      *
      * @return	string		The rendered entries ready for output
      */
-    protected function getSubEntries($number, $template) {
+    protected function getSubEntries($number, $template)
+    {
 
         $content = '';
 
@@ -590,7 +596,8 @@ 
      *
      * @return	void
      */
-    protected function loadConfig() {
+    protected function loadConfig()
+    {
 
         $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
             'tx_dlf_metadata.index_name AS index_name,tx_dlf_metadata.wrap AS wrap,tx_dlf_metadata.is_listed AS is_listed,tx_dlf_metadata.is_sortable AS is_sortable',
@@ -632,7 +639,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 +31 added lines, -31 removed lines

@@ -75,22 +75,22 @@ 
         }
 
         // Get separator.
-        $separator = $this->pi_getLL('separator', ' - ', TRUE);
+        $separator = $this->pi_getLL('separator', ' - ', true);
 
         // Add link to previous page.
         if ($this->piVars['pointer'] > 0) {
 
-            $output = $this->pi_linkTP_keepPIvars($this->pi_getLL('prevPage', '<', TRUE), array ('pointer' => $this->piVars['pointer'] - 1), TRUE).$separator;
+            $output = $this->pi_linkTP_keepPIvars($this->pi_getLL('prevPage', '<', true), array ('pointer' => $this->piVars['pointer'] - 1), true).$separator;
 
         } else {
 
-            $output = $this->pi_getLL('prevPage', '<', TRUE).$separator;
+            $output = $this->pi_getLL('prevPage', '<', true).$separator;
 
         }
 
         $i = 0;
 
-        $skip = NULL;
+        $skip = null;
 
         // Add links to pages.
         while ($i < $maxPages) {
@@ -99,21 +99,21 @@ 
 
                 if ($this->piVars['pointer'] != $i) {
 
-                    $output .= $this->pi_linkTP_keepPIvars(sprintf($this->pi_getLL('page', '%d', TRUE), $i + 1), array ('pointer' => $i), TRUE).$separator;
+                    $output .= $this->pi_linkTP_keepPIvars(sprintf($this->pi_getLL('page', '%d', true), $i + 1), array ('pointer' => $i), true).$separator;
 
                 } else {
 
-                    $output .= sprintf($this->pi_getLL('page', '%d', TRUE), $i + 1).$separator;
+                    $output .= sprintf($this->pi_getLL('page', '%d', true), $i + 1).$separator;
 
                 }
 
-                $skip = TRUE;
+                $skip = true;
 
-            } elseif ($skip === TRUE) {
+            } elseif ($skip === true) {
 
-                $output .= $this->pi_getLL('skip', '...', TRUE).$separator;
+                $output .= $this->pi_getLL('skip', '...', true).$separator;
 
-                $skip = FALSE;
+                $skip = false;
 
             }
 
@@ -124,11 +124,11 @@ 
         // Add link to next page.
         if ($this->piVars['pointer'] < $maxPages - 1) {
 
-            $output .= $this->pi_linkTP_keepPIvars($this->pi_getLL('nextPage', '&gt;', TRUE), array ('pointer' => $this->piVars['pointer'] + 1), TRUE);
+            $output .= $this->pi_linkTP_keepPIvars($this->pi_getLL('nextPage', '&gt;', true), array ('pointer' => $this->piVars['pointer'] + 1), true);
 
         } else {
 
-            $output .= $this->pi_getLL('nextPage', '&gt;', TRUE);
+            $output .= $this->pi_getLL('nextPage', '&gt;', true);
 
         }
 
@@ -180,7 +180,7 @@ 
                     // Get title of parent document if needed.
                     if (empty($value) && $this->conf['getTitle']) {
 
-                        $superiorTitle = tx_dlf_document::getTitle($this->list[$number]['uid'], TRUE);
+                        $superiorTitle = tx_dlf_document::getTitle($this->list[$number]['uid'], true);
 
                         if (!empty($superiorTitle)) {
 
@@ -213,7 +213,7 @@ 
                     $conf = array (
                         'useCacheHash' => 1,
                         'parameter' => $this->conf['targetPid'],
-                        'additionalParams' => \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, $additionalParams, '', TRUE, FALSE)
+                        'additionalParams' => \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, $additionalParams, '', true, false)
                     );
 
                     $value = $this->cObj->typoLink(htmlspecialchars($value), $conf);
@@ -291,16 +291,16 @@ 
             $conf = array (
                 'useCacheHash' => 1,
                 'parameter' => $this->conf['targetBasket'],
-                '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 = $this->cObj->typoLink($this->pi_getLL('addBasket', '', TRUE), $conf);
+            $link = $this->cObj->typoLink($this->pi_getLL('addBasket', '', true), $conf);
 
             $markerArray['###BASKETBUTTON###'] = $link;
 
         }
 
-        return $this->cObj->substituteMarkerArray($this->cObj->substituteSubpart($template['entry'], '###SUBTEMPLATE###', $subpart, TRUE), $markerArray);
+        return $this->cObj->substituteMarkerArray($this->cObj->substituteSubpart($template['entry'], '###SUBTEMPLATE###', $subpart, true), $markerArray);
 
     }
 
@@ -354,7 +354,7 @@ 
 
         if (!empty($this->piVars['logicalPage'])) {
 
-            $linkConf['additionalParams'] = \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, array ('logicalPage' => $this->piVars['logicalPage']), '', TRUE, FALSE);
+            $linkConf['additionalParams'] = \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, array ('logicalPage' => $this->piVars['logicalPage']), '', true, false);
 
         }
 
@@ -374,12 +374,12 @@ 
         // Select sort field.
         $uniqId = uniqid($prefix.'-');
 
-        $sorting .= '<label for="'.$uniqId.'">'.$this->pi_getLL('orderBy', '', TRUE).'</label><select id="'.$uniqId.'" name="'.$this->prefixId.'[order]" onchange="javascript:this.form.submit();">';
+        $sorting .= '<label for="'.$uniqId.'">'.$this->pi_getLL('orderBy', '', true).'</label><select id="'.$uniqId.'" name="'.$this->prefixId.'[order]" onchange="javascript:this.form.submit();">';
 
         // Add relevance sorting if this is a search result list.
         if ($this->list->metadata['options']['source'] == 'search') {
 
-            $sorting .= '<option value="score"'.(($this->list->metadata['options']['order'] == 'score') ? ' selected="selected"' : '').'>'.$this->pi_getLL('relevance', '', TRUE).'</option>';
+            $sorting .= '<option value="score"'.(($this->list->metadata['options']['order'] == 'score') ? ' selected="selected"' : '').'>'.$this->pi_getLL('relevance', '', true).'</option>';
 
         }
 
@@ -394,11 +394,11 @@ 
         // Select sort direction.
         $uniqId = uniqid($prefix.'-');
 
-        $sorting .= '<label for="'.$uniqId.'">'.$this->pi_getLL('direction', '', TRUE).'</label><select id="'.$uniqId.'" name="'.$this->prefixId.'[asc]" onchange="javascript:this.form.submit();">';
+        $sorting .= '<label for="'.$uniqId.'">'.$this->pi_getLL('direction', '', true).'</label><select id="'.$uniqId.'" name="'.$this->prefixId.'[asc]" onchange="javascript:this.form.submit();">';
 
-        $sorting .= '<option value="1" '.($this->list->metadata['options']['order.asc'] ? ' selected="selected"' : '').'>'.$this->pi_getLL('direction.asc', '', TRUE).'</option>';
+        $sorting .= '<option value="1" '.($this->list->metadata['options']['order.asc'] ? ' selected="selected"' : '').'>'.$this->pi_getLL('direction.asc', '', true).'</option>';
 
-        $sorting .= '<option value="0" '.(!$this->list->metadata['options']['order.asc'] ? ' selected="selected"' : '').'>'.$this->pi_getLL('direction.desc', '', TRUE).'</option>';
+        $sorting .= '<option value="0" '.(!$this->list->metadata['options']['order.asc'] ? ' selected="selected"' : '').'>'.$this->pi_getLL('direction.desc', '', true).'</option>';
 
         $sorting .= '</select></div></form>';
 
@@ -450,7 +450,7 @@ 
                         // Get title of parent document if needed.
                         if (empty($value) && $this->conf['getTitle']) {
 
-                            $superiorTitle = tx_dlf_document::getTitle($subpart['uid'], TRUE);
+                            $superiorTitle = tx_dlf_document::getTitle($subpart['uid'], true);
 
                             if (!empty($superiorTitle)) {
 
@@ -485,7 +485,7 @@ 
                             // we don't want cHash in case of search parameters
                             'useCacheHash' => empty($this->list->metadata['searchString']) ? 1 : 0,
                             'parameter' => $this->conf['targetPid'],
-                            'additionalParams' => \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, $additionalParams, '', TRUE, FALSE)
+                            'additionalParams' => \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, $additionalParams, '', true, false)
                         );
 
                         $value = $this->cObj->typoLink(htmlspecialchars($value), $conf);
@@ -566,10 +566,10 @@ 
                 $conf = array (
                     'useCacheHash' => 1,
                     'parameter' => $this->conf['targetBasket'],
-                    '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 = $this->cObj->typoLink($this->pi_getLL('addBasket', '', TRUE), $conf);
+                $link = $this->cObj->typoLink($this->pi_getLL('addBasket', '', true), $conf);
 
                 $markerArray['###SUBBASKETBUTTON###'] = $link;
 
@@ -579,7 +579,7 @@ 
 
         }
 
-        return $this->cObj->substituteSubpart($this->cObj->getSubpart($this->template, '###SUBTEMPLATE###'), '###SUBENTRY###', $content, TRUE);
+        return $this->cObj->substituteSubpart($this->cObj->getSubpart($this->template, '###SUBTEMPLATE###'), '###SUBENTRY###', $content, true);
 
     }
 
@@ -637,7 +637,7 @@ 
         $this->init($conf);
 
         // Don't cache the output.
-        $this->setCache(FALSE);
+        $this->setCache(false);
 
         // Load the list.
         $this->list = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('tx_dlf_list');
@@ -797,7 +797,7 @@ 
 
         } else {
 
-            $markerArray['###COUNT###'] = $this->pi_getLL('nohits', '', TRUE);
+            $markerArray['###COUNT###'] = $this->pi_getLL('nohits', '', true);
 
         }
 
@@ -805,7 +805,7 @@ 
 
         $markerArray['###SORTING###'] = $this->getSortingForm();
 
-        $content = $this->cObj->substituteMarkerArray($this->cObj->substituteSubpart($this->template, '###ENTRY###', $content, TRUE), $markerArray);
+        $content = $this->cObj->substituteMarkerArray($this->cObj->substituteSubpart($this->template, '###ENTRY###', $content, true), $markerArray);
 
         return $this->pi_wrapInBaseClass($content);
 

Spacing +42 added lines, -42 removed lines

@@ -29,7 +29,7 @@ 
      * @var	array
      * @access	private
      */
-    private $fieldwrap = array ();
+    private $fieldwrap = array();
 
     /**
      * This holds the list
@@ -45,7 +45,7 @@ 
      * @var	array
      * @access	protected
      */
-    protected $metadata = array ();
+    protected $metadata = array();
 
     /**
      * Array of sortable metadata
@@ -53,7 +53,7 @@ 
      * @var	array
      * @access	protected
      */
-    protected $sortables = array ();
+    protected $sortables = array();
 
     /**
      * Renders the page browser
@@ -80,11 +80,11 @@ 
         // Add link to previous page.
         if ($this->piVars['pointer'] > 0) {
 
-            $output = $this->pi_linkTP_keepPIvars($this->pi_getLL('prevPage', '<', TRUE), array ('pointer' => $this->piVars['pointer'] - 1), TRUE).$separator;
+            $output = $this->pi_linkTP_keepPIvars($this->pi_getLL('prevPage', '<', TRUE), array('pointer' => $this->piVars['pointer'] - 1), TRUE) . $separator;
 
         } else {
 
-            $output = $this->pi_getLL('prevPage', '<', TRUE).$separator;
+            $output = $this->pi_getLL('prevPage', '<', TRUE) . $separator;
 
         }
 
@@ -99,11 +99,11 @@ 
 
                 if ($this->piVars['pointer'] != $i) {
 
-                    $output .= $this->pi_linkTP_keepPIvars(sprintf($this->pi_getLL('page', '%d', TRUE), $i + 1), array ('pointer' => $i), TRUE).$separator;
+                    $output .= $this->pi_linkTP_keepPIvars(sprintf($this->pi_getLL('page', '%d', TRUE), $i + 1), array('pointer' => $i), TRUE) . $separator;
 
                 } else {
 
-                    $output .= sprintf($this->pi_getLL('page', '%d', TRUE), $i + 1).$separator;
+                    $output .= sprintf($this->pi_getLL('page', '%d', TRUE), $i + 1) . $separator;
 
                 }
 
@@ -111,7 +111,7 @@ 
 
             } elseif ($skip === TRUE) {
 
-                $output .= $this->pi_getLL('skip', '...', TRUE).$separator;
+                $output .= $this->pi_getLL('skip', '...', TRUE) . $separator;
 
                 $skip = FALSE;
 
@@ -124,7 +124,7 @@ 
         // Add link to next page.
         if ($this->piVars['pointer'] < $maxPages - 1) {
 
-            $output .= $this->pi_linkTP_keepPIvars($this->pi_getLL('nextPage', '&gt;', TRUE), array ('pointer' => $this->piVars['pointer'] + 1), TRUE);
+            $output .= $this->pi_linkTP_keepPIvars($this->pi_getLL('nextPage', '&gt;', TRUE), array('pointer' => $this->piVars['pointer'] + 1), TRUE);
 
         } else {
 
@@ -184,7 +184,7 @@ 
 
                         if (!empty($superiorTitle)) {
 
-                            $value = '['.$superiorTitle.']';
+                            $value = '[' . $superiorTitle . ']';
 
                         }
 
@@ -199,7 +199,7 @@ 
 
                     $imgAlt = htmlspecialchars($value);
 
-                    $additionalParams = array (
+                    $additionalParams = array(
                         'id' => $this->list[$number]['uid'],
                         'page' => $this->list[$number]['page']
                     );
@@ -210,7 +210,7 @@ 
 
                     }
 
-                    $conf = array (
+                    $conf = array(
                         'useCacheHash' => 1,
                         'parameter' => $this->conf['targetPid'],
                         'additionalParams' => \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, $additionalParams, '', TRUE, FALSE)
@@ -264,7 +264,7 @@ 
         // Add thumbnail.
         if (!empty($this->list[$number]['thumbnail'])) {
 
-            $markerArray['###THUMBNAIL###'] = '<img alt="'.$imgAlt.'" src="'.$this->list[$number]['thumbnail'].'" />';
+            $markerArray['###THUMBNAIL###'] = '<img alt="' . $imgAlt . '" src="' . $this->list[$number]['thumbnail'] . '" />';
 
         }
 
@@ -286,9 +286,9 @@ 
 
         if (!empty($this->conf['basketButton']) && !empty($this->conf['targetBasket'])) {
 
-            $additionalParams = array ('id' => $this->list[$number]['uid'], 'startpage' => $this->list[$number]['page'], 'addToBasket' => 'list');
+            $additionalParams = array('id' => $this->list[$number]['uid'], 'startpage' => $this->list[$number]['page'], 'addToBasket' => 'list');
 
-            $conf = array (
+            $conf = array(
                 'useCacheHash' => 1,
                 'parameter' => $this->conf['targetBasket'],
                 'additionalParams' => \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, $additionalParams, '', TRUE, FALSE)
@@ -348,57 +348,57 @@ 
         $prefix = str_replace('_', '-', get_class($this));
 
         // Configure @action URL for form.
-        $linkConf = array (
+        $linkConf = array(
             'parameter' => $GLOBALS['TSFE']->id
         );
 
         if (!empty($this->piVars['logicalPage'])) {
 
-            $linkConf['additionalParams'] = \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, array ('logicalPage' => $this->piVars['logicalPage']), '', TRUE, FALSE);
+            $linkConf['additionalParams'] = \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, array('logicalPage' => $this->piVars['logicalPage']), '', TRUE, FALSE);
 
         }
 
         // Build HTML form.
-        $sorting = '<form action="'.$this->cObj->typoLink_URL($linkConf).'" method="get"><div><input type="hidden" name="id" value="'.$GLOBALS['TSFE']->id.'" />';
+        $sorting = '<form action="' . $this->cObj->typoLink_URL($linkConf) . '" method="get"><div><input type="hidden" name="id" value="' . $GLOBALS['TSFE']->id . '" />';
 
         foreach ($this->piVars as $piVar => $value) {
 
             if ($piVar != 'order' && $piVar != 'DATA' && !empty($value)) {
 
-                $sorting .= '<input type="hidden" name="'.$this->prefixId.'['.preg_replace('/[^A-Za-z0-9_-]/', '', $piVar).']" value="'.htmlspecialchars($value).'" />';
+                $sorting .= '<input type="hidden" name="' . $this->prefixId . '[' . preg_replace('/[^A-Za-z0-9_-]/', '', $piVar) . ']" value="' . htmlspecialchars($value) . '" />';
 
             }
 
         }
 
         // Select sort field.
-        $uniqId = uniqid($prefix.'-');
+        $uniqId = uniqid($prefix . '-');
 
-        $sorting .= '<label for="'.$uniqId.'">'.$this->pi_getLL('orderBy', '', TRUE).'</label><select id="'.$uniqId.'" name="'.$this->prefixId.'[order]" onchange="javascript:this.form.submit();">';
+        $sorting .= '<label for="' . $uniqId . '">' . $this->pi_getLL('orderBy', '', TRUE) . '</label><select id="' . $uniqId . '" name="' . $this->prefixId . '[order]" onchange="javascript:this.form.submit();">';
 
         // Add relevance sorting if this is a search result list.
         if ($this->list->metadata['options']['source'] == 'search') {
 
-            $sorting .= '<option value="score"'.(($this->list->metadata['options']['order'] == 'score') ? ' selected="selected"' : '').'>'.$this->pi_getLL('relevance', '', TRUE).'</option>';
+            $sorting .= '<option value="score"' . (($this->list->metadata['options']['order'] == 'score') ? ' selected="selected"' : '') . '>' . $this->pi_getLL('relevance', '', TRUE) . '</option>';
 
         }
 
         foreach ($this->sortables as $index_name => $label) {
 
-            $sorting .= '<option value="'.htmlspecialchars($index_name).'"'.(($this->list->metadata['options']['order'] == $index_name) ? ' selected="selected"' : '').'>'.htmlspecialchars($label).'</option>';
+            $sorting .= '<option value="' . htmlspecialchars($index_name) . '"' . (($this->list->metadata['options']['order'] == $index_name) ? ' selected="selected"' : '') . '>' . htmlspecialchars($label) . '</option>';
 
         }
 
         $sorting .= '</select>';
 
         // Select sort direction.
-        $uniqId = uniqid($prefix.'-');
+        $uniqId = uniqid($prefix . '-');
 
-        $sorting .= '<label for="'.$uniqId.'">'.$this->pi_getLL('direction', '', TRUE).'</label><select id="'.$uniqId.'" name="'.$this->prefixId.'[asc]" onchange="javascript:this.form.submit();">';
+        $sorting .= '<label for="' . $uniqId . '">' . $this->pi_getLL('direction', '', TRUE) . '</label><select id="' . $uniqId . '" name="' . $this->prefixId . '[asc]" onchange="javascript:this.form.submit();">';
 
-        $sorting .= '<option value="1" '.($this->list->metadata['options']['order.asc'] ? ' selected="selected"' : '').'>'.$this->pi_getLL('direction.asc', '', TRUE).'</option>';
+        $sorting .= '<option value="1" ' . ($this->list->metadata['options']['order.asc'] ? ' selected="selected"' : '') . '>' . $this->pi_getLL('direction.asc', '', TRUE) . '</option>';
 
-        $sorting .= '<option value="0" '.(!$this->list->metadata['options']['order.asc'] ? ' selected="selected"' : '').'>'.$this->pi_getLL('direction.desc', '', TRUE).'</option>';
+        $sorting .= '<option value="0" ' . (!$this->list->metadata['options']['order.asc'] ? ' selected="selected"' : '') . '>' . $this->pi_getLL('direction.desc', '', TRUE) . '</option>';
 
         $sorting .= '</select></div></form>';
 
@@ -454,7 +454,7 @@ 
 
                             if (!empty($superiorTitle)) {
 
-                                $value = '['.$superiorTitle.']';
+                                $value = '[' . $superiorTitle . ']';
 
                             }
 
@@ -469,7 +469,7 @@ 
 
                         $imgAlt = htmlspecialchars($value);
 
-                        $additionalParams = array (
+                        $additionalParams = array(
                             'id' => $subpart['uid'],
                             'page' => $subpart['page'],
                             'highlight_word' => $highlight_word
@@ -481,7 +481,7 @@ 
 
                         }
 
-                        $conf = array (
+                        $conf = array(
                             // we don't want cHash in case of search parameters
                             'useCacheHash' => empty($this->list->metadata['searchString']) ? 1 : 0,
                             'parameter' => $this->conf['targetPid'],
@@ -505,7 +505,7 @@ 
                         // Add page number for single pages.
                         if ($_value == 'page') {
 
-                            $value .= ' '.intval($subpart['page']);
+                            $value .= ' ' . intval($subpart['page']);
 
                         }
 
@@ -545,7 +545,7 @@ 
             // Add thumbnail.
             if (!empty($subpart['thumbnail'])) {
 
-                $markerArray['###SUBTHUMBNAIL###'] = '<img alt="'.$imgAlt.'" src="'.$subpart['thumbnail'].'" />';
+                $markerArray['###SUBTHUMBNAIL###'] = '<img alt="' . $imgAlt . '" src="' . $subpart['thumbnail'] . '" />';
 
             }
 
@@ -561,9 +561,9 @@ 
 
             if (!empty($this->conf['basketButton']) && !empty($this->conf['targetBasket'])) {
 
-                $additionalParams = array ('id' => $this->list[$number]['uid'], 'startpage' => $subpart['page'], 'endpage' => $subpart['page'], 'logId' => $subpart['sid'], 'addToBasket' => 'subentry');
+                $additionalParams = array('id' => $this->list[$number]['uid'], 'startpage' => $subpart['page'], 'endpage' => $subpart['page'], 'logId' => $subpart['sid'], 'addToBasket' => 'subentry');
 
-                $conf = array (
+                $conf = array(
                     'useCacheHash' => 1,
                     'parameter' => $this->conf['targetBasket'],
                     'additionalParams' => \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, $additionalParams, '', TRUE, FALSE)
@@ -595,7 +595,7 @@ 
         $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
             'tx_dlf_metadata.index_name AS index_name,tx_dlf_metadata.wrap AS wrap,tx_dlf_metadata.is_listed AS is_listed,tx_dlf_metadata.is_sortable AS is_sortable',
             'tx_dlf_metadata',
-            '(tx_dlf_metadata.is_listed=1 OR tx_dlf_metadata.is_sortable=1) AND tx_dlf_metadata.pid='.intval($this->conf['pages']).tx_dlf_helper::whereClause('tx_dlf_metadata'),
+            '(tx_dlf_metadata.is_listed=1 OR tx_dlf_metadata.is_sortable=1) AND tx_dlf_metadata.pid=' . intval($this->conf['pages']) . tx_dlf_helper::whereClause('tx_dlf_metadata'),
             '',
             'tx_dlf_metadata.sorting ASC',
             ''
@@ -605,7 +605,7 @@ 
 
             if ($resArray['is_listed']) {
 
-                $this->metadata[$resArray['index_name']] = array (
+                $this->metadata[$resArray['index_name']] = array(
                     'wrap' => $resArray['wrap'],
                     'label' => tx_dlf_helper::translate($resArray['index_name'], 'tx_dlf_metadata', $this->conf['pages'])
                 );
@@ -678,7 +678,7 @@ 
                 || (isset($this->piVars['asc']) && $this->piVars['asc'] != $listMetadata['options']['order.asc'])) {
 
                 // Update list's metadata.
-                $listMetadata['options']['params']['sort'] = array ($this->piVars['order']."_sorting" => (boolean) $this->piVars['asc']?'asc':'desc');
+                $listMetadata['options']['params']['sort'] = array($this->piVars['order'] . "_sorting" => (boolean) $this->piVars['asc'] ? 'asc' : 'desc');
 
                 $listMetadata['options']['order'] = $this->piVars['order'];
                 $listMetadata['options']['order.asc'] = (boolean) $this->piVars['asc'];
@@ -702,7 +702,7 @@ 
 
                     if (TYPO3_DLOG) {
 
-                        \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_listview->main('.$content.', [data])] Apache Solr not available', $this->extKey, SYSLOG_SEVERITY_ERROR, $conf);
+                        \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_listview->main(' . $content . ', [data])] Apache Solr not available', $this->extKey, SYSLOG_SEVERITY_ERROR, $conf);
 
                     }
 
@@ -711,7 +711,7 @@ 
                 }
 
                 // Set search parameters.
-                $solr->cPid =  $listMetadata['options']['pid'];
+                $solr->cPid = $listMetadata['options']['pid'];
                 $solr->params = $listMetadata['options']['params'];
 
                 // Perform search.
@@ -720,7 +720,7 @@ 
             }
 
             // Add list description
-            $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>';
+            $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>';
             $this->list->metadata = $listMetadata;
 
             // Save updated list.
@@ -780,7 +780,7 @@ 
 
         if (!empty($this->list->metadata['thumbnail'])) {
 
-            $markerArray['###LISTTHUMBNAIL###'] = '<img alt="" src="'.$this->list->metadata['thumbnail'].'" />';
+            $markerArray['###LISTTHUMBNAIL###'] = '<img alt="" src="' . $this->list->metadata['thumbnail'] . '" />';
 
         } else {
 
@@ -790,7 +790,7 @@ 
 
         if ($currentEntry) {
 
-            $currentEntry =  ($this->piVars['pointer'] * $this->conf['limit']) + 1;
+            $currentEntry = ($this->piVars['pointer'] * $this->conf['limit']) + 1;
             $lastEntry = ($this->piVars['pointer'] * $this->conf['limit']) + $this->conf['limit'];
 
             $markerArray['###COUNT###'] = htmlspecialchars(sprintf($this->pi_getLL('count'), $currentEntry, $lastEntry < $this->list->metadata['options']['numberOfToplevelHits'] ? $lastEntry : $this->list->metadata['options']['numberOfToplevelHits'], $this->list->metadata['options']['numberOfToplevelHits']));

hooks/class.tx_dlf_tceforms.php

Spacing +8 added lines, -8 removed lines

@@ -34,11 +34,11 @@ 
         $output = '<div style="padding:5px; background-color:#000000;">';
 
         // Simulate TCA field type "passthrough".
-        $output .= '<input type="hidden" name="'.$params['itemFormElName'].'" value="'.$params['itemFormElValue'].'" />';
+        $output .= '<input type="hidden" name="' . $params['itemFormElName'] . '" value="' . $params['itemFormElValue'] . '" />';
 
         if (!empty($params['itemFormElValue'])) {
 
-            $output .= '<img alt="" src="'.$params['itemFormElValue'].'" />';
+            $output .= '<img alt="" src="' . $params['itemFormElValue'] . '" />';
 
         }
 
@@ -94,7 +94,7 @@ 
                 $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
                     'label,uid',
                     'tx_dlf_collections',
-                    'pid='.intval($pages).' AND (sys_language_uid IN (-1,0) OR l18n_parent=0)'.tx_dlf_helper::whereClause('tx_dlf_collections'),
+                    'pid=' . intval($pages) . ' AND (sys_language_uid IN (-1,0) OR l18n_parent=0)' . tx_dlf_helper::whereClause('tx_dlf_collections'),
                     '',
                     'label',
                     ''
@@ -162,7 +162,7 @@ 
                 $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
                     'label,index_name',
                     'tx_dlf_metadata',
-                    'index_indexed=1 AND pid='.intval($pages).' AND (sys_language_uid IN (-1,0) OR l18n_parent=0)'.tx_dlf_helper::whereClause('tx_dlf_metadata'),
+                    'index_indexed=1 AND pid=' . intval($pages) . ' AND (sys_language_uid IN (-1,0) OR l18n_parent=0)' . tx_dlf_helper::whereClause('tx_dlf_metadata'),
                     '',
                     'sorting',
                     ''
@@ -230,7 +230,7 @@ 
                 $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
                     'label,index_name',
                     'tx_dlf_metadata',
-                    'is_facet=1 AND pid='.intval($pages).' AND (sys_language_uid IN (-1,0) OR l18n_parent=0)'.tx_dlf_helper::whereClause('tx_dlf_metadata'),
+                    'is_facet=1 AND pid=' . intval($pages) . ' AND (sys_language_uid IN (-1,0) OR l18n_parent=0)' . tx_dlf_helper::whereClause('tx_dlf_metadata'),
                     '',
                     'sorting',
                     ''
@@ -298,7 +298,7 @@ 
                 $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
                     'label,uid',
                     'tx_dlf_libraries',
-                    'pid='.intval($pages).' AND (sys_language_uid IN (-1,0) OR l18n_parent=0)'.tx_dlf_helper::whereClause('tx_dlf_libraries'),
+                    'pid=' . intval($pages) . ' AND (sys_language_uid IN (-1,0) OR l18n_parent=0)' . tx_dlf_helper::whereClause('tx_dlf_libraries'),
                     '',
                     'label',
                     ''
@@ -366,7 +366,7 @@ 
                 $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
                     'label,uid',
                     'tx_dlf_solrcores',
-                    'pid IN ('.intval($pages).',0)'.tx_dlf_helper::whereClause('tx_dlf_solrcores'),
+                    'pid IN (' . intval($pages) . ',0)' . tx_dlf_helper::whereClause('tx_dlf_solrcores'),
                     '',
                     'label',
                     ''
@@ -402,7 +402,7 @@ 
 
         foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/plugins/toolbox/tools'] as $class => $label) {
 
-            $params['items'][] = array ($GLOBALS['LANG']->sL($label), $class);
+            $params['items'][] = array($GLOBALS['LANG']->sL($label), $class);
 
         }
 

Braces +16 added lines, -8 removed lines

@@ -17,7 +17,8 @@ 
  * @subpackage	tx_dlf
  * @access	public
  */
-class tx_dlf_tceforms {
+class tx_dlf_tceforms
+{
 
     /**
      * Helper to display document's thumbnail for table "tx_dlf_documents"
@@ -29,7 +30,8 @@ 
      *
      * @return	string		HTML <img> tag for thumbnail
      */
-    public function displayThumbnail(&$params, &$pObj) {
+    public function displayThumbnail(&$params, &$pObj)
+    {
 
         $output = '<div style="padding:5px; background-color:#000000;">';
 
@@ -58,7 +60,8 @@ 
      *
      * @return	void
      */
-    public function itemsProcFunc_collectionList(&$params, &$pObj) {
+    public function itemsProcFunc_collectionList(&$params, &$pObj)
+    {
 
         // the access to pi_flexform data has changed in TYPO3 7.6
         if (version_compare(TYPO3_version, '7.6', '<')) {
@@ -126,7 +129,8 @@ 
      *
      * @return	void
      */
-    public function itemsProcFunc_extendedSearchList(&$params, &$pObj) {
+    public function itemsProcFunc_extendedSearchList(&$params, &$pObj)
+    {
 
         // the access to pi_flexform data has changed in TYPO3 7.6
         if (version_compare(TYPO3_version, '7.6', '<')) {
@@ -194,7 +198,8 @@ 
      *
      * @return	void
      */
-    public function itemsProcFunc_facetsList(&$params, &$pObj) {
+    public function itemsProcFunc_facetsList(&$params, &$pObj)
+    {
 
         // the access to pi_flexform data has changed in TYPO3 7.6
         if (version_compare(TYPO3_version, '7.6', '<')) {
@@ -262,7 +267,8 @@ 
      *
      * @return	void
      */
-    public function itemsProcFunc_libraryList(&$params, &$pObj) {
+    public function itemsProcFunc_libraryList(&$params, &$pObj)
+    {
 
         // the access to pi_flexform data has changed in TYPO3 7.6
         if (version_compare(TYPO3_version, '7.6', '<')) {
@@ -330,7 +336,8 @@ 
      *
      * @return	void
      */
-    public function itemsProcFunc_solrList(&$params, &$pObj) {
+    public function itemsProcFunc_solrList(&$params, &$pObj)
+    {
 
         // the access to pi_flexform data has changed in TYPO3 7.6
         if (version_compare(TYPO3_version, '7.6', '<')) {
@@ -398,7 +405,8 @@ 
      *
      * @return	void
      */
-    public function itemsProcFunc_toolList(&$params, &$pObj) {
+    public function itemsProcFunc_toolList(&$params, &$pObj)
+    {
 
         foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/plugins/toolbox/tools'] as $class => $label) {
 

hooks/class.tx_dlf_hacks.php

Spacing +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
 
                 }
 
-                $recordIds = $xml->xpath('//mets:dmdSec[@ID="'.$id.'"]//mods:mods/mods:recordInfo/mods:recordIdentifier');
+                $recordIds = $xml->xpath('//mets:dmdSec[@ID="' . $id . '"]//mods:mods/mods:recordInfo/mods:recordIdentifier');
 
                 if (!empty($recordIds[0])) {
 

Braces +4 added lines, -2 removed lines

@@ -17,7 +17,8 @@ 
  * @subpackage	tx_dlf
  * @access	public
  */
-class tx_dlf_hacks {
+class tx_dlf_hacks
+{
 
     /**
      * Hook for the __construct() method of dlf/common/class.tx_dlf_document.php
@@ -31,7 +32,8 @@ 
      *
      * @return	void
      */
-    public function construct_postProcessRecordId(SimpleXMLElement &$xml, &$record_id) {
+    public function construct_postProcessRecordId(SimpleXMLElement &$xml, &$record_id)
+    {
 
         if (!$record_id) {
 

hooks/class.tx_dlf_em.php

Spacing +31 added lines, -31 removed lines

@@ -25,7 +25,7 @@ 
      * @var	array
      * @access protected
      */
-    protected $conf = array ();
+    protected $conf = array();
 
     /**
      * This holds the output ready to return
@@ -52,7 +52,7 @@ 
         // Prepend username and password to hostname.
         if (!empty($solrInfo['username']) && !empty($solrInfo['password'])) {
 
-            $host = $solrInfo['username'].':'.$solrInfo['password'].'@'.$solrInfo['host'];
+            $host = $solrInfo['username'] . ':' . $solrInfo['password'] . '@' . $solrInfo['host'];
 
         } else {
 
@@ -61,10 +61,10 @@ 
         }
 
         // Build request URI.
-        $url = $solrInfo['scheme'].'://'.$host.':'.$solrInfo['port'].'/'.$solrInfo['path'].'/admin/cores?wt=xml';
+        $url = $solrInfo['scheme'] . '://' . $host . ':' . $solrInfo['port'] . '/' . $solrInfo['path'] . '/admin/cores?wt=xml';
 
-        $context = stream_context_create(array (
-            'http' => array (
+        $context = stream_context_create(array(
+            'http' => array(
                 'method' => 'GET',
                 'user_agent' => (!empty($this->conf['useragent']) ? $this->conf['useragent'] : ini_get('user_agent'))
             )
@@ -129,7 +129,7 @@ 
         $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
             'uid,admin,usergroup',
             'be_users',
-            'username='.$GLOBALS['TYPO3_DB']->fullQuoteStr('_cli_dlf', 'be_users').\TYPO3\CMS\Backend\Utility\BackendUtility::deleteClause('be_users')
+            'username=' . $GLOBALS['TYPO3_DB']->fullQuoteStr('_cli_dlf', 'be_users') . \TYPO3\CMS\Backend\Utility\BackendUtility::deleteClause('be_users')
         );
 
         if ($GLOBALS['TYPO3_DB']->sql_num_rows($result) > 0) {
@@ -143,11 +143,11 @@ 
             $result2 = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
                 '1',
                 'be_users',
-                'uid='.intval($resArray['uid']).\TYPO3\CMS\Backend\Utility\BackendUtility::BEenableFields('be_users')
+                'uid=' . intval($resArray['uid']) . \TYPO3\CMS\Backend\Utility\BackendUtility::BEenableFields('be_users')
             );
 
             // Check if user is configured properly.
-            if (count(array_diff(array ($groupUid), $resArray['usergroup'])) == 0
+            if (count(array_diff(array($groupUid), $resArray['usergroup'])) == 0
                     && !$resArray['admin']
                     && $GLOBALS['TYPO3_DB']->sql_num_rows($result2) > 0) {
 
@@ -166,11 +166,11 @@ 
                 if (!$checkOnly && $groupUid) {
 
                     // Keep exisiting values and add the new ones.
-                    $usergroup = array_unique(array_merge(array ($groupUid), $resArray['usergroup']));
+                    $usergroup = array_unique(array_merge(array($groupUid), $resArray['usergroup']));
 
                     // Try to configure user.
-                    $data = array ();
-                    $data['be_users'][$resArray['uid']] = array (
+                    $data = array();
+                    $data['be_users'][$resArray['uid']] = array(
                         'admin' => 0,
                         'usergroup' => implode(',', $usergroup),
                         $GLOBALS['TCA']['be_users']['ctrl']['enablecolumns']['disabled'] => 0,
@@ -226,8 +226,8 @@ 
                 // Try to create user.
                 $tempUid = uniqid('NEW');
 
-                $data = array ();
-                $data['be_users'][$tempUid] = array (
+                $data = array();
+                $data['be_users'][$tempUid] = array(
                     'pid' => 0,
                     'username' => '_cli_dlf',
                     'password' => md5($tempUid),
@@ -292,7 +292,7 @@ 
      *
      * @return	integer		UID of usergroup or 0 if something is wrong
      */
-    protected function checkCliGroup($checkOnly, $settings = array ()) {
+    protected function checkCliGroup($checkOnly, $settings = array()) {
 
         // Set default return value.
         $grpUid = 0;
@@ -300,9 +300,9 @@ 
         // Set default configuration for usergroup.
         if (empty($settings)) {
 
-            $settings = array (
-                'non_exclude_fields' => array (),
-                'tables_select' => array (
+            $settings = array(
+                'non_exclude_fields' => array(),
+                'tables_select' => array(
                     'tx_dlf_documents',
                     'tx_dlf_collections',
                     'tx_dlf_libraries',
@@ -312,7 +312,7 @@ 
                     'tx_dlf_formats',
                     'tx_dlf_solrcores'
                 ),
-                'tables_modify' => array (
+                'tables_modify' => array(
                     'tx_dlf_documents',
                     'tx_dlf_collections',
                     'tx_dlf_libraries'
@@ -326,7 +326,7 @@ 
 
                     if (!empty($fieldConf['exclude'])) {
 
-                        $settings['non_exclude_fields'][] = $table.':'.$field;
+                        $settings['non_exclude_fields'][] = $table . ':' . $field;
 
                     }
 
@@ -338,10 +338,10 @@ 
 
         // Check if group "_cli_dlf" exists and is not disabled.
         $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-            'uid,non_exclude_fields,tables_select,tables_modify,'.
+            'uid,non_exclude_fields,tables_select,tables_modify,' .
                 $GLOBALS['TCA']['be_groups']['ctrl']['enablecolumns']['disabled'],
             'be_groups',
-            'title='.$GLOBALS['TYPO3_DB']->fullQuoteStr('_cli_dlf', 'be_groups').
+            'title=' . $GLOBALS['TYPO3_DB']->fullQuoteStr('_cli_dlf', 'be_groups') .
                 \TYPO3\CMS\Backend\Utility\BackendUtility::deleteClause('be_groups')
         );
 
@@ -384,8 +384,8 @@ 
                     $tables_modify = array_unique(array_merge($settings['tables_modify'], $resArray['tables_modify']));
 
                     // Try to configure usergroup.
-                    $data = array ();
-                    $data['be_groups'][$resArray['uid']] = array (
+                    $data = array();
+                    $data['be_groups'][$resArray['uid']] = array(
                         'non_exclude_fields' => implode(',', $non_exclude_fields),
                         'tables_select' => implode(',', $tables_select),
                         'tables_modify' => implode(',', $tables_modify),
@@ -440,8 +440,8 @@ 
                 // Try to create usergroup.
                 $tempUid = uniqid('NEW');
 
-                $data = array ();
-                $data['be_groups'][$tempUid] = array (
+                $data = array();
+                $data['be_groups'][$tempUid] = array(
                     'pid' => 0,
                     'title' => '_cli_dlf',
                     'description' => $GLOBALS['LANG']->getLL('cliUserGroup.grpDescription'),
@@ -522,7 +522,7 @@ 
         $this->content .= $content;
 
         // Check if CLI dispatcher is executable.
-        if (is_executable(PATH_typo3.'cli_dispatch.phpsh')) {
+        if (is_executable(PATH_typo3 . 'cli_dispatch.phpsh')) {
 
             $message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
                 'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
@@ -562,7 +562,7 @@ 
      */
     public function checkMetadataFormats(&$params, &$pObj) {
 
-        $nsDefined = array (
+        $nsDefined = array(
             'MODS' => FALSE,
             'TEIHDR' => FALSE
         );
@@ -571,7 +571,7 @@ 
         $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
             'type',
             'tx_dlf_formats',
-            '(type='.$GLOBALS['TYPO3_DB']->fullQuoteStr('MODS', 'tx_dlf_formats').' OR type='.$GLOBALS['TYPO3_DB']->fullQuoteStr('TEIHDR', 'tx_dlf_formats').')'.tx_dlf_helper::whereClause('tx_dlf_formats')
+            '(type=' . $GLOBALS['TYPO3_DB']->fullQuoteStr('MODS', 'tx_dlf_formats') . ' OR type=' . $GLOBALS['TYPO3_DB']->fullQuoteStr('TEIHDR', 'tx_dlf_formats') . ')' . tx_dlf_helper::whereClause('tx_dlf_formats')
         );
 
         while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
@@ -581,12 +581,12 @@ 
         }
 
         // Build data array.
-        $data = array ();
+        $data = array();
 
         // Add MODS namespace.
         if (!$nsDefined['MODS']) {
 
-            $data['tx_dlf_formats'][uniqid('NEW')] = array (
+            $data['tx_dlf_formats'][uniqid('NEW')] = array(
                 'pid' => 0,
                 'type' => 'MODS',
                 'root' => 'mods',
@@ -599,7 +599,7 @@ 
         // Add TEIHDR namespace.
         if (!$nsDefined['TEIHDR']) {
 
-            $data['tx_dlf_formats'][uniqid('NEW')] = array (
+            $data['tx_dlf_formats'][uniqid('NEW')] = array(
                 'pid' => 0,
                 'type' => 'TEIHDR',
                 'root' => 'teiHeader',

Braces +14 added lines, -7 removed lines

@@ -17,7 +17,8 @@ 
  * @subpackage	tx_dlf
  * @access	public
  */
-class tx_dlf_em {
+class tx_dlf_em
+{
 
     /**
      * This holds the current configuration
@@ -45,7 +46,8 @@ 
      *
      * @return	string		Message informing the user of success or failure
      */
-    public function checkSolrConnection(&$params, &$pObj) {
+    public function checkSolrConnection(&$params, &$pObj)
+    {
 
         $solrInfo = tx_dlf_solr::getSolrConnectionInfo();
 
@@ -120,7 +122,8 @@ 
      *
      * @return	integer		UID of user or 0 if something is wrong
      */
-    protected function checkCliUser($checkOnly, $groupUid) {
+    protected function checkCliUser($checkOnly, $groupUid)
+    {
 
         // Set default return value.
         $usrUid = 0;
@@ -292,7 +295,8 @@ 
      *
      * @return	integer		UID of usergroup or 0 if something is wrong
      */
-    protected function checkCliGroup($checkOnly, $settings = array ()) {
+    protected function checkCliGroup($checkOnly, $settings = array ())
+    {
 
         // Set default return value.
         $grpUid = 0;
@@ -507,7 +511,8 @@ 
      *
      * @return	string		Message informing the user of success or failure
      */
-    public function checkCliUserGroup(&$params, &$pObj) {
+    public function checkCliUserGroup(&$params, &$pObj)
+    {
 
         // Check if usergroup "_cli_dlf" exists and is configured properly.
         $groupUid = $this->checkCliGroup(empty($this->conf['makeCliUserGroup']));
@@ -560,7 +565,8 @@ 
      *
      * @return	string		Message informing the user of success or failure
      */
-    public function checkMetadataFormats(&$params, &$pObj) {
+    public function checkMetadataFormats(&$params, &$pObj)
+    {
 
         $nsDefined = array (
             'MODS' => FALSE,
@@ -661,7 +667,8 @@ 
      *
      * @return	void
      */
-    public function __construct() {
+    public function __construct()
+    {
 
         // Load localization file.
         $GLOBALS['LANG']->includeLLFile('EXT:dlf/locallang.xml');

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

@@ -71,7 +71,7 @@ 
         ));
 
         // Try to connect to Solr server.
-        $response = @simplexml_load_string(file_get_contents($url, FALSE, $context));
+        $response = @simplexml_load_string(file_get_contents($url, false, $context));
 
         // Check status code.
         if ($response) {
@@ -85,7 +85,7 @@ 
                     sprintf($GLOBALS['LANG']->getLL('solr.status'), (string) $status[0]),
                     $GLOBALS['LANG']->getLL('solr.connected'),
                     ($status[0] == 0 ? \TYPO3\CMS\Core\Messaging\FlashMessage::OK : \TYPO3\CMS\Core\Messaging\FlashMessage::WARNING),
-                    FALSE
+                    false
                 );
 
                 $this->content .= $message->render();
@@ -101,7 +101,7 @@ 
             sprintf($GLOBALS['LANG']->getLL('solr.error'), $url),
             $GLOBALS['LANG']->getLL('solr.notConnected'),
             \TYPO3\CMS\Core\Messaging\FlashMessage::WARNING,
-            FALSE
+            false
         );
 
         $this->content .= $message->render();
@@ -158,7 +158,7 @@ 
                     $GLOBALS['LANG']->getLL('cliUserGroup.usrOkayMsg'),
                     $GLOBALS['LANG']->getLL('cliUserGroup.usrOkay'),
                     \TYPO3\CMS\Core\Messaging\FlashMessage::OK,
-                    FALSE
+                    false
                 );
 
             } else {
@@ -181,7 +181,7 @@ 
                     tx_dlf_helper::processDBasAdmin($data);
 
                     // Check if configuration was successful.
-                    if ($this->checkCliUser(TRUE, $groupUid)) {
+                    if ($this->checkCliUser(true, $groupUid)) {
 
                         $usrUid = $resArray['uid'];
 
@@ -190,7 +190,7 @@ 
                             $GLOBALS['LANG']->getLL('cliUserGroup.usrConfiguredMsg'),
                             $GLOBALS['LANG']->getLL('cliUserGroup.usrConfigured'),
                             \TYPO3\CMS\Core\Messaging\FlashMessage::INFO,
-                            FALSE
+                            false
                         );
 
                     } else {
@@ -200,7 +200,7 @@ 
                             $GLOBALS['LANG']->getLL('cliUserGroup.usrNotConfiguredMsg'),
                             $GLOBALS['LANG']->getLL('cliUserGroup.usrNotConfigured'),
                             \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
-                            FALSE
+                            false
                         );
 
                     }
@@ -212,7 +212,7 @@ 
                         $GLOBALS['LANG']->getLL('cliUserGroup.usrNotConfiguredMsg'),
                         $GLOBALS['LANG']->getLL('cliUserGroup.usrNotConfigured'),
                         \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
-                        FALSE
+                        false
                     );
 
                 }
@@ -247,7 +247,7 @@ 
                         $GLOBALS['LANG']->getLL('cliUserGroup.usrCreatedMsg'),
                         $GLOBALS['LANG']->getLL('cliUserGroup.usrCreated'),
                         \TYPO3\CMS\Core\Messaging\FlashMessage::INFO,
-                        FALSE
+                        false
                     );
 
                 } else {
@@ -257,7 +257,7 @@ 
                         $GLOBALS['LANG']->getLL('cliUserGroup.usrNotCreatedMsg'),
                         $GLOBALS['LANG']->getLL('cliUserGroup.usrNotCreated'),
                         \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
-                        FALSE
+                        false
                     );
 
                 }
@@ -269,7 +269,7 @@ 
                     $GLOBALS['LANG']->getLL('cliUserGroup.usrNotCreatedMsg'),
                     $GLOBALS['LANG']->getLL('cliUserGroup.usrNotCreated'),
                     \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
-                    FALSE
+                    false
                 );
 
             }
@@ -369,7 +369,7 @@ 
                     $GLOBALS['LANG']->getLL('cliUserGroup.grpOkayMsg'),
                     $GLOBALS['LANG']->getLL('cliUserGroup.grpOkay'),
                     \TYPO3\CMS\Core\Messaging\FlashMessage::OK,
-                    FALSE
+                    false
                 );
 
             } else {
@@ -395,7 +395,7 @@ 
                     tx_dlf_helper::processDBasAdmin($data);
 
                     // Check if configuration was successful.
-                    if ($this->checkCliGroup(TRUE, $settings)) {
+                    if ($this->checkCliGroup(true, $settings)) {
 
                         $grpUid = $resArray['uid'];
 
@@ -404,7 +404,7 @@ 
                             $GLOBALS['LANG']->getLL('cliUserGroup.grpConfiguredMsg'),
                             $GLOBALS['LANG']->getLL('cliUserGroup.grpConfigured'),
                             \TYPO3\CMS\Core\Messaging\FlashMessage::INFO,
-                            FALSE
+                            false
                         );
 
                     } else {
@@ -414,7 +414,7 @@ 
                             $GLOBALS['LANG']->getLL('cliUserGroup.grpNotConfiguredMsg'),
                             $GLOBALS['LANG']->getLL('cliUserGroup.grpNotConfigured'),
                             \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
-                            FALSE
+                            false
                         );
 
                     }
@@ -426,7 +426,7 @@ 
                         $GLOBALS['LANG']->getLL('cliUserGroup.grpNotConfiguredMsg'),
                         $GLOBALS['LANG']->getLL('cliUserGroup.grpNotConfigured'),
                         \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
-                        FALSE
+                        false
                     );
 
                 }
@@ -462,7 +462,7 @@ 
                         $GLOBALS['LANG']->getLL('cliUserGroup.grpCreatedMsg'),
                         $GLOBALS['LANG']->getLL('cliUserGroup.grpCreated'),
                         \TYPO3\CMS\Core\Messaging\FlashMessage::INFO,
-                        FALSE
+                        false
                     );
 
                 } else {
@@ -472,7 +472,7 @@ 
                         $GLOBALS['LANG']->getLL('cliUserGroup.grpNotCreatedMsg'),
                         $GLOBALS['LANG']->getLL('cliUserGroup.grpNotCreated'),
                         \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
-                        FALSE
+                        false
                     );
 
                 }
@@ -484,7 +484,7 @@ 
                     $GLOBALS['LANG']->getLL('cliUserGroup.grpNotCreatedMsg'),
                     $GLOBALS['LANG']->getLL('cliUserGroup.grpNotCreated'),
                     \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
-                    FALSE
+                    false
                 );
 
             }
@@ -529,7 +529,7 @@ 
                 $GLOBALS['LANG']->getLL('cliUserGroup.cliOkayMsg'),
                 $GLOBALS['LANG']->getLL('cliUserGroup.cliOkay'),
                 \TYPO3\CMS\Core\Messaging\FlashMessage::OK,
-                FALSE
+                false
             );
 
         } else {
@@ -539,7 +539,7 @@ 
                 $GLOBALS['LANG']->getLL('cliUserGroup.cliNotOkayMsg'),
                 $GLOBALS['LANG']->getLL('cliUserGroup.cliNotOkay'),
                 \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
-                FALSE
+                false
             );
 
         }
@@ -563,8 +563,8 @@ 
     public function checkMetadataFormats(&$params, &$pObj) {
 
         $nsDefined = array (
-            'MODS' => FALSE,
-            'TEIHDR' => FALSE
+            'MODS' => false,
+            'TEIHDR' => false
         );
 
         // Check if formats "MODS" and "TEIHDR" exist.
@@ -576,7 +576,7 @@ 
 
         while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
 
-            $nsDefined[$resArray['type']] = TRUE;
+            $nsDefined[$resArray['type']] = true;
 
         }
 
@@ -621,7 +621,7 @@ 
                     $GLOBALS['LANG']->getLL('metadataFormats.nsCreatedMsg'),
                     $GLOBALS['LANG']->getLL('metadataFormats.nsCreated'),
                     \TYPO3\CMS\Core\Messaging\FlashMessage::INFO,
-                    FALSE
+                    false
                 );
 
             } else {
@@ -631,7 +631,7 @@ 
                     $GLOBALS['LANG']->getLL('metadataFormats.nsNotCreatedMsg'),
                     $GLOBALS['LANG']->getLL('metadataFormats.nsNotCreated'),
                     \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
-                    FALSE
+                    false
                 );
 
             }
@@ -643,7 +643,7 @@ 
                 $GLOBALS['LANG']->getLL('metadataFormats.nsOkayMsg'),
                 $GLOBALS['LANG']->getLL('metadataFormats.nsOkay'),
                 \TYPO3\CMS\Core\Messaging\FlashMessage::OK,
-                FALSE
+                false
             );
 
         }

hooks/class.tx_dlf_tcemain.php

Spacing +22 added lines, -22 removed lines

@@ -119,7 +119,7 @@ 
                     // Prepend username and password to hostname.
                     if ($solrInfo['username'] && $solrInfo['password']) {
 
-                        $host = $solrInfo['username'].':'.$solrInfo['password'].'@'.$solrInfo['host'];
+                        $host = $solrInfo['username'] . ':' . $solrInfo['password'] . '@' . $solrInfo['host'];
 
                     } else {
 
@@ -127,8 +127,8 @@ 
 
                     }
 
-                    $context = stream_context_create(array (
-                        'http' => array (
+                    $context = stream_context_create(array(
+                        'http' => array(
                             'method' => 'GET',
                             'user_agent' => ($conf['useragent'] ? $conf['useragent'] : ini_get('user_agent'))
                         )
@@ -136,7 +136,7 @@ 
 
                     // Build request for adding new Solr core.
                     // @see http://wiki.apache.org/solr/CoreAdmin
-                    $url = $solrInfo['scheme'].'://'.$host.':'.$solrInfo['port'].'/'.$solrInfo['path'].'/admin/cores?wt=xml&action=CREATE&name=dlfCore'.$coreNumber.'&instanceDir=dlfCore'.$coreNumber.'&dataDir=data&configSet=dlf';
+                    $url = $solrInfo['scheme'] . '://' . $host . ':' . $solrInfo['port'] . '/' . $solrInfo['path'] . '/admin/cores?wt=xml&action=CREATE&name=dlfCore' . $coreNumber . '&instanceDir=dlfCore' . $coreNumber . '&dataDir=data&configSet=dlf';
 
                     $response = @simplexml_load_string(file_get_contents($url, FALSE, $context));
 
@@ -147,7 +147,7 @@ 
 
                         if ($status && $status[0] == 0) {
 
-                            $fieldArray['index_name'] = 'dlfCore'.$coreNumber;
+                            $fieldArray['index_name'] = 'dlfCore' . $coreNumber;
 
                             return;
 
@@ -157,12 +157,12 @@ 
 
                     if (TYPO3_DLOG) {
 
-                        \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_tcemain->processDatamap_postProcessFieldArray('.$status.', '.$table.', '.$id.', [data], ['.get_class($pObj).'])] Could not create new Apache Solr core "dlfCore'.$coreNumber.'"', $this->extKey, SYSLOG_SEVERITY_ERROR, $fieldArray);
+                        \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_tcemain->processDatamap_postProcessFieldArray(' . $status . ', ' . $table . ', ' . $id . ', [data], [' . get_class($pObj) . '])] Could not create new Apache Solr core "dlfCore' . $coreNumber . '"', $this->extKey, SYSLOG_SEVERITY_ERROR, $fieldArray);
 
                     }
 
                     // Solr core could not be created, thus unset field array.
-                    $fieldArray = array ();
+                    $fieldArray = array();
 
                     break;
 
@@ -186,9 +186,9 @@ 
 
                         // Get current configuration.
                         $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-                            $table.'.is_listed AS is_listed',
+                            $table . '.is_listed AS is_listed',
                             $table,
-                            $table.'.uid='.intval($id).tx_dlf_helper::whereClause($table),
+                            $table . '.uid=' . intval($id) . tx_dlf_helper::whereClause($table),
                             '',
                             '',
                             '1'
@@ -214,9 +214,9 @@ 
 
                         // Get current configuration.
                         $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-                            $table.'.index_autocomplete AS index_autocomplete',
+                            $table . '.index_autocomplete AS index_autocomplete',
                             $table,
-                            $table.'.uid='.intval($id).tx_dlf_helper::whereClause($table),
+                            $table . '.uid=' . intval($id) . tx_dlf_helper::whereClause($table),
                             '',
                             '',
                             '1'
@@ -240,15 +240,15 @@ 
                         if (count($fieldArray) < 2) {
 
                             // Unset the whole field array.
-                            $fieldArray = array ();
+                            $fieldArray = array();
 
                         } else {
 
                             // Get current index name.
                             $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-                                $table.'.index_name AS index_name',
+                                $table . '.index_name AS index_name',
                                 $table,
-                                $table.'.uid='.intval($id).tx_dlf_helper::whereClause($table),
+                                $table . '.uid=' . intval($id) . tx_dlf_helper::whereClause($table),
                                 '',
                                 '',
                                 '1'
@@ -265,7 +265,7 @@ 
 
                         if (TYPO3_DLOG) {
 
-                            \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_tcemain->processDatamap_postProcessFieldArray('.$status.', '.$table.', '.$id.', [data], ['.get_class($pObj).'])] Prevented change of "index_name" for UID "'.$id.'" in table "'.$table.'"', $this->extKey, SYSLOG_SEVERITY_NOTICE, $fieldArray);
+                            \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_tcemain->processDatamap_postProcessFieldArray(' . $status . ', ' . $table . ', ' . $id . ', [data], [' . get_class($pObj) . '])] Prevented change of "index_name" for UID "' . $id . '" in table "' . $table . '"', $this->extKey, SYSLOG_SEVERITY_NOTICE, $fieldArray);
 
                         }
 
@@ -308,7 +308,7 @@ 
                         $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
                             'tx_dlf_solrcores.uid,tx_dlf_documents.hidden',
                             'tx_dlf_solrcores,tx_dlf_documents',
-                            'tx_dlf_solrcores.uid=tx_dlf_documents.solrcore AND tx_dlf_documents.uid='.intval($id).tx_dlf_helper::whereClause('tx_dlf_solrcores'),
+                            'tx_dlf_solrcores.uid=tx_dlf_documents.solrcore AND tx_dlf_documents.uid=' . intval($id) . tx_dlf_helper::whereClause('tx_dlf_solrcores'),
                             '',
                             '',
                             '1'
@@ -325,7 +325,7 @@ 
 
                                     // Delete Solr document.
                                     $updateQuery = $solr->service->createUpdate();
-                                    $updateQuery->addDeleteQuery('uid:'.$id);
+                                    $updateQuery->addDeleteQuery('uid:' . $id);
                                     $updateQuery->addCommit();
                                     $solr->service->update($updateQuery);
 
@@ -344,7 +344,7 @@ 
 
                                     if (TYPO3_DLOG) {
 
-                                        \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_tcemain->processDatamap_afterDatabaseOperations('.$status.', '.$table.', '.$id.', [data], ['.get_class($pObj).'])] Failed to re-index document with UID "'.$id.'"', $this->extKey, SYSLOG_SEVERITY_ERROR, $fieldArray);
+                                        \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_tcemain->processDatamap_afterDatabaseOperations(' . $status . ', ' . $table . ', ' . $id . ', [data], [' . get_class($pObj) . '])] Failed to re-index document with UID "' . $id . '"', $this->extKey, SYSLOG_SEVERITY_ERROR, $fieldArray);
 
                                     }
 
@@ -379,13 +379,13 @@ 
      */
     public function processCmdmap_postProcess($command, $table, $id, $value, $pObj) {
 
-        if (in_array($command, array ('move', 'delete', 'undelete')) && $table == 'tx_dlf_documents') {
+        if (in_array($command, array('move', 'delete', 'undelete')) && $table == 'tx_dlf_documents') {
 
             // Get Solr core.
             $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
                 'tx_dlf_solrcores.uid',
                 'tx_dlf_solrcores,tx_dlf_documents',
-                'tx_dlf_solrcores.uid=tx_dlf_documents.solrcore AND tx_dlf_documents.uid='.intval($id).tx_dlf_helper::whereClause('tx_dlf_solrcores'),
+                'tx_dlf_solrcores.uid=tx_dlf_documents.solrcore AND tx_dlf_documents.uid=' . intval($id) . tx_dlf_helper::whereClause('tx_dlf_solrcores'),
                 '',
                 '',
                 '1'
@@ -405,7 +405,7 @@ 
 
                             // Delete Solr document.
                             $updateQuery = $solr->service->createUpdate();
-                            $updateQuery->addDeleteQuery('uid:'.$id);
+                            $updateQuery->addDeleteQuery('uid:' . $id);
                             $updateQuery->addCommit();
                             $solr->service->update($updateQuery);
 
@@ -430,7 +430,7 @@ 
 
                             if (TYPO3_DLOG) {
 
-                                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_tcemain->processCmdmap_postProcess('.$command.', '.$table.', '.$id.', '.$value.', ['.get_class($pObj).'])] Failed to re-index document with UID "'.$id.'"', $this->extKey, SYSLOG_SEVERITY_ERROR);
+                                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_tcemain->processCmdmap_postProcess(' . $command . ', ' . $table . ', ' . $id . ', ' . $value . ', [' . get_class($pObj) . '])] Failed to re-index document with UID "' . $id . '"', $this->extKey, SYSLOG_SEVERITY_ERROR);
 
                             }
 

Braces +8 added lines, -4 removed lines

@@ -17,7 +17,8 @@ 
  * @subpackage	tx_dlf
  * @access	public
  */
-class tx_dlf_tcemain {
+class tx_dlf_tcemain
+{
 
     /**
      * Field post-processing hook for the process_datamap() method.
@@ -32,7 +33,8 @@ 
      *
      * @return	void
      */
-    public function processDatamap_postProcessFieldArray($status, $table, $id, &$fieldArray, $pObj) {
+    public function processDatamap_postProcessFieldArray($status, $table, $id, &$fieldArray, $pObj)
+    {
 
         if ($status == 'new') {
 
@@ -292,7 +294,8 @@ 
      *
      * @return	void
      */
-    public function processDatamap_afterDatabaseOperations($status, $table, $id, &$fieldArray, $pObj) {
+    public function processDatamap_afterDatabaseOperations($status, $table, $id, &$fieldArray, $pObj)
+    {
 
         if ($status == 'update') {
 
@@ -377,7 +380,8 @@ 
      *
      * @return	void
      */
-    public function processCmdmap_postProcess($command, $table, $id, $value, $pObj) {
+    public function processCmdmap_postProcess($command, $table, $id, $value, $pObj)
+    {
 
         if (in_array($command, array ('move', 'delete', 'undelete')) && $table == 'tx_dlf_documents') {
 

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

@@ -138,7 +138,7 @@
                     // @see http://wiki.apache.org/solr/CoreAdmin
                     $url = $solrInfo['scheme'].'://'.$host.':'.$solrInfo['port'].'/'.$solrInfo['path'].'/admin/cores?wt=xml&action=CREATE&name=dlfCore'.$coreNumber.'&instanceDir=dlfCore'.$coreNumber.'&dataDir=data&configSet=dlf';
 
-                    $response = @simplexml_load_string(file_get_contents($url, FALSE, $context));
+                    $response = @simplexml_load_string(file_get_contents($url, false, $context));
 
                     // Process response.
                     if ($response) {

hooks/class.tx_dlf_doctype.php

Spacing +4 added lines, -4 removed lines

@@ -43,7 +43,7 @@ 
      * @var	array
      * @access protected
      */
-    protected $piVars = array ();
+    protected $piVars = array();
 
     /**
      * This holds the DLF parameter prefix
@@ -171,7 +171,7 @@ 
 
                 if (TYPO3_DLOG) {
 
-                    \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_doctype->loadDocument()] Failed to load document with UID "'.$this->piVars['id'].'"', $this->extKey, SYSLOG_SEVERITY_WARNING);
+                    \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_doctype->loadDocument()] Failed to load document with UID "' . $this->piVars['id'] . '"', $this->extKey, SYSLOG_SEVERITY_WARNING);
 
                 }
 
@@ -183,7 +183,7 @@ 
             $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
                 'tx_dlf_documents.uid',
                 'tx_dlf_documents',
-                'tx_dlf_documents.record_id='.$GLOBALS['TYPO3_DB']->fullQuoteStr($this->piVars['recordId'], 'tx_dlf_documents').tx_dlf_helper::whereClause('tx_dlf_documents'),
+                'tx_dlf_documents.record_id=' . $GLOBALS['TYPO3_DB']->fullQuoteStr($this->piVars['recordId'], 'tx_dlf_documents') . tx_dlf_helper::whereClause('tx_dlf_documents'),
                 '',
                 '',
                 '1'
@@ -206,7 +206,7 @@ 
 
                 if (TYPO3_DLOG) {
 
-                    \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_doctype->loadDocument()] Failed to load document with record ID "'.$this->piVars['recordId'].'"', $this->extKey, SYSLOG_SEVERITY_WARNING);
+                    \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_doctype->loadDocument()] Failed to load document with record ID "' . $this->piVars['recordId'] . '"', $this->extKey, SYSLOG_SEVERITY_WARNING);
 
                 }
 

Braces +8 added lines, -4 removed lines

@@ -18,7 +18,8 @@ 
  * @subpackage	tx_dlf
  * @access	public
  */
-class tx_dlf_doctype {
+class tx_dlf_doctype
+{
 
     /**
      * This holds the current document
@@ -60,7 +61,8 @@ 
      *
      * @return	string		The type of the current document
      */
-    public function getDocType() {
+    public function getDocType()
+    {
 
         // Load current document.
         $this->loadDocument();
@@ -156,7 +158,8 @@ 
      *
      * @return	void
      */
-    protected function loadDocument() {
+    protected function loadDocument()
+    {
 
         // Check for required variable.
         if (!empty($this->piVars['id'])) {
@@ -223,7 +226,8 @@ 
      *
      * @return	void
      */
-    public function __construct() {
+    public function __construct()
+    {
 
         // Load current plugin parameters.
         $this->piVars = \TYPO3\CMS\Core\Utility\GeneralUtility::_GPmerged($this->prefixId);

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

@@ -65,7 +65,7 @@ 
         // Load current document.
         $this->loadDocument();
 
-        if ($this->doc === NULL) {
+        if ($this->doc === null) {
 
             // Quit without doing anything if document not available.
             return '';
@@ -167,7 +167,7 @@ 
             if (!$this->doc->ready) {
 
                 // Destroy the incomplete object.
-                $this->doc = NULL;
+                $this->doc = null;
 
                 if (TYPO3_DLOG) {
 

ext_localconf.php

Braces +2 added lines, -1 removed lines

@@ -105,7 +105,8 @@
      *
      * @return	boolean		TRUE if document type matches, FALSE if not
      */
-    function user_dlf_docTypeCheck($type) {
+    function user_dlf_docTypeCheck($type)
+    {
 
         $hook = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('tx_dlf_doctype');
 

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

@@ -14,52 +14,52 @@
 }
 
 // Register plugins.
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPItoST43($_EXTKEY, 'plugins/audioplayer/class.tx_dlf_audioplayer.php', '_audioplayer', 'list_type', TRUE);
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPItoST43($_EXTKEY, 'plugins/audioplayer/class.tx_dlf_audioplayer.php', '_audioplayer', 'list_type', true);
 
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPItoST43($_EXTKEY, 'plugins/basket/class.tx_dlf_basket.php', '_basket', 'list_type', FALSE);
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPItoST43($_EXTKEY, 'plugins/basket/class.tx_dlf_basket.php', '_basket', 'list_type', false);
 
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPItoST43($_EXTKEY, 'plugins/collection/class.tx_dlf_collection.php', '_collection', 'list_type', TRUE);
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPItoST43($_EXTKEY, 'plugins/collection/class.tx_dlf_collection.php', '_collection', 'list_type', true);
 
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPItoST43($_EXTKEY, 'plugins/feeds/class.tx_dlf_feeds.php', '_feeds', 'list_type', FALSE);
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPItoST43($_EXTKEY, 'plugins/feeds/class.tx_dlf_feeds.php', '_feeds', 'list_type', false);
 
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPItoST43($_EXTKEY, 'plugins/listview/class.tx_dlf_listview.php', '_listview', 'list_type', FALSE);
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPItoST43($_EXTKEY, 'plugins/listview/class.tx_dlf_listview.php', '_listview', 'list_type', false);
 
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPItoST43($_EXTKEY, 'plugins/metadata/class.tx_dlf_metadata.php', '_metadata', 'list_type', TRUE);
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPItoST43($_EXTKEY, 'plugins/metadata/class.tx_dlf_metadata.php', '_metadata', 'list_type', true);
 
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPItoST43($_EXTKEY, 'plugins/navigation/class.tx_dlf_navigation.php', '_navigation', 'list_type', TRUE);
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPItoST43($_EXTKEY, 'plugins/navigation/class.tx_dlf_navigation.php', '_navigation', 'list_type', true);
 
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPItoST43($_EXTKEY, 'plugins/newspaper/class.tx_dlf_newspaper.php', '_newspaper', 'list_type', TRUE);
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPItoST43($_EXTKEY, 'plugins/newspaper/class.tx_dlf_newspaper.php', '_newspaper', 'list_type', true);
 
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPItoST43($_EXTKEY, 'plugins/oai/class.tx_dlf_oai.php', '_oai', 'list_type', FALSE);
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPItoST43($_EXTKEY, 'plugins/oai/class.tx_dlf_oai.php', '_oai', 'list_type', false);
 
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPItoST43($_EXTKEY, 'plugins/pagegrid/class.tx_dlf_pagegrid.php', '_pagegrid', 'list_type', TRUE);
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPItoST43($_EXTKEY, 'plugins/pagegrid/class.tx_dlf_pagegrid.php', '_pagegrid', 'list_type', true);
 
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPItoST43($_EXTKEY, 'plugins/pageview/class.tx_dlf_pageview.php', '_pageview', 'list_type', TRUE);
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPItoST43($_EXTKEY, 'plugins/pageview/class.tx_dlf_pageview.php', '_pageview', 'list_type', true);
 
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPItoST43($_EXTKEY, 'plugins/search/class.tx_dlf_search.php', '_search', 'list_type', TRUE);
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPItoST43($_EXTKEY, 'plugins/search/class.tx_dlf_search.php', '_search', 'list_type', true);
 
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPItoST43($_EXTKEY, 'plugins/statistics/class.tx_dlf_statistics.php', '_statistics', 'list_type', TRUE);
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPItoST43($_EXTKEY, 'plugins/statistics/class.tx_dlf_statistics.php', '_statistics', 'list_type', true);
 
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPItoST43($_EXTKEY, 'plugins/toc/class.tx_dlf_toc.php', '_toc', 'list_type', TRUE);
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPItoST43($_EXTKEY, 'plugins/toc/class.tx_dlf_toc.php', '_toc', 'list_type', true);
 
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPItoST43($_EXTKEY, 'plugins/toolbox/class.tx_dlf_toolbox.php', '_toolbox', 'list_type', TRUE);
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPItoST43($_EXTKEY, 'plugins/toolbox/class.tx_dlf_toolbox.php', '_toolbox', 'list_type', true);
 
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPItoST43($_EXTKEY, 'plugins/validator/class.tx_dlf_validator.php', '_validator', 'list_type', FALSE);
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPItoST43($_EXTKEY, 'plugins/validator/class.tx_dlf_validator.php', '_validator', 'list_type', false);
 
 // Register tools for toolbox plugin.
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPItoST43($_EXTKEY, 'plugins/toolbox/tools/fulltext/class.tx_dlf_toolsFulltext.php', '_toolsFulltext', '', TRUE);
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPItoST43($_EXTKEY, 'plugins/toolbox/tools/fulltext/class.tx_dlf_toolsFulltext.php', '_toolsFulltext', '', true);
 $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/plugins/toolbox/tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY).'_toolsFulltext'] = 'LLL:EXT:dlf/locallang.xml:tx_dlf_toolbox.toolsFulltext';
 
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPItoST43($_EXTKEY, 'plugins/toolbox/tools/imagemanipulation/class.tx_dlf_toolsImagemanipulation.php', '_toolsImagemanipulation', '', TRUE);
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPItoST43($_EXTKEY, 'plugins/toolbox/tools/imagemanipulation/class.tx_dlf_toolsImagemanipulation.php', '_toolsImagemanipulation', '', true);
 $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/plugins/toolbox/tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY).'_toolsImagemanipulation'] = 'LLL:EXT:dlf/locallang.xml:tx_dlf_toolbox.toolsImagemanipulation';
 
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPItoST43($_EXTKEY, 'plugins/toolbox/tools/pdf/class.tx_dlf_toolsPdf.php', '_toolsPdf', '', TRUE);
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPItoST43($_EXTKEY, 'plugins/toolbox/tools/pdf/class.tx_dlf_toolsPdf.php', '_toolsPdf', '', true);
 $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/plugins/toolbox/tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY).'_toolsPdf'] = 'LLL:EXT:dlf/locallang.xml:tx_dlf_toolbox.toolsPdf';
 
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPItoST43($_EXTKEY, 'plugins/toolbox/tools/imagedownload/class.tx_dlf_toolsImagedownload.php', '_toolsImagedownload', '', TRUE);
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPItoST43($_EXTKEY, 'plugins/toolbox/tools/imagedownload/class.tx_dlf_toolsImagedownload.php', '_toolsImagedownload', '', true);
 $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/plugins/toolbox/tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY).'_toolsImagedownload'] = 'LLL:EXT:dlf/locallang.xml:tx_dlf_toolbox.toolsImagedownload';
 
-\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPItoST43($_EXTKEY, 'plugins/toolbox/tools/searchindocument/class.tx_dlf_toolsSearchindocument.php', '_toolsSearchindocument', '', TRUE);
+\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPItoST43($_EXTKEY, 'plugins/toolbox/tools/searchindocument/class.tx_dlf_toolsSearchindocument.php', '_toolsSearchindocument', '', true);
 $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/plugins/toolbox/tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY).'_toolsSearchindocument'] = 'LLL:EXT:dlf/locallang.xml:tx_dlf_toolbox.toolsSearchindocument';
 
 // Register hooks.

Spacing +12 added lines, -12 removed lines

@@ -48,39 +48,39 @@
 
 // Register tools for toolbox plugin.
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPItoST43($_EXTKEY, 'plugins/toolbox/tools/fulltext/class.tx_dlf_toolsFulltext.php', '_toolsFulltext', '', TRUE);
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/plugins/toolbox/tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY).'_toolsFulltext'] = 'LLL:EXT:dlf/locallang.xml:tx_dlf_toolbox.toolsFulltext';
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/plugins/toolbox/tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY) . '_toolsFulltext'] = 'LLL:EXT:dlf/locallang.xml:tx_dlf_toolbox.toolsFulltext';
 
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPItoST43($_EXTKEY, 'plugins/toolbox/tools/imagemanipulation/class.tx_dlf_toolsImagemanipulation.php', '_toolsImagemanipulation', '', TRUE);
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/plugins/toolbox/tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY).'_toolsImagemanipulation'] = 'LLL:EXT:dlf/locallang.xml:tx_dlf_toolbox.toolsImagemanipulation';
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/plugins/toolbox/tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY) . '_toolsImagemanipulation'] = 'LLL:EXT:dlf/locallang.xml:tx_dlf_toolbox.toolsImagemanipulation';
 
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPItoST43($_EXTKEY, 'plugins/toolbox/tools/pdf/class.tx_dlf_toolsPdf.php', '_toolsPdf', '', TRUE);
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/plugins/toolbox/tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY).'_toolsPdf'] = 'LLL:EXT:dlf/locallang.xml:tx_dlf_toolbox.toolsPdf';
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/plugins/toolbox/tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY) . '_toolsPdf'] = 'LLL:EXT:dlf/locallang.xml:tx_dlf_toolbox.toolsPdf';
 
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPItoST43($_EXTKEY, 'plugins/toolbox/tools/imagedownload/class.tx_dlf_toolsImagedownload.php', '_toolsImagedownload', '', TRUE);
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/plugins/toolbox/tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY).'_toolsImagedownload'] = 'LLL:EXT:dlf/locallang.xml:tx_dlf_toolbox.toolsImagedownload';
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/plugins/toolbox/tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY) . '_toolsImagedownload'] = 'LLL:EXT:dlf/locallang.xml:tx_dlf_toolbox.toolsImagedownload';
 
 \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPItoST43($_EXTKEY, 'plugins/toolbox/tools/searchindocument/class.tx_dlf_toolsSearchindocument.php', '_toolsSearchindocument', '', TRUE);
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/plugins/toolbox/tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY).'_toolsSearchindocument'] = 'LLL:EXT:dlf/locallang.xml:tx_dlf_toolbox.toolsSearchindocument';
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/plugins/toolbox/tools'][\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::getCN($_EXTKEY) . '_toolsSearchindocument'] = 'LLL:EXT:dlf/locallang.xml:tx_dlf_toolbox.toolsSearchindocument';
 
 // Register hooks.
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['processDatamapClass'][] = 'EXT:'.$_EXTKEY.'/hooks/class.tx_dlf_tcemain.php:tx_dlf_tcemain';
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['processDatamapClass'][] = 'EXT:' . $_EXTKEY . '/hooks/class.tx_dlf_tcemain.php:tx_dlf_tcemain';
 
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['processCmdmapClass'][] = 'EXT:'.$_EXTKEY.'/hooks/class.tx_dlf_tcemain.php:tx_dlf_tcemain';
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['processCmdmapClass'][] = 'EXT:' . $_EXTKEY . '/hooks/class.tx_dlf_tcemain.php:tx_dlf_tcemain';
 
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/common/class.tx_dlf_document.php']['hookClass'][] = 'EXT:'.$_EXTKEY.'/hooks/class.tx_dlf_hacks.php:tx_dlf_hacks';
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['dlf/common/class.tx_dlf_document.php']['hookClass'][] = 'EXT:' . $_EXTKEY . '/hooks/class.tx_dlf_hacks.php:tx_dlf_hacks';
 
 // Register command line scripts.
-$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['GLOBAL']['cliKeys'][$_EXTKEY] = array ('EXT:'.$_EXTKEY.'/cli/class.tx_dlf_cli.php', '_CLI_dlf');
+$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['GLOBAL']['cliKeys'][$_EXTKEY] = array('EXT:' . $_EXTKEY . '/cli/class.tx_dlf_cli.php', '_CLI_dlf');
 
 // Register AJAX eID handlers.
-$GLOBALS['TYPO3_CONF_VARS']['FE']['eID_include']['tx_dlf_search_suggest'] = 'EXT:'.$_EXTKEY.'/plugins/search/class.tx_dlf_search_suggest.php';
+$GLOBALS['TYPO3_CONF_VARS']['FE']['eID_include']['tx_dlf_search_suggest'] = 'EXT:' . $_EXTKEY . '/plugins/search/class.tx_dlf_search_suggest.php';
 
 $extConf = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['dlf']);
 if (!empty($extConf) && $extConf['enableInternalProxy']) {
-    $GLOBALS['TYPO3_CONF_VARS']['FE']['eID_include']['tx_dlf_geturl_eid'] = 'EXT:'.$_EXTKEY.'/plugins/pageview/class.tx_dlf_geturl_eid.php';
+    $GLOBALS['TYPO3_CONF_VARS']['FE']['eID_include']['tx_dlf_geturl_eid'] = 'EXT:' . $_EXTKEY . '/plugins/pageview/class.tx_dlf_geturl_eid.php';
 }
 
-$GLOBALS['TYPO3_CONF_VARS']['FE']['eID_include']['tx_dlf_search_in_document_eid'] = 'EXT:'.$_EXTKEY.'/plugins/toolbox/tools/searchindocument/class.tx_dlf_search_in_document_eid.php';
+$GLOBALS['TYPO3_CONF_VARS']['FE']['eID_include']['tx_dlf_search_in_document_eid'] = 'EXT:' . $_EXTKEY . '/plugins/toolbox/tools/searchindocument/class.tx_dlf_search_in_document_eid.php';
 
 // add caching framework for Solr queries
 if (!is_array($GLOBALS['TYPO3_CONF_VARS']['SYS']['caching']['cacheConfigurations']['tx_dlf_solr'])) {

ext_tables.php

Spacing +4 added lines, -4 removed lines

@@ -19,7 +19,7 @@ 
     // Add modules after "web".
     if (!isset($TBE_MODULES['txdlfmodules'])) {
 
-        $modules = array ();
+        $modules = array();
 
         foreach ($TBE_MODULES as $key => $val) {
 
@@ -44,17 +44,17 @@ 
     }
 
     // Main "dlf" module.
-    \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addModule('txdlfmodules', '', '', \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY).'modules/');
+    \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addModule('txdlfmodules', '', '', \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY) . 'modules/');
 
     \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addNavigationComponent('txdlfmodules', 'typo3-pagetree');
 
     // Module "indexing".
-    \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addModule('txdlfmodules', 'txdlfindexing', '', \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY).'modules/indexing/');
+    \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addModule('txdlfmodules', 'txdlfindexing', '', \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY) . 'modules/indexing/');
 
     \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('_MOD_txdlfmodules_txdlfindexing', 'EXT:dlf/modules/indexing/locallang_mod.xml');
 
     // Module "newclient".
-    \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addModule('txdlfmodules', 'txdlfnewclient', '', \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY).'modules/newclient/');
+    \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addModule('txdlfmodules', 'txdlfnewclient', '', \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath($_EXTKEY) . 'modules/newclient/');
 
     \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addLLrefForTCAdescr('_MOD_txdlfmodules_txdlfnewclient', 'EXT:dlf/modules/newclient/locallang_mod.xml');
 

cli/class.tx_dlf_cli.php

Spacing +19 added lines, -19 removed lines

@@ -48,11 +48,11 @@ 
             case 'index':
 
                 // Add command line arguments.
-                $this->cli_options[] = array ('-doc UID/URL', 'UID or (properly encoded) URL of the document.');
+                $this->cli_options[] = array('-doc UID/URL', 'UID or (properly encoded) URL of the document.');
 
-                $this->cli_options[] = array ('-pid UID', 'UID of the page the document should be added to.');
+                $this->cli_options[] = array('-pid UID', 'UID of the page the document should be added to.');
 
-                $this->cli_options[] = array ('-core UID', 'UID of the Solr core the document should be added to.');
+                $this->cli_options[] = array('-core UID', 'UID of the Solr core the document should be added to.');
 
                 // Check the command line arguments.
                 $this->cli_validateArgs();
@@ -60,7 +60,7 @@ 
                 if (!\TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($this->cli_args['-doc'][0])
                     && !\TYPO3\CMS\Core\Utility\GeneralUtility::isValidUrl($this->cli_args['-doc'][0])) {
 
-                    $this->cli_echo('ERROR: "'.$this->cli_args['-doc'][0].'" is not a valid document UID or URL.'.LF, TRUE);
+                    $this->cli_echo('ERROR: "' . $this->cli_args['-doc'][0] . '" is not a valid document UID or URL.' . LF, TRUE);
 
                     $this->return = 1;
 
@@ -68,7 +68,7 @@ 
 
                 if (!\TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($this->cli_args['-pid'][0])) {
 
-                    $this->cli_echo('ERROR: "'.$this->cli_args['-pid'][0].'" is not a valid page UID.'.LF, TRUE);
+                    $this->cli_echo('ERROR: "' . $this->cli_args['-pid'][0] . '" is not a valid page UID.' . LF, TRUE);
 
                     $this->return = 1;
 
@@ -76,7 +76,7 @@ 
 
                 if (!\TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($this->cli_args['-core'][0])) {
 
-                    $this->cli_echo('ERROR: "'.$this->cli_args['-core'][0].'" is not a valid core UID.'.LF, TRUE);
+                    $this->cli_echo('ERROR: "' . $this->cli_args['-core'][0] . '" is not a valid core UID.' . LF, TRUE);
 
                     $this->return = 1;
 
@@ -96,7 +96,7 @@ 
                     // ...and save it to the database...
                     if (!$doc->save(intval($this->cli_args['-pid'][0]), intval($this->cli_args['-core'][0]))) {
 
-                        $this->cli_echo('ERROR: Document "'.$this->cli_args['-doc'][0].'" not saved and indexed.'.LF, TRUE);
+                        $this->cli_echo('ERROR: Document "' . $this->cli_args['-doc'][0] . '" not saved and indexed.' . LF, TRUE);
 
                         $this->return = 1;
 
@@ -104,7 +104,7 @@ 
 
                 } else {
 
-                    $this->cli_echo('ERROR: Document "'.$this->cli_args['-doc'][0].'" could not be loaded.'.LF, TRUE);
+                    $this->cli_echo('ERROR: Document "' . $this->cli_args['-doc'][0] . '" could not be loaded.' . LF, TRUE);
 
                     $this->return = 1;
 
@@ -116,18 +116,18 @@ 
             case 'reindex':
 
                 // Add command line arguments.
-                $this->cli_options[] = array ('-coll UID', 'UID of the collection.');
+                $this->cli_options[] = array('-coll UID', 'UID of the collection.');
 
-                $this->cli_options[] = array ('-pid UID', 'UID of the page the document should be added to.');
+                $this->cli_options[] = array('-pid UID', 'UID of the page the document should be added to.');
 
-                $this->cli_options[] = array ('-core UID', 'UID of the Solr core the document should be added to.');
+                $this->cli_options[] = array('-core UID', 'UID of the Solr core the document should be added to.');
 
                 // Check the command line arguments.
                 $this->cli_validateArgs();
 
                 if (!\TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($this->cli_args['-coll'][0])) {
 
-                    $this->cli_echo('ERROR: "'.$this->cli_args['-coll'][0].'" is not a valid collection UID.'.LF, TRUE);
+                    $this->cli_echo('ERROR: "' . $this->cli_args['-coll'][0] . '" is not a valid collection UID.' . LF, TRUE);
 
                     $this->return = 1;
 
@@ -135,7 +135,7 @@ 
 
                 if (!\TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($this->cli_args['-pid'][0])) {
 
-                    $this->cli_echo('ERROR: "'.$this->cli_args['-pid'][0].'" is not a valid page UID.'.LF, TRUE);
+                    $this->cli_echo('ERROR: "' . $this->cli_args['-pid'][0] . '" is not a valid page UID.' . LF, TRUE);
 
                     $this->return = 1;
 
@@ -143,7 +143,7 @@ 
 
                 if (!\TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($this->cli_args['-core'][0])) {
 
-                    $this->cli_echo('ERROR: "'.$this->cli_args['-core'][0].'" is not a valid core UID.'.LF, TRUE);
+                    $this->cli_echo('ERROR: "' . $this->cli_args['-core'][0] . '" is not a valid core UID.' . LF, TRUE);
 
                     $this->return = 1;
 
@@ -161,7 +161,7 @@ 
                     'tx_dlf_documents',
                     'tx_dlf_relations',
                     'tx_dlf_collections',
-                    'AND tx_dlf_collections.uid='.intval($this->cli_args['-coll'][0]).' AND tx_dlf_collections.pid='.intval($this->cli_args['-pid'][0]).' AND tx_dlf_relations.ident='.$GLOBALS['TYPO3_DB']->fullQuoteStr('docs_colls', 'tx_dlf_relations').tx_dlf_helper::whereClause('tx_dlf_documents').tx_dlf_helper::whereClause('tx_dlf_collections'),
+                    'AND tx_dlf_collections.uid=' . intval($this->cli_args['-coll'][0]) . ' AND tx_dlf_collections.pid=' . intval($this->cli_args['-pid'][0]) . ' AND tx_dlf_relations.ident=' . $GLOBALS['TYPO3_DB']->fullQuoteStr('docs_colls', 'tx_dlf_relations') . tx_dlf_helper::whereClause('tx_dlf_documents') . tx_dlf_helper::whereClause('tx_dlf_collections'),
                     '',
                     '',
                     ''
@@ -177,7 +177,7 @@ 
                         // ...and save it to the database...
                         if (!$doc->save(intval($this->cli_args['-pid'][0]), intval($this->cli_args['-core'][0]))) {
 
-                            $this->cli_echo('ERROR: Document "'.$resArray['uid'].'" not saved and indexed.'.LF, TRUE);
+                            $this->cli_echo('ERROR: Document "' . $resArray['uid'] . '" not saved and indexed.' . LF, TRUE);
 
                             $this->return = 1;
 
@@ -185,7 +185,7 @@ 
 
                     } else {
 
-                        $this->cli_echo('ERROR: Document "'.$resArray['uid'].'" could not be loaded.'.LF, TRUE);
+                        $this->cli_echo('ERROR: Document "' . $resArray['uid'] . '" could not be loaded.' . LF, TRUE);
 
                         $this->return = 1;
 
@@ -213,10 +213,10 @@ 
     public function __construct() {
 
         // Set basic information about the script.
-        $this->cli_help = array (
+        $this->cli_help = array(
             'name' => 'Command Line Interface for Kitodo.Presentation',
             'synopsis' => '###OPTIONS###',
-            'description' => 'Currently the only tasks available are "index" and "reindex".'.LF.'Try "/PATH/TO/TYPO3/cli_dispatch.phpsh dlf TASK" for more options.',
+            'description' => 'Currently the only tasks available are "index" and "reindex".' . LF . 'Try "/PATH/TO/TYPO3/cli_dispatch.phpsh dlf TASK" for more options.',
             'examples' => '/PATH/TO/TYPO3/cli_dispatch.phpsh dlf TASK -ARG1=VALUE1 -ARG2=VALUE2',
             'options' => '',
             'license' => 'GNU GPL - free software!',

Braces +6 added lines, -3 removed lines

@@ -23,7 +23,8 @@ 
  * @subpackage	tx_dlf
  * @access	public
  */
-class tx_dlf_cli extends \TYPO3\CMS\Core\Controller\CommandLineController {
+class tx_dlf_cli extends \TYPO3\CMS\Core\Controller\CommandLineController
+{
 
     /**
      * This is the return code.
@@ -40,7 +41,8 @@ 
      *
      * @return	void
      */
-    public function main() {
+    public function main()
+    {
 
         switch ((string) $this->cli_args['_DEFAULT'][1]) {
 
@@ -210,7 +212,8 @@ 
 
     }
 
-    public function __construct() {
+    public function __construct()
+    {
 
         // Set basic information about the script.
         $this->cli_help = array (

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

@@ -60,7 +60,7 @@ 
                 if (!\TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($this->cli_args['-doc'][0])
                     && !\TYPO3\CMS\Core\Utility\GeneralUtility::isValidUrl($this->cli_args['-doc'][0])) {
 
-                    $this->cli_echo('ERROR: "'.$this->cli_args['-doc'][0].'" is not a valid document UID or URL.'.LF, TRUE);
+                    $this->cli_echo('ERROR: "'.$this->cli_args['-doc'][0].'" is not a valid document UID or URL.'.LF, true);
 
                     $this->return = 1;
 
@@ -68,7 +68,7 @@ 
 
                 if (!\TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($this->cli_args['-pid'][0])) {
 
-                    $this->cli_echo('ERROR: "'.$this->cli_args['-pid'][0].'" is not a valid page UID.'.LF, TRUE);
+                    $this->cli_echo('ERROR: "'.$this->cli_args['-pid'][0].'" is not a valid page UID.'.LF, true);
 
                     $this->return = 1;
 
@@ -76,7 +76,7 @@ 
 
                 if (!\TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($this->cli_args['-core'][0])) {
 
-                    $this->cli_echo('ERROR: "'.$this->cli_args['-core'][0].'" is not a valid core UID.'.LF, TRUE);
+                    $this->cli_echo('ERROR: "'.$this->cli_args['-core'][0].'" is not a valid core UID.'.LF, true);
 
                     $this->return = 1;
 
@@ -89,14 +89,14 @@ 
                 }
 
                 // Get the document...
-                $doc = & tx_dlf_document::getInstance($this->cli_args['-doc'][0], $this->cli_args['-pid'][0], TRUE);
+                $doc = & tx_dlf_document::getInstance($this->cli_args['-doc'][0], $this->cli_args['-pid'][0], true);
 
                 if ($doc->ready) {
 
                     // ...and save it to the database...
                     if (!$doc->save(intval($this->cli_args['-pid'][0]), intval($this->cli_args['-core'][0]))) {
 
-                        $this->cli_echo('ERROR: Document "'.$this->cli_args['-doc'][0].'" not saved and indexed.'.LF, TRUE);
+                        $this->cli_echo('ERROR: Document "'.$this->cli_args['-doc'][0].'" not saved and indexed.'.LF, true);
 
                         $this->return = 1;
 
@@ -104,7 +104,7 @@ 
 
                 } else {
 
-                    $this->cli_echo('ERROR: Document "'.$this->cli_args['-doc'][0].'" could not be loaded.'.LF, TRUE);
+                    $this->cli_echo('ERROR: Document "'.$this->cli_args['-doc'][0].'" could not be loaded.'.LF, true);
 
                     $this->return = 1;
 
@@ -127,7 +127,7 @@ 
 
                 if (!\TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($this->cli_args['-coll'][0])) {
 
-                    $this->cli_echo('ERROR: "'.$this->cli_args['-coll'][0].'" is not a valid collection UID.'.LF, TRUE);
+                    $this->cli_echo('ERROR: "'.$this->cli_args['-coll'][0].'" is not a valid collection UID.'.LF, true);
 
                     $this->return = 1;
 
@@ -135,7 +135,7 @@ 
 
                 if (!\TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($this->cli_args['-pid'][0])) {
 
-                    $this->cli_echo('ERROR: "'.$this->cli_args['-pid'][0].'" is not a valid page UID.'.LF, TRUE);
+                    $this->cli_echo('ERROR: "'.$this->cli_args['-pid'][0].'" is not a valid page UID.'.LF, true);
 
                     $this->return = 1;
 
@@ -143,7 +143,7 @@ 
 
                 if (!\TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($this->cli_args['-core'][0])) {
 
-                    $this->cli_echo('ERROR: "'.$this->cli_args['-core'][0].'" is not a valid core UID.'.LF, TRUE);
+                    $this->cli_echo('ERROR: "'.$this->cli_args['-core'][0].'" is not a valid core UID.'.LF, true);
 
                     $this->return = 1;
 
@@ -170,14 +170,14 @@ 
                 while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
 
                     // Get the document...
-                    $doc = & tx_dlf_document::getInstance($resArray['uid'], $this->cli_args['-pid'][0], TRUE);
+                    $doc = & tx_dlf_document::getInstance($resArray['uid'], $this->cli_args['-pid'][0], true);
 
                     if ($doc->ready) {
 
                         // ...and save it to the database...
                         if (!$doc->save(intval($this->cli_args['-pid'][0]), intval($this->cli_args['-core'][0]))) {
 
-                            $this->cli_echo('ERROR: Document "'.$resArray['uid'].'" not saved and indexed.'.LF, TRUE);
+                            $this->cli_echo('ERROR: Document "'.$resArray['uid'].'" not saved and indexed.'.LF, true);
 
                             $this->return = 1;
 
@@ -185,7 +185,7 @@ 
 
                     } else {
 
-                        $this->cli_echo('ERROR: Document "'.$resArray['uid'].'" could not be loaded.'.LF, TRUE);
+                        $this->cli_echo('ERROR: Document "'.$resArray['uid'].'" could not be loaded.'.LF, true);
 
                         $this->return = 1;