kitodo / kitodo-presentation

common/class.tx_dlf_module.php

Spacing +10 added lines, -10 removed lines

@@ -46,7 +46,7 @@ 
      * @var	array
      * @access protected
      */
-    protected $buttonArray = array ();
+    protected $buttonArray = array();
 
     /**
      * Holds the module's marker array
@@ -54,7 +54,7 @@ 
      * @var	array
      * @access protected
      */
-    protected $markerArray = array ();
+    protected $markerArray = array();
 
     /**
      * Holds the module's subpart array
@@ -62,7 +62,7 @@ 
      * @var	array
      * @access protected
      */
-    protected $subpartArray = array ();
+    protected $subpartArray = array();
 
     /**
      * Holds the TYPO3_CONF_VARS array of this extension
@@ -70,7 +70,7 @@ 
      * @var	array
      * @access protected
      */
-    protected $conf = array ();
+    protected $conf = array();
 
     /**
      * Holds the submitted form's data
@@ -91,7 +91,7 @@ 
 
         $GLOBALS['BE_USER']->modAccess($GLOBALS['MCONF'], 1);
 
-        $GLOBALS['LANG']->includeLLFile('EXT:'.$this->extKey.'/modules/'.$this->modPath.'locallang.xml');
+        $GLOBALS['LANG']->includeLLFile('EXT:' . $this->extKey . '/modules/' . $this->modPath . 'locallang.xml');
 
         $this->setMOD_MENU();
 
@@ -103,13 +103,13 @@ 
 
         $this->doc = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Backend\\Template\\DocumentTemplate');
 
-        $this->doc->setModuleTemplate('EXT:'.$this->extKey.'/modules/'.$this->modPath.'template.tmpl');
+        $this->doc->setModuleTemplate('EXT:' . $this->extKey . '/modules/' . $this->modPath . 'template.tmpl');
 
-        $this->doc->getPageRenderer()->addCssFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath($this->extKey).'res/backend.css');
+        $this->doc->getPageRenderer()->addCssFile(\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extRelPath($this->extKey) . 'res/backend.css');
 
         $this->doc->backPath = $GLOBALS['BACK_PATH'];
 
-        $this->doc->bodyTagAdditions = 'class="ext-'.$this->extKey.'-modules"';
+        $this->doc->bodyTagAdditions = 'class="ext-' . $this->extKey . '-modules"';
 
         $this->doc->form = '<form action="" method="post" enctype="multipart/form-data">';
 
@@ -180,7 +180,7 @@ 
         // Set defaults for buttons and menu.
         if (empty($this->buttonArray['RELOAD'])) {
 
-            $this->buttonArray['RELOAD'] = '<a href="'.$GLOBALS['MCONF']['_'].'" title="'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.reload', TRUE).'">'.\TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIcon('actions-system-refresh').'</a>';
+            $this->buttonArray['RELOAD'] = '<a href="' . $GLOBALS['MCONF']['_'] . '" title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.reload', TRUE) . '">' . \TYPO3\CMS\Backend\Utility\IconUtility::getSpriteIcon('actions-system-refresh') . '</a>';
 
         }
 
@@ -192,7 +192,7 @@ 
 
         if (empty($this->markerArray['CSH'])) {
 
-            $this->markerArray['CSH'] = \TYPO3\CMS\Backend\Utility\BackendUtility::cshItem('_MOD_'.$GLOBALS['MCONF']['name'], 'csh', $GLOBALS['BACK_PATH'], '', TRUE);
+            $this->markerArray['CSH'] = \TYPO3\CMS\Backend\Utility\BackendUtility::cshItem('_MOD_' . $GLOBALS['MCONF']['name'], 'csh', $GLOBALS['BACK_PATH'], '', TRUE);
 
         }
 

common/class.tx_dlf_plugin.php

Spacing +13 added lines, -13 removed lines

@@ -60,7 +60,7 @@ 
     protected function init(array $conf) {
 
         // Read FlexForm configuration.
-        $flexFormConf = array ();
+        $flexFormConf = array();
 
         $this->cObj->readFlexformIntoConf($this->cObj->data['pi_flexform'], $flexFormConf);
 
@@ -71,7 +71,7 @@ 
         }
 
         // Read plugin TS configuration.
-        $pluginConf = $GLOBALS['TSFE']->tmpl->setup['plugin.'][get_class($this).'.'];
+        $pluginConf = $GLOBALS['TSFE']->tmpl->setup['plugin.'][get_class($this) . '.'];
 
         if (is_array($pluginConf)) {
 
@@ -80,7 +80,7 @@ 
         }
 
         // Read general TS configuration.
-        $generalConf = $GLOBALS['TSFE']->tmpl->setup['plugin.'][$this->prefixId.'.'];
+        $generalConf = $GLOBALS['TSFE']->tmpl->setup['plugin.'][$this->prefixId . '.'];
 
         if (is_array($generalConf)) {
 
@@ -141,7 +141,7 @@ 
 
                 if (TYPO3_DLOG) {
 
-                    \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_plugin->loadDocument()] Failed to load document with UID "'.$this->piVars['id'].'"', $this->extKey, SYSLOG_SEVERITY_ERROR);
+                    \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_plugin->loadDocument()] Failed to load document with UID "' . $this->piVars['id'] . '"', $this->extKey, SYSLOG_SEVERITY_ERROR);
 
                 }
 
@@ -158,7 +158,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'
@@ -181,7 +181,7 @@ 
 
                 if (TYPO3_DLOG) {
 
-                    \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_plugin->loadDocument()] Failed to load document with record ID "'.$this->piVars['recordId'].'"', $this->extKey, SYSLOG_SEVERITY_ERROR);
+                    \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_plugin->loadDocument()] Failed to load document with record ID "' . $this->piVars['recordId'] . '"', $this->extKey, SYSLOG_SEVERITY_ERROR);
 
                 }
 
@@ -191,7 +191,7 @@ 
 
             if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_plugin->loadDocument()] Invalid UID "'.$this->piVars['id'].'" or PID "'.$this->conf['pages'].'" for document loading', $this->extKey, SYSLOG_SEVERITY_ERROR);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_plugin->loadDocument()] Invalid UID "' . $this->piVars['id'] . '" or PID "' . $this->conf['pages'] . '" for document loading', $this->extKey, SYSLOG_SEVERITY_ERROR);
 
             }
 
@@ -234,19 +234,19 @@ 
 
                 }
 
-                if (is_array($this->conf['_DEFAULT_PI_VARS.'][$GPkey.'.']['stdWrap.'])) {
+                if (is_array($this->conf['_DEFAULT_PI_VARS.'][$GPkey . '.']['stdWrap.'])) {
 
                     $GPval = $GPval ? $GPval : '';
 
-                    $this->conf['_DEFAULT_PI_VARS.'][$GPkey] = $this->cObj->stdWrap($GPval, $this->conf['_DEFAULT_PI_VARS.'][$GPkey.'.']['stdWrap.']);
+                    $this->conf['_DEFAULT_PI_VARS.'][$GPkey] = $this->cObj->stdWrap($GPval, $this->conf['_DEFAULT_PI_VARS.'][$GPkey . '.']['stdWrap.']);
 
-                    unset ($this->conf['_DEFAULT_PI_VARS.'][$GPkey.'.']['stdWrap.']);
+                    unset ($this->conf['_DEFAULT_PI_VARS.'][$GPkey . '.']['stdWrap.']);
 
                 }
 
             }
 
-            $this->piVars = tx_dlf_helper::array_merge_recursive_overrule($this->conf['_DEFAULT_PI_VARS.'], is_array($this->piVars) ? $this->piVars : array ());
+            $this->piVars = tx_dlf_helper::array_merge_recursive_overrule($this->conf['_DEFAULT_PI_VARS.'], is_array($this->piVars) ? $this->piVars : array());
 
         }
 
@@ -265,11 +265,11 @@ 
 
         if (!$GLOBALS['TSFE']->config['config']['disableWrapInBaseClass']) {
             // Use get_class($this) instead of $this->prefixId for content wrapping because $this->prefixId is the same for all plugins.
-            $content = '<div class="'.str_replace('_', '-', get_class($this)).'">'.$content.'</div>';
+            $content = '<div class="' . str_replace('_', '-', get_class($this)) . '">' . $content . '</div>';
 
             if (!$GLOBALS['TSFE']->config['config']['disablePrefixComment']) {
 
-                $content = "\n\n<!-- BEGIN: Content of extension '".$this->extKey."', plugin '".get_class($this)."' -->\n\n".$content."\n\n<!-- END: Content of extension '".$this->extKey."', plugin '".get_class($this)."' -->\n\n";
+                $content = "\n\n<!-- BEGIN: Content of extension '" . $this->extKey . "', plugin '" . get_class($this) . "' -->\n\n" . $content . "\n\n<!-- END: Content of extension '" . $this->extKey . "', plugin '" . get_class($this) . "' -->\n\n";
 
             }
         }

common/class.tx_dlf_solr.php

Spacing +31 added lines, -31 removed lines

@@ -66,7 +66,7 @@ 
      * @var	array
      * @access protected
      */
-    protected $params = array ();
+    protected $params = array();
 
     /**
      * Is the search instantiated successfully?
@@ -82,7 +82,7 @@ 
      * @var	array(tx_dlf_solr)
      * @access protected
      */
-    protected static $registry = array ();
+    protected static $registry = array();
 
     /**
      * This holds the Solr service object
@@ -134,12 +134,12 @@ 
         if (preg_match('/^[[:alnum:]]+_[tu][su]i:\(?.*\)?$/', $query)) {
 
             // Get all indexed fields.
-            $fields = array ();
+            $fields = array();
 
             $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
                 'tx_dlf_metadata.index_name,tx_dlf_metadata.index_tokenized,tx_dlf_metadata.index_stored',
                 'tx_dlf_metadata',
-                'tx_dlf_metadata.index_indexed=1 AND tx_dlf_metadata.pid='.intval($pid).' AND (tx_dlf_metadata.sys_language_uid IN (-1,0) OR tx_dlf_metadata.l18n_parent=0)'.tx_dlf_helper::whereClause('tx_dlf_metadata'),
+                'tx_dlf_metadata.index_indexed=1 AND tx_dlf_metadata.pid=' . intval($pid) . ' AND (tx_dlf_metadata.sys_language_uid IN (-1,0) OR tx_dlf_metadata.l18n_parent=0)' . tx_dlf_helper::whereClause('tx_dlf_metadata'),
                 '',
                 '',
                 ''
@@ -149,7 +149,7 @@ 
 
                 while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_row($result)) {
 
-                    $fields[] = $resArray[0].'_'.($resArray[1] ? 't' : 'u').($resArray[2] ? 's' : 'u').'i';
+                    $fields[] = $resArray[0] . '_' . ($resArray[1] ? 't' : 'u') . ($resArray[2] ? 's' : 'u') . 'i';
 
                 }
 
@@ -160,7 +160,7 @@ 
 
             if (in_array($splitQuery[0], $fields)) {
 
-                $query = $splitQuery[0].':('.self::escapeQuery(trim($splitQuery[1], '()')).')';
+                $query = $splitQuery[0] . ':(' . self::escapeQuery(trim($splitQuery[1], '()')) . ')';
 
             } else {
 
@@ -205,7 +205,7 @@ 
 
             if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_solr->getInstance('.$_core.')] Invalid core name "'.$core.'" for Apache Solr', self::$extKey, SYSLOG_SEVERITY_ERROR);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_solr->getInstance(' . $_core . ')] Invalid core name "' . $core . '" for Apache Solr', self::$extKey, SYSLOG_SEVERITY_ERROR);
 
             }
 
@@ -236,7 +236,7 @@ 
 
             if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_solr->getInstance('.$_core.')] Could not connect to Apache Solr server', self::$extKey, SYSLOG_SEVERITY_ERROR);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_solr->getInstance(' . $_core . ')] Could not connect to Apache Solr server', self::$extKey, SYSLOG_SEVERITY_ERROR);
 
             }
 
@@ -255,7 +255,7 @@ 
      */
     public static function getSolrConnectionInfo() {
 
-        $solrInfo = array ();
+        $solrInfo = array();
 
         // Extract extension configuration.
         $conf = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf'][self::$extKey]);
@@ -299,7 +299,7 @@ 
 
         if ($solrInfo['username'] && $solrInfo['password']) {
 
-            $host = $solrInfo['username'].':'.$solrInfo['password'].'@'.$solrInfo['host'];
+            $host = $solrInfo['username'] . ':' . $solrInfo['password'] . '@' . $solrInfo['host'];
 
         } else {
 
@@ -308,7 +308,7 @@ 
         }
 
         // Return entire request URL.
-        return $solrInfo['scheme'].'://'.$host.':'.$solrInfo['port'].'/'.$solrInfo['path'].'/'.$core;
+        return $solrInfo['scheme'] . '://' . $host . ':' . $solrInfo['port'] . '/' . $solrInfo['path'] . '/' . $core;
 
     }
 
@@ -326,7 +326,7 @@ 
         $start = max(intval($start), 0);
 
         // Check if core already exists.
-        if (self::getInstance('dlfCore'.$start) === NULL) {
+        if (self::getInstance('dlfCore' . $start) === NULL) {
 
             return $start;
 
@@ -347,12 +347,12 @@ 
      */
     public function search() {
 
-        $toplevel = array ();
+        $toplevel = array();
 
         // Take over query parameters.
         $params = $this->params;
 
-        $params['filterquery'] = isset($params['filterquery']) ? $params['filterquery'] : array ();
+        $params['filterquery'] = isset($params['filterquery']) ? $params['filterquery'] : array();
 
         // Set some query parameters.
         $params['start'] = 0;
@@ -367,7 +367,7 @@ 
         // Restore query parameters
         $params = $this->params;
 
-        $params['filterquery'] = isset($params['filterquery']) ? $params['filterquery'] : array ();
+        $params['filterquery'] = isset($params['filterquery']) ? $params['filterquery'] : array();
 
         // Restrict the fields to the required ones.
         $params['fields'] = 'uid,id';
@@ -377,17 +377,17 @@ 
 
             if (isset($value['query'])) {
 
-                $params['filterquery'][$key]['query'] = '{!join from=uid to=uid}'.$value['query'];
+                $params['filterquery'][$key]['query'] = '{!join from=uid to=uid}' . $value['query'];
 
             }
 
         }
 
         // Set filter query to just get toplevel documents.
-        $params['filterquery'][] = array ('query' => 'toplevel:true');
+        $params['filterquery'][] = array('query' => 'toplevel:true');
 
         // Set join query to get all documents with the same uids.
-        $params['query'] = '{!join from=uid to=uid}'.$params['query'];
+        $params['query'] = '{!join from=uid to=uid}' . $params['query'];
 
         // Perform search to determine the total number of toplevel hits and fetch the required rows.
         $selectQuery = $this->service->createSelect($params);
@@ -398,11 +398,11 @@ 
         // Process results.
         foreach ($results as $doc) {
 
-            $toplevel[$doc->id] = array (
+            $toplevel[$doc->id] = array(
                 'u' => $doc->uid,
                 'h' => '',
                 's' => '',
-                'p' => array ()
+                'p' => array()
             );
 
         }
@@ -415,10 +415,10 @@ 
         $list->add(array_values($toplevel));
 
         // Set metadata for search.
-        $list->metadata = array (
+        $list->metadata = array(
             'label' => '',
             'description' => '',
-            'options' => array (
+            'options' => array(
                 'source' => 'search',
                 'engine' => 'solr',
                 'select' => $this->params['query'],
@@ -447,7 +447,7 @@ 
      *
      * @return	array       The Apache Solr Documents that were fetched
      */
-    public function search_raw($query = '', $parameters = array ()) {
+    public function search_raw($query = '', $parameters = array()) {
 
         // Set additional query parameters.
         $parameters['start'] = 0;
@@ -595,13 +595,13 @@ 
      */
     public function __get($var) {
 
-        $method = '_get'.ucfirst($var);
+        $method = '_get' . ucfirst($var);
 
         if (!property_exists($this, $var) || !method_exists($this, $method)) {
 
             if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_solr->__get('.$var.')] There is no getter function for property "'.$var.'"', self::$extKey, SYSLOG_SEVERITY_WARNING);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_solr->__get(' . $var . ')] There is no getter function for property "' . $var . '"', self::$extKey, SYSLOG_SEVERITY_WARNING);
 
             }
 
@@ -627,13 +627,13 @@ 
      */
     public function __set($var, $value) {
 
-        $method = '_set'.ucfirst($var);
+        $method = '_set' . ucfirst($var);
 
         if (!property_exists($this, $var) || !method_exists($this, $method)) {
 
             if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_solr->__set('.$var.', [data])] There is no setter function for property "'.$var.'"', self::$extKey, SYSLOG_SEVERITY_WARNING, $value);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_solr->__set(' . $var . ', [data])] There is no setter function for property "' . $var . '"', self::$extKey, SYSLOG_SEVERITY_WARNING, $value);
 
             }
 
@@ -658,13 +658,13 @@ 
 
         $solrInfo = self::getSolrConnectionInfo();
 
-        $config = array (
-            'endpoint' => array (
-                'dlf' => array (
+        $config = array(
+            'endpoint' => array(
+                'dlf' => array(
                     'scheme' => $solrInfo['scheme'],
                     'host' => $solrInfo['host'],
                     'port' => $solrInfo['port'],
-                    'path' => '/'.$solrInfo['path'].'/',
+                    'path' => '/' . $solrInfo['path'] . '/',
                     'core' => $core,
                     'username' => $solrInfo['username'],
                     'password' => $solrInfo['password'],

common/class.tx_dlf_list.php

Spacing +44 added lines, -44 removed lines

@@ -36,7 +36,7 @@ 
      * @var	array()
      * @access protected
      */
-    protected $elements = array ();
+    protected $elements = array();
 
     /**
      * This holds the list's metadata
@@ -44,7 +44,7 @@ 
      * @var	array
      * @access protected
      */
-    protected $metadata = array ();
+    protected $metadata = array();
 
     /**
      * This holds the current list position
@@ -61,7 +61,7 @@ 
      * @var	array()
      * @access protected
      */
-    protected $records = array ();
+    protected $records = array();
 
     /**
      * Instance of tx_dlf_solr class
@@ -77,7 +77,7 @@ 
      * @var	array
      * @access protected
      */
-    protected $solrConfig = array ();
+    protected $solrConfig = array();
 
     /**
      * This adds an array of elements at the given position to the list
@@ -135,7 +135,7 @@ 
 
             if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_list->current()] Invalid position "'.$this->position.'" for list element', $this->extKey, SYSLOG_SEVERITY_NOTICE);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_list->current()] Invalid position "' . $this->position . '" for list element', $this->extKey, SYSLOG_SEVERITY_NOTICE);
 
             }
 
@@ -156,7 +156,7 @@ 
      */
     protected function getRecord($element) {
 
-        if (is_array($element) && array_keys($element) == array ('u', 'h', 's', 'p')) {
+        if (is_array($element) && array_keys($element) == array('u', 'h', 's', 'p')) {
 
             // Return already processed record if possible.
             if (!empty($this->records[$element['u']])) {
@@ -165,7 +165,7 @@ 
 
             }
 
-            $record = array (
+            $record = array(
                 'uid' => $element['u'],
                 'page' => 1,
                 'preview' => '',
@@ -179,7 +179,7 @@ 
                 $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
                     'tx_dlf_documents.uid AS uid,tx_dlf_documents.thumbnail AS thumbnail,tx_dlf_documents.metadata AS metadata',
                     'tx_dlf_documents',
-                    '(tx_dlf_documents.uid='.intval($record['uid']).' OR tx_dlf_documents.partof='.intval($record['uid']).')'.tx_dlf_helper::whereClause('tx_dlf_documents'),
+                    '(tx_dlf_documents.uid=' . intval($record['uid']) . ' OR tx_dlf_documents.partof=' . intval($record['uid']) . ')' . tx_dlf_helper::whereClause('tx_dlf_documents'),
                     '',
                     '',
                     ''
@@ -224,9 +224,9 @@ 
 
                         $record['metadata'] = $metadata;
 
-                    } elseif (($key = array_search(array ('u' => $resArray['uid']), $record['subparts'], TRUE)) !== FALSE) {
+                    } elseif (($key = array_search(array('u' => $resArray['uid']), $record['subparts'], TRUE)) !== FALSE) {
 
-                        $record['subparts'][$key] = array (
+                        $record['subparts'][$key] = array(
                             'uid' => $resArray['uid'],
                             'page' => 1,
                             'preview' => (!empty($record['subparts'][$key]['h']) ? $record['subparts'][$key]['h'] : ''),
@@ -242,22 +242,22 @@ 
 
                 if ($this->solrConnect()) {
 
-                    $params = array ();
+                    $params = array();
 
                     // Restrict the fields to the required ones
                     $params['fields'] = 'uid,id,toplevel,thumbnail,page';
 
                     foreach ($this->solrConfig as $solr_name) {
 
-                        $params['fields'] .= ','.$solr_name;
+                        $params['fields'] .= ',' . $solr_name;
 
                     }
 
                     // If it is a fulltext search, enable highlighting.
                     if ($this->metadata['fulltextSearch']) {
 
-                        $params['component'] = array (
-                            'highlighting' => array (
+                        $params['component'] = array(
+                            'highlighting' => array(
                                 'query' => tx_dlf_solr::escapeQuery($this->metadata['searchString']),
                                 'field' => 'fulltext',
                                 'usefastvectorhighlighter' => TRUE
@@ -274,27 +274,27 @@ 
                     $params['rows'] = 10000;
 
                     // Take over existing filter queries.
-                    $params['filterquery'] = isset($this->metadata['options']['params']['filterquery']) ? $this->metadata['options']['params']['filterquery'] : array ();
+                    $params['filterquery'] = isset($this->metadata['options']['params']['filterquery']) ? $this->metadata['options']['params']['filterquery'] : array();
 
                     // Extend filter query to get all documents with the same uid.
                     foreach ($params['filterquery'] as $key => $value) {
 
                         if (isset($value['query'])) {
 
-                            $params['filterquery'][$key]['query'] = $value['query'].' OR toplevel:true';
+                            $params['filterquery'][$key]['query'] = $value['query'] . ' OR toplevel:true';
 
                         }
 
                     }
 
                     // Add filter query to get all documents with the required uid.
-                    $params['filterquery'][] = array ('query' => 'uid:'.tx_dlf_solr::escapeQuery($record['uid']));
+                    $params['filterquery'][] = array('query' => 'uid:' . tx_dlf_solr::escapeQuery($record['uid']));
 
                     // Add sorting
                     $params['sort'] = $this->metadata['options']['params']['sort'];
 
                     // Set query 
-                    $params['query'] = $this->metadata['options']['select'].' OR toplevel:true';
+                    $params['query'] = $this->metadata['options']['select'] . ' OR toplevel:true';
 
                     // Perform search for all documents with the same uid that either fit to the search or marked as toplevel.
                     $selectQuery = $this->solr->service->createSelect($params);
@@ -311,13 +311,13 @@ 
                     foreach ($result as $resArray) {
 
                         // Prepare document's metadata.
-                        $metadata = array ();
+                        $metadata = array();
 
                         foreach ($this->solrConfig as $index_name => $solr_name) {
 
                             if (!empty($resArray->$solr_name)) {
 
-                                $metadata[$index_name] = (is_array($resArray->$solr_name) ? $resArray->$solr_name : array ($resArray->$solr_name));
+                                $metadata[$index_name] = (is_array($resArray->$solr_name) ? $resArray->$solr_name : array($resArray->$solr_name));
 
                             }
 
@@ -335,7 +335,7 @@ 
                             $highlightedDoc = !empty($highlighting) ? $highlighting->getResult($resArray->id) : NULL;
                             $highlight = !empty($highlightedDoc) ? $highlightedDoc->getField('fulltext')[0] : '';
 
-                            $record['subparts'][$resArray->id] = array (
+                            $record['subparts'][$resArray->id] = array(
                                 'uid' => $resArray->uid,
                                 'page' => $resArray->page,
                                 'preview' => $highlight,
@@ -410,7 +410,7 @@ 
 
             if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_list->move('.$_position.', '.$_steps.')] Invalid position "'.$position.'" for element moving', $this->extKey, SYSLOG_SEVERITY_WARNING);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_list->move(' . $_position . ', ' . $_steps . ')] Invalid position "' . $position . '" for element moving', $this->extKey, SYSLOG_SEVERITY_WARNING);
 
             }
 
@@ -425,7 +425,7 @@ 
 
             if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_list->move('.$_position.', '.$_steps.')] Invalid steps "'.$steps.'" for moving element at position "'.$position.'"', $this->extKey, SYSLOG_SEVERITY_WARNING);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_list->move(' . $_position . ', ' . $_steps . ')] Invalid steps "' . $steps . '" for moving element at position "' . $position . '"', $this->extKey, SYSLOG_SEVERITY_WARNING);
 
             }
 
@@ -435,7 +435,7 @@ 
 
         $element = $this->remove($position);
 
-        $this->add(array ($element), $position + $steps);
+        $this->add(array($element), $position + $steps);
 
     }
 
@@ -519,7 +519,7 @@ 
 
             if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_list->offsetGet('.$offset.')] Invalid offset "'.$offset.'" for list element', $this->extKey, SYSLOG_SEVERITY_NOTICE);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_list->offsetGet(' . $offset . ')] Invalid offset "' . $offset . '" for list element', $this->extKey, SYSLOG_SEVERITY_NOTICE);
 
             }
 
@@ -579,7 +579,7 @@ 
 
             if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_list->remove('.$_position.')] Invalid position "'.$position.'" for element removing', $this->extKey, SYSLOG_SEVERITY_WARNING);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_list->remove(' . $_position . ')] Invalid position "' . $position . '" for element removing', $this->extKey, SYSLOG_SEVERITY_WARNING);
 
             }
 
@@ -617,7 +617,7 @@ 
 
             if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_list->remove('.$_position.')] Invalid position "'.$position.'" for element removing', $this->extKey, SYSLOG_SEVERITY_WARNING);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_list->remove(' . $_position . ')] Invalid position "' . $position . '" for element removing', $this->extKey, SYSLOG_SEVERITY_WARNING);
             }
 
             return;
@@ -639,11 +639,11 @@ 
      */
     public function reset() {
 
-        $this->elements = array ();
+        $this->elements = array();
 
-        $this->records = array ();
+        $this->records = array();
 
-        $this->metadata = array ();
+        $this->metadata = array();
 
         $this->count = 0;
 
@@ -685,7 +685,7 @@ 
 
         } else {
 
-            tx_dlf_helper::saveToSession(array ($this->elements, $this->metadata), get_class($this));
+            tx_dlf_helper::saveToSession(array($this->elements, $this->metadata), get_class($this));
 
         }
 
@@ -710,7 +710,7 @@ 
                 $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
                         'tx_dlf_metadata.index_name AS index_name,tx_dlf_metadata.index_tokenized AS index_tokenized,tx_dlf_metadata.index_indexed AS index_indexed',
                         'tx_dlf_metadata',
-                        'tx_dlf_metadata.is_listed=1 AND tx_dlf_metadata.pid='.intval($this->metadata['options']['pid']).tx_dlf_helper::whereClause('tx_dlf_metadata'),
+                        'tx_dlf_metadata.is_listed=1 AND tx_dlf_metadata.pid=' . intval($this->metadata['options']['pid']) . tx_dlf_helper::whereClause('tx_dlf_metadata'),
                         '',
                         'tx_dlf_metadata.sorting ASC',
                         ''
@@ -718,7 +718,7 @@ 
 
                 while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
 
-                    $this->solrConfig[$resArray['index_name']] = $resArray['index_name'].'_'.($resArray['index_tokenized'] ? 't' : 'u').'s'.($resArray['index_indexed'] ? 'i' : 'u');
+                    $this->solrConfig[$resArray['index_name']] = $resArray['index_name'] . '_' . ($resArray['index_tokenized'] ? 't' : 'u') . 's' . ($resArray['index_indexed'] ? 'i' : 'u');
 
                 }
 
@@ -749,16 +749,16 @@ 
      */
     public function sort($by, $asc = TRUE) {
 
-        $newOrder = array ();
+        $newOrder = array();
 
-        $nonSortable = array ();
+        $nonSortable = array();
 
         foreach ($this->elements as $num => $element) {
 
             // Is this element sortable?
             if (!empty($element['s'][$by])) {
 
-                $newOrder[$element['s'][$by].str_pad($num, 6, '0', STR_PAD_LEFT)] = $element;
+                $newOrder[$element['s'][$by] . str_pad($num, 6, '0', STR_PAD_LEFT)] = $element;
 
             } else {
 
@@ -791,7 +791,7 @@ 
 
             if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_list->sort('.$by.', ['.($asc ? 'TRUE' : 'FALSE').'])] Sorted list elements do not match unsorted elements', $this->extKey, SYSLOG_SEVERITY_ERROR);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_list->sort(' . $by . ', [' . ($asc ? 'TRUE' : 'FALSE') . '])] Sorted list elements do not match unsorted elements', $this->extKey, SYSLOG_SEVERITY_ERROR);
 
             }
 
@@ -856,7 +856,7 @@ 
      *
      * @return	void
      */
-    protected function _setMetadata(array $metadata = array ()) {
+    protected function _setMetadata(array $metadata = array()) {
 
         $this->metadata = $metadata;
 
@@ -872,7 +872,7 @@ 
      *
      * @return	void
      */
-    public function __construct(array $elements = array (), array $metadata = array ()) {
+    public function __construct(array $elements = array(), array $metadata = array()) {
 
         if (empty($elements) && empty($metadata)) {
 
@@ -931,13 +931,13 @@ 
      */
     public function __get($var) {
 
-        $method = '_get'.ucfirst($var);
+        $method = '_get' . ucfirst($var);
 
         if (!property_exists($this, $var) || !method_exists($this, $method)) {
 
             if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_list->__get('.$var.')] There is no getter function for property "'.$var.'"', $this->extKey, SYSLOG_SEVERITY_WARNING);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_list->__get(' . $var . ')] There is no getter function for property "' . $var . '"', $this->extKey, SYSLOG_SEVERITY_WARNING);
 
             }
 
@@ -963,13 +963,13 @@ 
      */
     public function __set($var, $value) {
 
-        $method = '_set'.ucfirst($var);
+        $method = '_set' . ucfirst($var);
 
         if (!property_exists($this, $var) || !method_exists($this, $method)) {
 
             if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_list->__set('.$var.', [data])] There is no setter function for property "'.$var.'"', $this->extKey, SYSLOG_SEVERITY_WARNING, $value);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_list->__set(' . $var . ', [data])] There is no setter function for property "' . $var . '"', $this->extKey, SYSLOG_SEVERITY_WARNING, $value);
 
             }
 
@@ -991,7 +991,7 @@ 
      */
     public function __sleep() {
 
-        return array ('elements', 'metadata');
+        return array('elements', 'metadata');
 
     }
 

common/class.tx_dlf_mods.php

Spacing +2 added lines, -2 removed lines

@@ -57,7 +57,7 @@ 
 
                 } elseif (($nameParts = $authors[$i]->xpath('./mods:namePart'))) {
 
-                    $name = array ();
+                    $name = array();
 
                     $k = 4;
 
@@ -97,7 +97,7 @@ 
 
                 // Append "valueURI" to name using Unicode unit separator.
                 if (isset($authors[$i]['valueURI'])) {
-                    $metadata['author'][$i] .= chr(31).(string) $authors[$i]['valueURI'];
+                    $metadata['author'][$i] .= chr(31) . (string) $authors[$i]['valueURI'];
                 }
 
             }

common/class.tx_dlf_document.php

Spacing +112 added lines, -112 removed lines

@@ -43,7 +43,7 @@ 
      * @var	array
      * @access protected
      */
-    protected $dmdSec = array ();
+    protected $dmdSec = array();
 
     /**
      * Are the METS file's dmdSecs loaded?
@@ -69,7 +69,7 @@ 
      * @var	array
      * @access protected
      */
-    protected $fileGrps = array ();
+    protected $fileGrps = array();
 
     /**
      * Are the file groups loaded?
@@ -87,16 +87,16 @@ 
      * @var	array
      * @access protected
      */
-    protected $formats = array (
-        'OAI' => array (
+    protected $formats = array(
+        'OAI' => array(
             'rootElement' => 'OAI-PMH',
             'namespaceURI' => 'http://www.openarchives.org/OAI/2.0/',
         ),
-        'METS' => array (
+        'METS' => array(
             'rootElement' => 'mets',
             'namespaceURI' => 'http://www.loc.gov/METS/',
         ),
-        'XLINK' => array (
+        'XLINK' => array(
             'rootElement' => 'xlink',
             'namespaceURI' => 'http://www.w3.org/1999/xlink',
         )
@@ -125,7 +125,7 @@ 
      * @var	array
      * @access protected
      */
-    protected $lastSearchedPhysicalPage = array ('logicalPage' => NULL, 'physicalPage' => NULL);
+    protected $lastSearchedPhysicalPage = array('logicalPage' => NULL, 'physicalPage' => NULL);
 
     /**
      * This holds the documents location
@@ -141,7 +141,7 @@ 
      * @var	array
      * @access protected
      */
-    protected $logicalUnits = array ();
+    protected $logicalUnits = array();
 
     /**
      * This holds the documents' parsed metadata array with their corresponding structMap//div's ID as array key
@@ -149,7 +149,7 @@ 
      * @var	array
      * @access protected
      */
-    protected $metadataArray = array ();
+    protected $metadataArray = array();
 
     /**
      * Is the metadata array loaded?
@@ -190,7 +190,7 @@ 
      * @var	array
      * @access protected
      */
-    protected $physicalStructure = array ();
+    protected $physicalStructure = array();
 
     /**
      * This holds the physical structure metadata
@@ -198,7 +198,7 @@ 
      * @var	array
      * @access protected
      */
-    protected $physicalStructureInfo = array ();
+    protected $physicalStructureInfo = array();
 
     /**
      * Is the physical structure loaded?
@@ -223,7 +223,7 @@ 
      * @var	array
      * @access protected
      */
-    protected $rawTextArray = array ();
+    protected $rawTextArray = array();
 
     /**
      * Is the document instantiated successfully?
@@ -247,7 +247,7 @@ 
      * @var	array (tx_dlf_document)
      * @access protected
      */
-    protected static $registry = array ();
+    protected static $registry = array();
 
     /**
      * This holds the UID of the root document or zero if not multi-volumed
@@ -272,7 +272,7 @@ 
      * @var	array
      * @access protected
      */
-    protected $smLinks = array ('l2p' => array (), 'p2l' => array ());
+    protected $smLinks = array('l2p' => array(), 'p2l' => array());
 
     /**
      * Are the smLinks loaded?
@@ -289,7 +289,7 @@ 
      * @var	array
      * @access protected
      */
-    protected $tableOfContents = array ();
+    protected $tableOfContents = array();
 
     /**
      * Is the table of contents loaded?
@@ -373,7 +373,7 @@ 
     public static function clearRegistry() {
 
         // Reset registry array.
-        self::$registry = array ();
+        self::$registry = array();
 
     }
 
@@ -388,7 +388,7 @@ 
      */
     public function getFileLocation($id) {
 
-        if (!empty($id) && ($location = $this->mets->xpath('./mets:fileSec/mets:fileGrp/mets:file[@ID="'.$id.'"]/mets:FLocat[@LOCTYPE="URL"]'))) {
+        if (!empty($id) && ($location = $this->mets->xpath('./mets:fileSec/mets:fileGrp/mets:file[@ID="' . $id . '"]/mets:FLocat[@LOCTYPE="URL"]'))) {
 
             return (string) $location[0]->attributes('http://www.w3.org/1999/xlink')->href;
 
@@ -396,7 +396,7 @@ 
 
             if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_document->getFileLocation('.$id.')] There is no file node with @ID "'.$id.'"', self::$extKey, SYSLOG_SEVERITY_WARNING);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_document->getFileLocation(' . $id . ')] There is no file node with @ID "' . $id . '"', self::$extKey, SYSLOG_SEVERITY_WARNING);
 
             }
 
@@ -417,7 +417,7 @@ 
      */
     public function getFileMimeType($id) {
 
-        if (!empty($id) && ($mimetype = $this->mets->xpath('./mets:fileSec/mets:fileGrp/mets:file[@ID="'.$id.'"]/@MIMETYPE'))) {
+        if (!empty($id) && ($mimetype = $this->mets->xpath('./mets:fileSec/mets:fileGrp/mets:file[@ID="' . $id . '"]/@MIMETYPE'))) {
 
             return (string) $mimetype[0];
 
@@ -425,7 +425,7 @@ 
 
             if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_document->getFileMimeType('.$id.')] There is no file node with @ID "'.$id.'" or no MIME type specified', self::$extKey, SYSLOG_SEVERITY_WARNING);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_document->getFileMimeType(' . $id . ')] There is no file node with @ID "' . $id . '" or no MIME type specified', self::$extKey, SYSLOG_SEVERITY_WARNING);
 
             }
 
@@ -531,7 +531,7 @@ 
      */
     public function getLogicalStructure($id, $recursive = FALSE) {
 
-        $details = array ();
+        $details = array();
 
         // Is the requested logical unit already loaded?
         if (!$recursive && !empty($this->logicalUnits[$id])) {
@@ -542,7 +542,7 @@ 
         } elseif (!empty($id)) {
 
             // Get specified logical unit.
-            $divs = $this->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]//mets:div[@ID="'.$id.'"]');
+            $divs = $this->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]//mets:div[@ID="' . $id . '"]');
 
         } else {
 
@@ -598,7 +598,7 @@ 
         $extConf = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf'][self::$extKey]);
 
         // Extract identity information.
-        $details = array ();
+        $details = array();
 
         $details['id'] = $attributes['ID'];
 
@@ -677,7 +677,7 @@ 
         }
 
         // Get the files this structure element is pointing at.
-        $details['files'] = array ();
+        $details['files'] = array();
 
         $fileUse = $this->_getFileGrps();
 
@@ -699,7 +699,7 @@ 
         // Walk the structure recursively? And are there any children of the current element?
         if ($recursive && count($structure->children('http://www.loc.gov/METS/')->div)) {
 
-            $details['children'] = array ();
+            $details['children'] = array();
 
             foreach ($structure->children('http://www.loc.gov/METS/')->div as $child) {
 
@@ -743,11 +743,11 @@ 
 
             if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_document->getMetadata('.$id.', '.$_cPid.')] Invalid PID "'.$cPid.'" for metadata definitions', self::$extKey, SYSLOG_SEVERITY_ERROR);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_document->getMetadata(' . $id . ', ' . $_cPid . ')] Invalid PID "' . $cPid . '" for metadata definitions', self::$extKey, SYSLOG_SEVERITY_ERROR);
 
             }
 
-            return array ();
+            return array();
 
         }
 
@@ -759,25 +759,25 @@ 
         }
 
         // Initialize metadata array with empty values.
-        $metadata = array (
-            'title' => array (),
-            'title_sorting' => array (),
-            'author' => array (),
-            'place' => array (),
-            'year' => array (),
-            'prod_id' => array (),
-            'record_id' => array (),
-            'opac_id' => array (),
-            'union_id' => array (),
-            'urn' => array (),
-            'purl' => array (),
-            'type' => array (),
-            'volume' => array (),
-            'volume_sorting' => array (),
-            'collection' => array (),
-            'owner' => array (),
-            'mets_label' => array (),
-            'mets_orderlabel' => array (),
+        $metadata = array(
+            'title' => array(),
+            'title_sorting' => array(),
+            'author' => array(),
+            'place' => array(),
+            'year' => array(),
+            'prod_id' => array(),
+            'record_id' => array(),
+            'opac_id' => array(),
+            'union_id' => array(),
+            'urn' => array(),
+            'purl' => array(),
+            'type' => array(),
+            'volume' => array(),
+            'volume_sorting' => array(),
+            'collection' => array(),
+            'owner' => array(),
+            'mets_label' => array(),
+            'mets_orderlabel' => array(),
         );
 
         // Get the logical structure node's DMDID.
@@ -787,7 +787,7 @@ 
 
         } else {
 
-            $dmdId = $this->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]//mets:div[@ID="'.$id.'"]/@DMDID');
+            $dmdId = $this->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]//mets:div[@ID="' . $id . '"]/@DMDID');
 
             $dmdId = (string) $dmdId[0];
 
@@ -816,7 +816,7 @@ 
 
                         if (TYPO3_DLOG) {
 
-                            \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_document->getMetadata('.$id.', '.$_cPid.')] Invalid class/method "'.$class.'->extractMetadata()" for metadata format "'.$this->dmdSec[$dmdId]['type'].'"', self::$extKey, SYSLOG_SEVERITY_WARNING);
+                            \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_document->getMetadata(' . $id . ', ' . $_cPid . ')] Invalid class/method "' . $class . '->extractMetadata()" for metadata format "' . $this->dmdSec[$dmdId]['type'] . '"', self::$extKey, SYSLOG_SEVERITY_WARNING);
 
                         }
 
@@ -828,24 +828,24 @@ 
 
                 if (TYPO3_DLOG) {
 
-                    \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_document->getMetadata('.$id.', '.$_cPid.')] Unsupported metadata format "'.$this->dmdSec[$dmdId]['type'].'" in dmdSec with @ID "'.$dmdId.'"', self::$extKey, SYSLOG_SEVERITY_WARNING);
+                    \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_document->getMetadata(' . $id . ', ' . $_cPid . ')] Unsupported metadata format "' . $this->dmdSec[$dmdId]['type'] . '" in dmdSec with @ID "' . $dmdId . '"', self::$extKey, SYSLOG_SEVERITY_WARNING);
 
                 }
 
-                return array ();
+                return array();
 
             }
 
             // Get the structure's type.
             if (!empty($this->logicalUnits[$id])) {
 
-                $metadata['type'] = array ($this->logicalUnits[$id]['type']);
+                $metadata['type'] = array($this->logicalUnits[$id]['type']);
 
             } else {
 
-                $struct = $this->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]//mets:div[@ID="'.$id.'"]/@TYPE');
+                $struct = $this->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]//mets:div[@ID="' . $id . '"]/@TYPE');
 
-                $metadata['type'] = array ((string) $struct[0]);
+                $metadata['type'] = array((string) $struct[0]);
 
             }
 
@@ -853,7 +853,7 @@ 
             $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
                 'tx_dlf_metadata.index_name AS index_name,tx_dlf_metadataformat.xpath AS xpath,tx_dlf_metadataformat.xpath_sorting AS xpath_sorting,tx_dlf_metadata.is_sortable AS is_sortable,tx_dlf_metadata.default_value AS default_value,tx_dlf_metadata.format AS format',
                 'tx_dlf_metadata,tx_dlf_metadataformat,tx_dlf_formats',
-                'tx_dlf_metadata.pid='.$cPid.' AND tx_dlf_metadataformat.pid='.$cPid.' AND ((tx_dlf_metadata.uid=tx_dlf_metadataformat.parent_id AND tx_dlf_metadataformat.encoded=tx_dlf_formats.uid AND tx_dlf_formats.type='.$GLOBALS['TYPO3_DB']->fullQuoteStr($this->dmdSec[$dmdId]['type'], 'tx_dlf_formats').') OR tx_dlf_metadata.format=0)'.tx_dlf_helper::whereClause('tx_dlf_metadata', TRUE).tx_dlf_helper::whereClause('tx_dlf_metadataformat').tx_dlf_helper::whereClause('tx_dlf_formats'),
+                'tx_dlf_metadata.pid=' . $cPid . ' AND tx_dlf_metadataformat.pid=' . $cPid . ' AND ((tx_dlf_metadata.uid=tx_dlf_metadataformat.parent_id AND tx_dlf_metadataformat.encoded=tx_dlf_formats.uid AND tx_dlf_formats.type=' . $GLOBALS['TYPO3_DB']->fullQuoteStr($this->dmdSec[$dmdId]['type'], 'tx_dlf_formats') . ') OR tx_dlf_metadata.format=0)' . tx_dlf_helper::whereClause('tx_dlf_metadata', TRUE) . tx_dlf_helper::whereClause('tx_dlf_metadataformat') . tx_dlf_helper::whereClause('tx_dlf_formats'),
                 '',
                 '',
                 ''
@@ -874,7 +874,7 @@ 
 
                     if ($values instanceof DOMNodeList && $values->length > 0) {
 
-                        $metadata[$resArray['index_name']] = array ();
+                        $metadata[$resArray['index_name']] = array();
 
                         foreach ($values as $value) {
 
@@ -884,7 +884,7 @@ 
 
                     } elseif (!($values instanceof DOMNodeList)) {
 
-                        $metadata[$resArray['index_name']] = array (trim((string) $values));
+                        $metadata[$resArray['index_name']] = array(trim((string) $values));
 
                     }
 
@@ -896,7 +896,7 @@ 
                 // These empty fields are then shown within the search facets as 'empty'.
                 if (empty($metadata[$resArray['index_name']][0]) && strlen($resArray['default_value']) > 0) {
 
-                    $metadata[$resArray['index_name']] = array ($resArray['default_value']);
+                    $metadata[$resArray['index_name']] = array($resArray['default_value']);
 
                 }
 
@@ -907,19 +907,19 @@ 
 
                         if ($values instanceof DOMNodeList && $values->length > 0) {
 
-                            $metadata[$resArray['index_name'].'_sorting'][0] = trim((string) $values->item(0)->nodeValue);
+                            $metadata[$resArray['index_name'] . '_sorting'][0] = trim((string) $values->item(0)->nodeValue);
 
                         } elseif (!($values instanceof DOMNodeList)) {
 
-                            $metadata[$resArray['index_name'].'_sorting'][0] = trim((string) $values);
+                            $metadata[$resArray['index_name'] . '_sorting'][0] = trim((string) $values);
 
                         }
 
                     }
 
-                    if (empty($metadata[$resArray['index_name'].'_sorting'][0])) {
+                    if (empty($metadata[$resArray['index_name'] . '_sorting'][0])) {
 
-                        $metadata[$resArray['index_name'].'_sorting'][0] = $metadata[$resArray['index_name']][0];
+                        $metadata[$resArray['index_name'] . '_sorting'][0] = $metadata[$resArray['index_name']][0];
 
                     }
 
@@ -944,7 +944,7 @@ 
                     'tx_dlf_documents',
                     'tx_dlf_relations',
                     'tx_dlf_collections',
-                    'AND tx_dlf_collections.pid='.intval($cPid).' AND tx_dlf_documents.uid='.intval($this->uid).' AND tx_dlf_relations.ident='.$GLOBALS['TYPO3_DB']->fullQuoteStr('docs_colls', 'tx_dlf_relations').' AND tx_dlf_collections.sys_language_uid IN (-1,0)'.tx_dlf_helper::whereClause('tx_dlf_documents').tx_dlf_helper::whereClause('tx_dlf_collections'),
+                    'AND tx_dlf_collections.pid=' . intval($cPid) . ' AND tx_dlf_documents.uid=' . intval($this->uid) . ' AND tx_dlf_relations.ident=' . $GLOBALS['TYPO3_DB']->fullQuoteStr('docs_colls', 'tx_dlf_relations') . ' AND tx_dlf_collections.sys_language_uid IN (-1,0)' . tx_dlf_helper::whereClause('tx_dlf_documents') . tx_dlf_helper::whereClause('tx_dlf_collections'),
                     'tx_dlf_collections.index_name',
                     '',
                     ''
@@ -965,7 +965,7 @@ 
         } else {
 
             // There is no dmdSec for this structure node.
-            return array ();
+            return array();
 
         }
 
@@ -1074,7 +1074,7 @@ 
 
                 if (TYPO3_DLOG) {
 
-                    \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_document->getRawText('.$id.')] Invalid structure node @ID "'.$id.'"', self::$extKey, SYSLOG_SEVERITY_WARNING);
+                    \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_document->getRawText(' . $id . ')] Invalid structure node @ID "' . $id . '"', self::$extKey, SYSLOG_SEVERITY_WARNING);
 
                 }
 
@@ -1100,7 +1100,7 @@ 
 
                         if (TYPO3_DLOG) {
 
-                            \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_document->getRawText('.$id.')] Invalid class/method "'.$class.'->getRawText()" for text format "'.$textFormat.'"', self::$extKey, SYSLOG_SEVERITY_WARNING);
+                            \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_document->getRawText(' . $id . ')] Invalid class/method "' . $class . '->getRawText()" for text format "' . $textFormat . '"', self::$extKey, SYSLOG_SEVERITY_WARNING);
 
                         }
 
@@ -1112,7 +1112,7 @@ 
 
                 if (TYPO3_DLOG) {
 
-                    \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_document->getRawText('.$id.')] Unsupported text format "'.$textFormat.'" in physical node with @ID "'.$id.'"', self::$extKey, SYSLOG_SEVERITY_WARNING);
+                    \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_document->getRawText(' . $id . ')] Unsupported text format "' . $textFormat . '" in physical node with @ID "' . $id . '"', self::$extKey, SYSLOG_SEVERITY_WARNING);
 
                 }
 
@@ -1149,7 +1149,7 @@ 
             $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
                 'tx_dlf_documents.title,tx_dlf_documents.partof',
                 'tx_dlf_documents',
-                'tx_dlf_documents.uid='.$uid.tx_dlf_helper::whereClause('tx_dlf_documents'),
+                'tx_dlf_documents.uid=' . $uid . tx_dlf_helper::whereClause('tx_dlf_documents'),
                 '',
                 '',
                 '1'
@@ -1171,7 +1171,7 @@ 
 
                 if (TYPO3_DLOG) {
 
-                    \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_document->getTitle('.$_uid.', ['.($recursive ? 'TRUE' : 'FALSE').'])] No document with UID "'.$uid.'" found or document not accessible', self::$extKey, SYSLOG_SEVERITY_WARNING);
+                    \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_document->getTitle(' . $_uid . ', [' . ($recursive ? 'TRUE' : 'FALSE') . '])] No document with UID "' . $uid . '" found or document not accessible', self::$extKey, SYSLOG_SEVERITY_WARNING);
 
                 }
 
@@ -1181,7 +1181,7 @@ 
 
             if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_document->getTitle('.$_uid.', ['.($recursive ? 'TRUE' : 'FALSE').'])] Invalid UID "'.$uid.'" for document', self::$extKey, SYSLOG_SEVERITY_ERROR);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_document->getTitle(' . $_uid . ', [' . ($recursive ? 'TRUE' : 'FALSE') . '])] Invalid UID "' . $uid . '" for document', self::$extKey, SYSLOG_SEVERITY_ERROR);
 
             }
 
@@ -1247,7 +1247,7 @@ 
 
             if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_document->init()] No METS part found in document with UID "'.$this->uid.'"', self::$extKey, SYSLOG_SEVERITY_ERROR);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_document->init()] No METS part found in document with UID "' . $this->uid . '"', self::$extKey, SYSLOG_SEVERITY_ERROR);
 
             }
 
@@ -1305,7 +1305,7 @@ 
 
                 if (TYPO3_DLOG) {
 
-                    \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_document->load('.$location.')] Could not load XML file from "'.$location.'"', self::$extKey, SYSLOG_SEVERITY_ERROR);
+                    \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_document->load(' . $location . ')] Could not load XML file from "' . $location . '"', self::$extKey, SYSLOG_SEVERITY_ERROR);
 
                 }
 
@@ -1315,7 +1315,7 @@ 
 
             if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_document->load('.$location.')] Invalid file location "'.$location.'" for document loading', self::$extKey, SYSLOG_SEVERITY_ERROR);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_document->load(' . $location . ')] Invalid file location "' . $location . '" for document loading', self::$extKey, SYSLOG_SEVERITY_ERROR);
 
             }
 
@@ -1340,7 +1340,7 @@ 
             $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
                 'tx_dlf_formats.type AS type,tx_dlf_formats.root AS root,tx_dlf_formats.namespace AS namespace,tx_dlf_formats.class AS class',
                 'tx_dlf_formats',
-                'tx_dlf_formats.pid=0'.tx_dlf_helper::whereClause('tx_dlf_formats'),
+                'tx_dlf_formats.pid=0' . tx_dlf_helper::whereClause('tx_dlf_formats'),
                 '',
                 '',
                 ''
@@ -1349,7 +1349,7 @@ 
             while ($resArray = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($result)) {
 
                 // Update format registry.
-                $this->formats[$resArray['type']] = array (
+                $this->formats[$resArray['type']] = array(
                     'rootElement' => $resArray['root'],
                     'namespaceURI' => $resArray['namespace'],
                     'class' => $resArray['class']
@@ -1389,7 +1389,7 @@ 
 
             if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_document->registerNamespaces(['.get_class($obj).'])] Given object is neither a SimpleXMLElement nor a DOMXPath instance', self::$extKey, SYSLOG_SEVERITY_ERROR);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_document->registerNamespaces([' . get_class($obj) . '])] Given object is neither a SimpleXMLElement nor a DOMXPath instance', self::$extKey, SYSLOG_SEVERITY_ERROR);
 
             }
 
@@ -1427,7 +1427,7 @@ 
 
             if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_document->save('.$_pid.', '.$_core.')] Saving a document is only allowed in the backend', self::$extKey, SYSLOG_SEVERITY_ERROR);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_document->save(' . $_pid . ', ' . $_core . ')] Saving a document is only allowed in the backend', self::$extKey, SYSLOG_SEVERITY_ERROR);
 
             }
 
@@ -1451,7 +1451,7 @@ 
 
             if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_document->save('.$_pid.', '.$_core.')] Invalid PID "'.$pid.'" for document saving', self::$extKey, SYSLOG_SEVERITY_ERROR);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_document->save(' . $_pid . ', ' . $_core . ')] Invalid PID "' . $pid . '" for document saving', self::$extKey, SYSLOG_SEVERITY_ERROR);
 
             }
 
@@ -1477,7 +1477,7 @@ 
 
             if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_document->save('.$_pid.', '.$_core.')] No record identifier found to avoid duplication', self::$extKey, SYSLOG_SEVERITY_ERROR);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_document->save(' . $_pid . ', ' . $_core . ')] No record identifier found to avoid duplication', self::$extKey, SYSLOG_SEVERITY_ERROR);
 
             }
 
@@ -1492,7 +1492,7 @@ 
         $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
             'be_users.uid AS uid',
             'be_users',
-            'username='.$GLOBALS['TYPO3_DB']->fullQuoteStr('_cli_dlf', 'be_users').\TYPO3\CMS\Backend\Utility\BackendUtility::BEenableFields('be_users').\TYPO3\CMS\Backend\Utility\BackendUtility::deleteClause('be_users'),
+            'username=' . $GLOBALS['TYPO3_DB']->fullQuoteStr('_cli_dlf', 'be_users') . \TYPO3\CMS\Backend\Utility\BackendUtility::BEenableFields('be_users') . \TYPO3\CMS\Backend\Utility\BackendUtility::deleteClause('be_users'),
             '',
             '',
             '1'
@@ -1502,7 +1502,7 @@ 
 
             if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_document->save('.$_pid.', '.$_core.')] Backend user "_cli_dlf" not found or disabled', self::$extKey, SYSLOG_SEVERITY_ERROR);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_document->save(' . $_pid . ', ' . $_core . ')] Backend user "_cli_dlf" not found or disabled', self::$extKey, SYSLOG_SEVERITY_ERROR);
 
             }
 
@@ -1514,7 +1514,7 @@ 
         $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
             'tx_dlf_structures.uid AS uid',
             'tx_dlf_structures',
-            'tx_dlf_structures.pid='.intval($pid).' AND tx_dlf_structures.index_name='.$GLOBALS['TYPO3_DB']->fullQuoteStr($metadata['type'][0], 'tx_dlf_structures').tx_dlf_helper::whereClause('tx_dlf_structures'),
+            'tx_dlf_structures.pid=' . intval($pid) . ' AND tx_dlf_structures.index_name=' . $GLOBALS['TYPO3_DB']->fullQuoteStr($metadata['type'][0], 'tx_dlf_structures') . tx_dlf_helper::whereClause('tx_dlf_structures'),
             '',
             '',
             '1'
@@ -1528,7 +1528,7 @@ 
 
             if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_document->save('.$_pid.', '.$_core.')] Could not identify document/structure type '.$GLOBALS['TYPO3_DB']->fullQuoteStr($metadata['type'][0], 'tx_dlf_structures'), self::$extKey, SYSLOG_SEVERITY_ERROR);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_document->save(' . $_pid . ', ' . $_core . ')] Could not identify document/structure type ' . $GLOBALS['TYPO3_DB']->fullQuoteStr($metadata['type'][0], 'tx_dlf_structures'), self::$extKey, SYSLOG_SEVERITY_ERROR);
 
             }
 
@@ -1545,12 +1545,12 @@ 
         }
 
         // Get UIDs for collections.
-        $collections = array ();
+        $collections = array();
 
         $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
             'tx_dlf_collections.index_name AS index_name,tx_dlf_collections.uid AS uid',
             'tx_dlf_collections',
-            'tx_dlf_collections.pid='.intval($pid).' AND tx_dlf_collections.sys_language_uid IN (-1,0)'.tx_dlf_helper::whereClause('tx_dlf_collections'),
+            'tx_dlf_collections.pid=' . intval($pid) . ' AND tx_dlf_collections.sys_language_uid IN (-1,0)' . tx_dlf_helper::whereClause('tx_dlf_collections'),
             '',
             '',
             ''
@@ -1574,7 +1574,7 @@ 
                 // Insert new collection.
                 $collNewUid = uniqid('NEW');
 
-                $collData['tx_dlf_collections'][$collNewUid] = array (
+                $collData['tx_dlf_collections'][$collNewUid] = array(
                     'pid' => $pid,
                     'label' => $collection,
                     'index_name' => $collection,
@@ -1619,7 +1619,7 @@ 
         $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
             'tx_dlf_libraries.uid AS uid',
             'tx_dlf_libraries',
-            'tx_dlf_libraries.pid='.intval($pid).' AND tx_dlf_libraries.index_name='.$GLOBALS['TYPO3_DB']->fullQuoteStr($owner, 'tx_dlf_libraries').tx_dlf_helper::whereClause('tx_dlf_libraries'),
+            'tx_dlf_libraries.pid=' . intval($pid) . ' AND tx_dlf_libraries.index_name=' . $GLOBALS['TYPO3_DB']->fullQuoteStr($owner, 'tx_dlf_libraries') . tx_dlf_helper::whereClause('tx_dlf_libraries'),
             '',
             '',
             '1'
@@ -1634,7 +1634,7 @@ 
             // Insert new library.
             $libNewUid = uniqid('NEW');
 
-            $libData['tx_dlf_libraries'][$libNewUid] = array (
+            $libData['tx_dlf_libraries'][$libNewUid] = array(
                 'pid' => $pid,
                 'label' => $owner,
                 'index_name' => $owner,
@@ -1676,7 +1676,7 @@ 
         $partof = 0;
 
         // Get the closest ancestor of the current document which has a MPTR child.
-        $parentMptr = $this->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]//mets:div[@ID="'.$this->_getToplevelId().'"]/ancestor::mets:div[./mets:mptr][1]/mets:mptr');
+        $parentMptr = $this->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]//mets:div[@ID="' . $this->_getToplevelId() . '"]/ancestor::mets:div[./mets:mptr][1]/mets:mptr');
 
         if (!empty($parentMptr[0])) {
 
@@ -1738,14 +1738,14 @@ 
         }
 
         // Get metadata for lists and sorting.
-        $listed = array ();
+        $listed = array();
 
-        $sortable = array ();
+        $sortable = array();
 
         $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
             'tx_dlf_metadata.index_name AS index_name,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($pid).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($pid) . tx_dlf_helper::whereClause('tx_dlf_metadata'),
             '',
             '',
             ''
@@ -1772,7 +1772,7 @@ 
         }
 
         // Fill data array.
-        $data['tx_dlf_documents'][$this->uid] = array (
+        $data['tx_dlf_documents'][$this->uid] = array(
             'pid' => $pid,
             $GLOBALS['TCA']['tx_dlf_documents']['ctrl']['enablecolumns']['starttime'] => 0,
             $GLOBALS['TCA']['tx_dlf_documents']['ctrl']['enablecolumns']['endtime'] => 0,
@@ -1847,7 +1847,7 @@ 
 
             if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_document->save('.$_pid.', '.$_core.')] Invalid UID "'.$core.'" for Solr core', self::$extKey, SYSLOG_SEVERITY_NOTICE);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_document->save(' . $_pid . ', ' . $_core . ')] Invalid UID "' . $core . '" for Solr core', self::$extKey, SYSLOG_SEVERITY_NOTICE);
 
             }
 
@@ -1889,23 +1889,23 @@ 
 
             foreach ($dmdIds as $dmdId) {
 
-                if ($type = $this->mets->xpath('./mets:dmdSec[@ID="'.(string) $dmdId.'"]/mets:mdWrap[not(@MDTYPE="OTHER")]/@MDTYPE')) {
+                if ($type = $this->mets->xpath('./mets:dmdSec[@ID="' . (string) $dmdId . '"]/mets:mdWrap[not(@MDTYPE="OTHER")]/@MDTYPE')) {
 
                     if (!empty($this->formats[(string) $type[0]])) {
 
                         $type = (string) $type[0];
 
-                        $xml = $this->mets->xpath('./mets:dmdSec[@ID="'.(string) $dmdId.'"]/mets:mdWrap[@MDTYPE="'.$type.'"]/mets:xmlData/'.strtolower($type).':'.$this->formats[$type]['rootElement']);
+                        $xml = $this->mets->xpath('./mets:dmdSec[@ID="' . (string) $dmdId . '"]/mets:mdWrap[@MDTYPE="' . $type . '"]/mets:xmlData/' . strtolower($type) . ':' . $this->formats[$type]['rootElement']);
 
                     }
 
-                } elseif ($type = $this->mets->xpath('./mets:dmdSec[@ID="'.(string) $dmdId.'"]/mets:mdWrap[@MDTYPE="OTHER"]/@OTHERMDTYPE')) {
+                } elseif ($type = $this->mets->xpath('./mets:dmdSec[@ID="' . (string) $dmdId . '"]/mets:mdWrap[@MDTYPE="OTHER"]/@OTHERMDTYPE')) {
 
                     if (!empty($this->formats[(string) $type[0]])) {
 
                         $type = (string) $type[0];
 
-                        $xml = $this->mets->xpath('./mets:dmdSec[@ID="'.(string) $dmdId.'"]/mets:mdWrap[@MDTYPE="OTHER"][@OTHERMDTYPE="'.$type.'"]/mets:xmlData/'.strtolower($type).':'.$this->formats[$type]['rootElement']);
+                        $xml = $this->mets->xpath('./mets:dmdSec[@ID="' . (string) $dmdId . '"]/mets:mdWrap[@MDTYPE="OTHER"][@OTHERMDTYPE="' . $type . '"]/mets:xmlData/' . strtolower($type) . ':' . $this->formats[$type]['rootElement']);
 
                     }
 
@@ -2053,11 +2053,11 @@ 
 
             if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_document->getMetadataArray()] Invalid PID "'.$cPid.'" for metadata definitions', self::$extKey, SYSLOG_SEVERITY_ERROR);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_document->getMetadataArray()] Invalid PID "' . $cPid . '" for metadata definitions', self::$extKey, SYSLOG_SEVERITY_ERROR);
 
             }
 
-            return array ();
+            return array();
 
         }
 
@@ -2390,7 +2390,7 @@ 
 
                 if (TYPO3_DLOG) {
 
-                    \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_document->_getThumbnail()] Invalid PID "'.$cPid.'" for structure definitions', self::$extKey, SYSLOG_SEVERITY_ERROR);
+                    \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_document->_getThumbnail()] Invalid PID "' . $cPid . '" for structure definitions', self::$extKey, SYSLOG_SEVERITY_ERROR);
 
                 }
 
@@ -2425,7 +2425,7 @@ 
             $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
                 'tx_dlf_structures.thumbnail AS thumbnail',
                 'tx_dlf_structures',
-                'tx_dlf_structures.pid='.intval($cPid).' AND tx_dlf_structures.index_name='.$GLOBALS['TYPO3_DB']->fullQuoteStr($metadata['type'][0], 'tx_dlf_structures').tx_dlf_helper::whereClause('tx_dlf_structures'),
+                'tx_dlf_structures.pid=' . intval($cPid) . ' AND tx_dlf_structures.index_name=' . $GLOBALS['TYPO3_DB']->fullQuoteStr($metadata['type'][0], 'tx_dlf_structures') . tx_dlf_helper::whereClause('tx_dlf_structures'),
                 '',
                 '',
                 '1'
@@ -2441,7 +2441,7 @@ 
                     $strctType = tx_dlf_helper::getIndexName($resArray['thumbnail'], 'tx_dlf_structures', $cPid);
 
                     // Check if this document has a structure element of the desired type.
-                    $strctIds = $this->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]//mets:div[@TYPE="'.$strctType.'"]/@ID');
+                    $strctIds = $this->mets->xpath('./mets:structMap[@TYPE="LOGICAL"]//mets:div[@TYPE="' . $strctType . '"]/@ID');
 
                     if (!empty($strctIds)) {
 
@@ -2467,7 +2467,7 @@ 
 
             } elseif (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_document->_getThumbnail()] No structure of type "'.$metadata['type'][0].'" found in database', self::$extKey, SYSLOG_SEVERITY_ERROR);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_document->_getThumbnail()] No structure of type "' . $metadata['type'][0] . '" found in database', self::$extKey, SYSLOG_SEVERITY_ERROR);
 
             }
 
@@ -2579,7 +2579,7 @@ 
         // Prepare to check database for the requested document.
         if (\TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($uid)) {
 
-            $whereClause = 'tx_dlf_documents.uid='.intval($uid).tx_dlf_helper::whereClause('tx_dlf_documents');
+            $whereClause = 'tx_dlf_documents.uid=' . intval($uid) . tx_dlf_helper::whereClause('tx_dlf_documents');
 
         } else {
 
@@ -2632,7 +2632,7 @@ 
             if (!empty($location) && !empty($this->recordId)) {
 
                 // Try to match record identifier or location (both should be unique).
-                $whereClause = '(tx_dlf_documents.location='.$GLOBALS['TYPO3_DB']->fullQuoteStr($location, 'tx_dlf_documents').' OR tx_dlf_documents.record_id='.$GLOBALS['TYPO3_DB']->fullQuoteStr($this->recordId, 'tx_dlf_documents').')'.tx_dlf_helper::whereClause('tx_dlf_documents');
+                $whereClause = '(tx_dlf_documents.location=' . $GLOBALS['TYPO3_DB']->fullQuoteStr($location, 'tx_dlf_documents') . ' OR tx_dlf_documents.record_id=' . $GLOBALS['TYPO3_DB']->fullQuoteStr($this->recordId, 'tx_dlf_documents') . ')' . tx_dlf_helper::whereClause('tx_dlf_documents');
 
             } else {
 
@@ -2646,7 +2646,7 @@ 
         // Check for PID if needed.
         if ($pid) {
 
-            $whereClause .= ' AND tx_dlf_documents.pid='.intval($pid);
+            $whereClause .= ' AND tx_dlf_documents.pid=' . intval($pid);
 
         }
 
@@ -2703,7 +2703,7 @@ 
 
             if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_document->__construct('.$uid.', '.$pid.')] No document with UID "'.$uid.'" found or document not accessible', self::$extKey, SYSLOG_SEVERITY_ERROR);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_document->__construct(' . $uid . ', ' . $pid . ')] No document with UID "' . $uid . '" found or document not accessible', self::$extKey, SYSLOG_SEVERITY_ERROR);
 
             }
 
@@ -2722,13 +2722,13 @@ 
      */
     public function __get($var) {
 
-        $method = '_get'.ucfirst($var);
+        $method = '_get' . ucfirst($var);
 
         if (!property_exists($this, $var) || !method_exists($this, $method)) {
 
             if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_document->__get('.$var.')] There is no getter function for property "'.$var.'"', self::$extKey, SYSLOG_SEVERITY_WARNING);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_document->__get(' . $var . ')] There is no getter function for property "' . $var . '"', self::$extKey, SYSLOG_SEVERITY_WARNING);
 
             }
 
@@ -2754,13 +2754,13 @@ 
      */
     public function __set($var, $value) {
 
-        $method = '_set'.ucfirst($var);
+        $method = '_set' . ucfirst($var);
 
         if (!property_exists($this, $var) || !method_exists($this, $method)) {
 
             if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_document->__set('.$var.', '.$value.')] There is no setter function for property "'.$var.'"', self::$extKey, SYSLOG_SEVERITY_WARNING);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_document->__set(' . $var . ', ' . $value . ')] There is no setter function for property "' . $var . '"', self::$extKey, SYSLOG_SEVERITY_WARNING);
 
             }
 
@@ -2785,7 +2785,7 @@ 
         // SimpleXMLElement objects can't be serialized, thus save the XML as string for serialization
         $this->asXML = $this->xml->asXML();
 
-        return array ('uid', 'pid', 'recordId', 'parentId', 'asXML');
+        return array('uid', 'pid', 'recordId', 'parentId', 'asXML');
 
     }
 

common/class.tx_dlf_helper.php

Spacing +57 added lines, -57 removed lines

@@ -34,7 +34,7 @@ 
      * @var	array
      * @access protected
      */
-    protected static $locallang = array ();
+    protected static $locallang = array();
 
     /**
      * Adds a message to the message queue.
@@ -160,7 +160,7 @@ 
 
                 } elseif ($checksum == 10) {
 
-                    return self::checkIdentifier(($digits + 1).substr($id, -2, 2), 'SWD');
+                    return self::checkIdentifier(($digits + 1) . substr($id, -2, 2), 'SWD');
 
                 } elseif (substr($id, -1, 1) != $checksum) {
 
@@ -218,7 +218,7 @@ 
 
             if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_helper->decrypt('.$encrypted.', '.$hash.')] PHP extension "mcrypt" not available', self::$extKey, SYSLOG_SEVERITY_WARNING);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_helper->decrypt(' . $encrypted . ', ' . $hash . ')] PHP extension "mcrypt" not available', self::$extKey, SYSLOG_SEVERITY_WARNING);
 
             }
 
@@ -230,7 +230,7 @@ 
 
             if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_helper->decrypt('.$encrypted.', '.$hash.')] Invalid parameters given for decryption', self::$extKey, SYSLOG_SEVERITY_ERROR);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_helper->decrypt(' . $encrypted . ', ' . $hash . ')] Invalid parameters given for decryption', self::$extKey, SYSLOG_SEVERITY_ERROR);
 
             }
 
@@ -242,7 +242,7 @@ 
 
             if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_helper->decrypt('.$encrypted.', '.$hash.')] No encryption key set in TYPO3 configuration', self::$extKey, SYSLOG_SEVERITY_ERROR);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_helper->decrypt(' . $encrypted . ', ' . $hash . ')] No encryption key set in TYPO3 configuration', self::$extKey, SYSLOG_SEVERITY_ERROR);
 
             }
 
@@ -256,13 +256,13 @@ 
 
         $salt = substr($hash, 0, 10);
 
-        $hashed = $salt.substr(sha1($salt.$decrypted), -10);
+        $hashed = $salt . substr(sha1($salt . $decrypted), -10);
 
         if ($hashed !== $hash) {
 
             if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_helper->decrypt('.$encrypted.', '.$hash.')] Invalid hash "'.$hash.'" given for decryption', self::$extKey, SYSLOG_SEVERITY_WARNING);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_helper->decrypt(' . $encrypted . ', ' . $hash . ')] Invalid hash "' . $hash . '" given for decryption', self::$extKey, SYSLOG_SEVERITY_WARNING);
 
             }
 
@@ -291,7 +291,7 @@ 
 
             if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_helper->encrypt('.$string.')] PHP extension "mcrypt" not available', self::$extKey, SYSLOG_SEVERITY_WARNING);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_helper->encrypt(' . $string . ')] PHP extension "mcrypt" not available', self::$extKey, SYSLOG_SEVERITY_WARNING);
 
             }
 
@@ -303,7 +303,7 @@ 
 
             if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_helper->encrypt('.$string.')] No encryption key set in TYPO3 configuration', self::$extKey, SYSLOG_SEVERITY_ERROR);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_helper->encrypt(' . $string . ')] No encryption key set in TYPO3 configuration', self::$extKey, SYSLOG_SEVERITY_ERROR);
 
             }
 
@@ -317,9 +317,9 @@ 
 
         $salt = substr(md5(uniqid(rand(), TRUE)), 0, 10);
 
-        $hash = $salt.substr(sha1($salt.$string), -10);
+        $hash = $salt . substr(sha1($salt . $string), -10);
 
-        return array ('encrypted' => $encrypted, 'hash' => $hash);
+        return array('encrypted' => $encrypted, 'hash' => $hash);
 
     }
 
@@ -351,7 +351,7 @@ 
 
             if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_helper->getBeUser()] Unexpected TYPO3_MODE "'.TYPO3_MODE.'"', self::$extKey, SYSLOG_SEVERITY_ERROR);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_helper->getBeUser()] Unexpected TYPO3_MODE "' . TYPO3_MODE . '"', self::$extKey, SYSLOG_SEVERITY_ERROR);
 
             }
 
@@ -414,7 +414,7 @@ 
 
             if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_helper->getFeUser()] Unexpected TYPO3_MODE "'.TYPO3_MODE.'"', self::$extKey, SYSLOG_SEVERITY_ERROR);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_helper->getFeUser()] Unexpected TYPO3_MODE "' . TYPO3_MODE . '"', self::$extKey, SYSLOG_SEVERITY_ERROR);
 
             }
 
@@ -435,11 +435,11 @@ 
      */
     public static function getHookObjects($scriptRelPath) {
 
-        $hookObjects = array ();
+        $hookObjects = array();
 
-        if (is_array($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS'][self::$extKey.'/'.$scriptRelPath]['hookClass'])) {
+        if (is_array($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS'][self::$extKey . '/' . $scriptRelPath]['hookClass'])) {
 
-            foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS'][self::$extKey.'/'.$scriptRelPath]['hookClass'] as $classRef) {
+            foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS'][self::$extKey . '/' . $scriptRelPath]['hookClass'] as $classRef) {
 
                 $hookObjects[] = &\TYPO3\CMS\Core\Utility\GeneralUtility::getUserObj($classRef);
 
@@ -472,11 +472,11 @@ 
         // Sanitize input.
         $uid = max(intval($uid), 0);
 
-        if (!$uid || !in_array($table, array ('tx_dlf_collections', 'tx_dlf_libraries', 'tx_dlf_metadata', 'tx_dlf_structures', 'tx_dlf_solrcores'))) {
+        if (!$uid || !in_array($table, array('tx_dlf_collections', 'tx_dlf_libraries', 'tx_dlf_metadata', 'tx_dlf_structures', 'tx_dlf_solrcores'))) {
 
             if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_helper->getIndexName('.$_uid.', '.$table.', '.$_pid.')] Invalid UID "'.$uid.'" or table "'.$table.'"', self::$extKey, SYSLOG_SEVERITY_ERROR);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_helper->getIndexName(' . $_uid . ', ' . $table . ', ' . $_pid . ')] Invalid UID "' . $uid . '" or table "' . $table . '"', self::$extKey, SYSLOG_SEVERITY_ERROR);
 
             }
 
@@ -491,15 +491,15 @@ 
 
             $pid = max(intval($pid), 0);
 
-            $where = ' AND '.$table.'.pid='.$pid;
+            $where = ' AND ' . $table . '.pid=' . $pid;
 
         }
 
         // Get index_name from database.
         $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-            $table.'.index_name AS index_name',
+            $table . '.index_name AS index_name',
             $table,
-            $table.'.uid='.$uid.$where.self::whereClause($table),
+            $table . '.uid=' . $uid . $where . self::whereClause($table),
             '',
             '',
             '1'
@@ -515,7 +515,7 @@ 
 
             if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_helper->getIndexName('.$_uid.', '.$table.', '.$_pid.')] No "index_name" with UID "'.$uid.'" and PID "'.$pid.'" found in table "'.$table.'"', self::$extKey, SYSLOG_SEVERITY_WARNING);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_helper->getIndexName(' . $_uid . ', ' . $table . ', ' . $_pid . ')] No "index_name" with UID "' . $uid . '" and PID "' . $pid . '" found in table "' . $table . '"', self::$extKey, SYSLOG_SEVERITY_WARNING);
 
             }
 
@@ -543,11 +543,11 @@ 
 
         $_pid = $pid;
 
-        if (!$index_name || !in_array($table, array ('tx_dlf_collections', 'tx_dlf_libraries', 'tx_dlf_metadata', 'tx_dlf_structures', 'tx_dlf_solrcores'))) {
+        if (!$index_name || !in_array($table, array('tx_dlf_collections', 'tx_dlf_libraries', 'tx_dlf_metadata', 'tx_dlf_structures', 'tx_dlf_solrcores'))) {
 
             if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_helper->getIdFromIndexName('.$_index_name.', '.$table.', '.$_pid.')] Invalid UID "'.$index_name.'" or table "'.$table.'"', self::$extKey, SYSLOG_SEVERITY_ERROR);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_helper->getIdFromIndexName(' . $_index_name . ', ' . $table . ', ' . $_pid . ')] Invalid UID "' . $index_name . '" or table "' . $table . '"', self::$extKey, SYSLOG_SEVERITY_ERROR);
 
             }
 
@@ -562,15 +562,15 @@ 
 
             $pid = max(intval($pid), 0);
 
-            $where = ' AND '.$table.'.pid='.$pid;
+            $where = ' AND ' . $table . '.pid=' . $pid;
 
         }
 
         // Get index_name from database.
         $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-            $table.'.uid AS uid',
+            $table . '.uid AS uid',
             $table,
-            $table.'.index_name="'.$index_name.'"'.$where.self::whereClause($table),
+            $table . '.index_name="' . $index_name . '"' . $where . self::whereClause($table),
             '',
             '',
             '1'
@@ -586,7 +586,7 @@ 
 
             if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_helper->getIdFromIndexName('.$_index_name.', '.$table.', '.$_pid.')] No UID for given "index_name" "'.$index_name.'" and PID "'.$pid.'" found in table "'.$table.'"', self::$extKey, SYSLOG_SEVERITY_WARNING);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_helper->getIdFromIndexName(' . $_index_name . ', ' . $table . ', ' . $_pid . ')] No UID for given "index_name" "' . $index_name . '" and PID "' . $pid . '" found in table "' . $table . '"', self::$extKey, SYSLOG_SEVERITY_WARNING);
 
             }
 
@@ -612,11 +612,11 @@ 
 
         if (preg_match('/^[a-z]{3}$/', $isoCode)) {
 
-            $file = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath(self::$extKey).'lib/ISO-639/iso-639-2b.xml';
+            $file = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath(self::$extKey) . 'lib/ISO-639/iso-639-2b.xml';
 
         } elseif (preg_match('/^[a-z]{2}$/', $isoCode)) {
 
-            $file = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath(self::$extKey).'lib/ISO-639/iso-639-1.xml';
+            $file = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath(self::$extKey) . 'lib/ISO-639/iso-639-1.xml';
 
         } else {
 
@@ -650,7 +650,7 @@ 
 
             if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_helper->getLanguageName('.$code.')] Unexpected TYPO3_MODE "'.TYPO3_MODE.'"', self::$extKey, SYSLOG_SEVERITY_ERROR);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_helper->getLanguageName(' . $code . ')] Unexpected TYPO3_MODE "' . TYPO3_MODE . '"', self::$extKey, SYSLOG_SEVERITY_ERROR);
 
             }
 
@@ -666,7 +666,7 @@ 
 
             if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_helper->getLanguageName('.$code.')] Language code "'.$code.'" not found in ISO-639 table', self::$extKey, SYSLOG_SEVERITY_NOTICE);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_helper->getLanguageName(' . $code . ')] Language code "' . $code . '" not found in ISO-639 table', self::$extKey, SYSLOG_SEVERITY_NOTICE);
 
             }
 
@@ -705,7 +705,7 @@ 
 
             } elseif (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_helper->getLL('.$key.', '.$default.', ['.($hsc ? 'TRUE' : 'FALSE').'])] Unexpected TYPO3_MODE "'.TYPO3_MODE.'"', self::$extKey, SYSLOG_SEVERITY_ERROR);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_helper->getLL(' . $key . ', ' . $default . ', [' . ($hsc ? 'TRUE' : 'FALSE') . '])] Unexpected TYPO3_MODE "' . TYPO3_MODE . '"', self::$extKey, SYSLOG_SEVERITY_ERROR);
 
             }
 
@@ -724,7 +724,7 @@ 
 
             } elseif (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_helper->getLL('.$key.', '.$default.', ['.($hsc ? 'TRUE' : 'FALSE').'])] Unexpected TYPO3_MODE "'.TYPO3_MODE.'"', self::$extKey, SYSLOG_SEVERITY_ERROR);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_helper->getLL(' . $key . ', ' . $default . ', [' . ($hsc ? 'TRUE' : 'FALSE') . '])] Unexpected TYPO3_MODE "' . TYPO3_MODE . '"', self::$extKey, SYSLOG_SEVERITY_ERROR);
 
             }
 
@@ -754,7 +754,7 @@ 
      */
     public static function getURN($base, $id) {
 
-        $concordance = array (
+        $concordance = array(
             '0' => 1,
             '1' => 2,
             '2' => 3,
@@ -795,13 +795,13 @@ 
             ':' => 17,
         );
 
-        $urn = strtolower($base.$id);
+        $urn = strtolower($base . $id);
 
         if (preg_match('/[^a-z0-9:-]/', $urn)) {
 
             if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_helper->getURN('.$base.', '.$id.')] Invalid chars in given parameters', self::$extKey, SYSLOG_SEVERITY_WARNING);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_helper->getURN(' . $base . ', ' . $id . ')] Invalid chars in given parameters', self::$extKey, SYSLOG_SEVERITY_WARNING);
 
             }
 
@@ -827,7 +827,7 @@ 
 
         $checksum = substr(intval($checksum / intval(substr($digits, -1, 1))), -1, 1);
 
-        return $base.$id.$checksum;
+        return $base . $id . $checksum;
 
     }
 
@@ -867,7 +867,7 @@ 
 
             if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_helper->loadFromSession('.$_key.')] Invalid key "'.$key.'" for session data retrieval', self::$extKey, SYSLOG_SEVERITY_WARNING);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_helper->loadFromSession(' . $_key . ')] Invalid key "' . $key . '" for session data retrieval', self::$extKey, SYSLOG_SEVERITY_WARNING);
 
             }
 
@@ -888,7 +888,7 @@ 
 
             if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_helper->loadFromSession('.$_key.')] Unexpected TYPO3_MODE "'.TYPO3_MODE.'"', self::$extKey, SYSLOG_SEVERITY_ERROR);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_helper->loadFromSession(' . $_key . ')] Unexpected TYPO3_MODE "' . TYPO3_MODE . '"', self::$extKey, SYSLOG_SEVERITY_ERROR);
 
             }
 
@@ -910,7 +910,7 @@ 
      *
      * @return	array		Array of substituted "NEW..." identifiers and their actual UIDs.
      */
-    public static function processDB(array $data = array (), array $cmd = array (), $reverseOrder = FALSE, $be_user = FALSE) {
+    public static function processDB(array $data = array(), array $cmd = array(), $reverseOrder = FALSE, $be_user = FALSE) {
 
         // Instantiate TYPO3 core engine.
         $tce = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\DataHandling\\DataHandler');
@@ -968,7 +968,7 @@ 
      *
      * @return	array		Array of substituted "NEW..." identifiers and their actual UIDs.
      */
-    public static function processDBasAdmin(array $data = array (), array $cmd = array (), $reverseOrder = FALSE) {
+    public static function processDBasAdmin(array $data = array(), array $cmd = array(), $reverseOrder = FALSE) {
 
         if (TYPO3_MODE === 'BE' && $GLOBALS['BE_USER']->isAdmin()) {
 
@@ -978,11 +978,11 @@ 
 
             if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_helper->processDBasAdmin([data->data], [data->cmd], ['.($reverseOrder ? 'TRUE' : 'FALSE').'])] Current backend user has no admin privileges', self::$extKey, SYSLOG_SEVERITY_ERROR, array ('data' => $data, 'cmd' => $cmd));
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_helper->processDBasAdmin([data->data], [data->cmd], [' . ($reverseOrder ? 'TRUE' : 'FALSE') . '])] Current backend user has no admin privileges', self::$extKey, SYSLOG_SEVERITY_ERROR, array('data' => $data, 'cmd' => $cmd));
 
             }
 
-            return array ();
+            return array();
 
         }
 
@@ -1025,7 +1025,7 @@ 
 
                     if ($flashMessage->getTitle() !== '') {
 
-                        $messageContent = sprintf('<h4>%s</h4>', htmlspecialchars($flashMessage->getTitle())).$messageContent;
+                        $messageContent = sprintf('<h4>%s</h4>', htmlspecialchars($flashMessage->getTitle())) . $messageContent;
 
                     }
 
@@ -1065,7 +1065,7 @@ 
 
             if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_helper->saveToSession([data], '.$_key.')] Invalid key "'.$key.'" for session data saving', self::$extKey, SYSLOG_SEVERITY_WARNING, $value);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_helper->saveToSession([data], ' . $_key . ')] Invalid key "' . $key . '" for session data saving', self::$extKey, SYSLOG_SEVERITY_WARNING, $value);
 
             }
 
@@ -1092,7 +1092,7 @@ 
 
             if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_helper->saveToSession([data], '.$_key.')] Unexpected TYPO3_MODE "'.TYPO3_MODE.'"', self::$extKey, SYSLOG_SEVERITY_ERROR, $data);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_helper->saveToSession([data], ' . $_key . ')] Unexpected TYPO3_MODE "' . TYPO3_MODE . '"', self::$extKey, SYSLOG_SEVERITY_ERROR, $data);
 
             }
 
@@ -1121,7 +1121,7 @@ 
         $_pid = $pid;
 
         // Load labels into static variable for future use.
-        static $labels = array ();
+        static $labels = array();
 
         // Sanitize input.
         $pid = max(intval($pid), 0);
@@ -1130,7 +1130,7 @@ 
 
             if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_helper->translate('.$_index_name.', '.$table.', '.$_pid.')] Invalid PID "'.$pid.'" for translation', self::$extKey, SYSLOG_SEVERITY_WARNING);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_helper->translate(' . $_index_name . ', ' . $table . ', ' . $_pid . ')] Invalid PID "' . $pid . '" for translation', self::$extKey, SYSLOG_SEVERITY_WARNING);
 
             }
 
@@ -1153,7 +1153,7 @@ 
         $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
                 'uid, l18n_parent',
                 $table,
-                'pid='.$pid.' AND index_name="'.$index_name.'"'.self::whereClause($table, TRUE),
+                'pid=' . $pid . ' AND index_name="' . $index_name . '"' . self::whereClause($table, TRUE),
                 '',
                 '',
                 ''
@@ -1167,7 +1167,7 @@ 
             $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
                     'index_name',
                     $table,
-                    'pid='.$pid.' AND uid='.$resArray['l18n_parent'].' AND sys_language_uid='.intval($GLOBALS['TSFE']->sys_language_content).self::whereClause($table, TRUE),
+                    'pid=' . $pid . ' AND uid=' . $resArray['l18n_parent'] . ' AND sys_language_uid=' . intval($GLOBALS['TSFE']->sys_language_content) . self::whereClause($table, TRUE),
                     '',
                     '',
                     ''
@@ -1188,13 +1188,13 @@ 
         if (empty($labels[$table][$pid][$GLOBALS['TSFE']->sys_language_content][$index_name])) {
 
             // Check if this table is allowed for translation.
-            if (in_array($table, array ('tx_dlf_collections', 'tx_dlf_libraries', 'tx_dlf_metadata', 'tx_dlf_structures'))) {
+            if (in_array($table, array('tx_dlf_collections', 'tx_dlf_libraries', 'tx_dlf_metadata', 'tx_dlf_structures'))) {
 
                 $additionalWhere = ' AND sys_language_uid IN (-1,0)';
 
                 if ($GLOBALS['TSFE']->sys_language_content > 0) {
 
-                    $additionalWhere = ' AND (sys_language_uid IN (-1,0) OR (sys_language_uid='.intval($GLOBALS['TSFE']->sys_language_content).' AND l18n_parent=0))';
+                    $additionalWhere = ' AND (sys_language_uid IN (-1,0) OR (sys_language_uid=' . intval($GLOBALS['TSFE']->sys_language_content) . ' AND l18n_parent=0))';
 
                 }
 
@@ -1202,7 +1202,7 @@ 
                 $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
                     '*',
                     $table,
-                    'pid='.$pid.$additionalWhere.self::whereClause($table, TRUE),
+                    'pid=' . $pid . $additionalWhere . self::whereClause($table, TRUE),
                     '',
                     '',
                     ''
@@ -1231,7 +1231,7 @@ 
 
                     if (TYPO3_DLOG) {
 
-                        \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_helper->translate('.$_index_name.', '.$table.', '.$_pid.')] No translation with PID "'.$pid.'" available in table "'.$table.'" or translation not accessible', self::extKey, SYSLOG_SEVERITY_NOTICE);
+                        \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_helper->translate(' . $_index_name . ', ' . $table . ', ' . $_pid . ')] No translation with PID "' . $pid . '" available in table "' . $table . '" or translation not accessible', self::extKey, SYSLOG_SEVERITY_NOTICE);
 
                     }
 
@@ -1241,7 +1241,7 @@ 
 
                 if (TYPO3_DLOG) {
 
-                    \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_helper->translate('.$_index_name.', '.$table.', '.$_pid.')] No translations available for table "'.$table.'"', self::$extKey, SYSLOG_SEVERITY_WARNING);
+                    \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_helper->translate(' . $_index_name . ', ' . $table . ', ' . $_pid . ')] No translations available for table "' . $table . '"', self::$extKey, SYSLOG_SEVERITY_WARNING);
 
                 }
 
@@ -1314,7 +1314,7 @@ 
 
             if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_helper->whereClause('.$table.', ['.($showHidden ? 'TRUE' : 'FALSE').'])] Unexpected TYPO3_MODE "'.TYPO3_MODE.'"', self::$extKey, SYSLOG_SEVERITY_ERROR);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_helper->whereClause(' . $table . ', [' . ($showHidden ? 'TRUE' : 'FALSE') . '])] Unexpected TYPO3_MODE "' . TYPO3_MODE . '"', self::$extKey, SYSLOG_SEVERITY_ERROR);
 
             }
 

common/class.tx_dlf_indexing.php

Spacing +32 added lines, -32 removed lines

@@ -34,14 +34,14 @@ 
      * @var	array
      * @access protected
      */
-    protected static $fields = array (
-        'autocomplete' => array (),
-        'facets' => array (),
-        'sortables' => array (),
-        'indexed' => array (),
-        'stored' => array (),
-        'tokenized' => array (),
-        'fieldboost' => array ()
+    protected static $fields = array(
+        'autocomplete' => array(),
+        'facets' => array(),
+        'sortables' => array(),
+        'indexed' => array(),
+        'stored' => array(),
+        'tokenized' => array(),
+        'fieldboost' => array()
     );
 
     /**
@@ -59,7 +59,7 @@ 
      * @var	array
      * @access protected
      */
-    protected static $processedDocs = array ();
+    protected static $processedDocs = array();
 
     /**
      * Instance of tx_dlf_solr class
@@ -102,7 +102,7 @@ 
 
                     if (TYPO3_DLOG) {
 
-                        \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_indexing->add(['.$doc->uid.'], '.$core.')] Could not load parent document with UID "'.$doc->parentId.'"', self::$extKey, SYSLOG_SEVERITY_ERROR);
+                        \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_indexing->add([' . $doc->uid . '], ' . $core . ')] Could not load parent document with UID "' . $doc->parentId . '"', self::$extKey, SYSLOG_SEVERITY_ERROR);
 
                     }
 
@@ -119,7 +119,7 @@ 
 
                 // Delete old Solr documents.
                 $updateQuery = self::$solr->service->createUpdate();
-                $updateQuery->addDeleteQuery('uid:'.$doc->uid);
+                $updateQuery->addDeleteQuery('uid:' . $doc->uid);
                 self::$solr->service->update($updateQuery);
 
                 // Index every logical unit as separate Solr document.
@@ -165,7 +165,7 @@ 
                 $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
                     'tx_dlf_documents.title AS title',
                     'tx_dlf_documents',
-                    'tx_dlf_documents.uid='.intval($doc->uid).tx_dlf_helper::whereClause('tx_dlf_documents'),
+                    'tx_dlf_documents.uid=' . intval($doc->uid) . tx_dlf_helper::whereClause('tx_dlf_documents'),
                     '',
                     '',
                     '1'
@@ -209,7 +209,7 @@ 
 
                     $message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
                         'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-                        tx_dlf_helper::getLL('flash.solrException', TRUE).'<br />'.htmlspecialchars($e->getMessage()),
+                        tx_dlf_helper::getLL('flash.solrException', TRUE) . '<br />' . htmlspecialchars($e->getMessage()),
                         tx_dlf_helper::getLL('flash.error', TRUE),
                         \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
                         TRUE
@@ -221,7 +221,7 @@ 
 
                 if (TYPO3_DLOG) {
 
-                    \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_indexing->add(['.$doc->uid.'], '.$core.')] Apache Solr threw exception: "'.$e->getMessage().'"', self::$extKey, SYSLOG_SEVERITY_ERROR);
+                    \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_indexing->add([' . $doc->uid . '], ' . $core . ')] Apache Solr threw exception: "' . $e->getMessage() . '"', self::$extKey, SYSLOG_SEVERITY_ERROR);
 
                 }
 
@@ -247,7 +247,7 @@ 
 
             if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_indexing->add(['.$doc->uid.'], '.$core.')] Could not connect to Apache Solr server', self::$extKey, SYSLOG_SEVERITY_ERROR);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_indexing->add([' . $doc->uid . '], ' . $core . ')] Could not connect to Apache Solr server', self::$extKey, SYSLOG_SEVERITY_ERROR);
 
             }
 
@@ -278,7 +278,7 @@ 
         $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
             'tx_dlf_solrcores.uid AS uid,tx_dlf_documents.title AS title',
             'tx_dlf_solrcores,tx_dlf_documents',
-            'tx_dlf_solrcores.uid=tx_dlf_documents.solrcore AND tx_dlf_documents.uid='.$uid.tx_dlf_helper::whereClause('tx_dlf_solrcores'),
+            'tx_dlf_solrcores.uid=tx_dlf_documents.solrcore AND tx_dlf_documents.uid=' . $uid . tx_dlf_helper::whereClause('tx_dlf_solrcores'),
             '',
             '',
             '1'
@@ -295,7 +295,7 @@ 
 
                     // Delete Solr document.
                     $updateQuery = self::$solr->service->createUpdate();
-                    $updateQuery->addDeleteQuery('uid:'.$uid);
+                    $updateQuery->addDeleteQuery('uid:' . $uid);
                     $updateQuery->addCommit();
                     self::$solr->service->update($updateQuery);
 
@@ -305,7 +305,7 @@ 
 
                         $message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
                             'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-                            tx_dlf_helper::getLL('flash.solrException', TRUE).'<br />'.htmlspecialchars($e->getMessage()),
+                            tx_dlf_helper::getLL('flash.solrException', TRUE) . '<br />' . htmlspecialchars($e->getMessage()),
                             tx_dlf_helper::getLL('flash.error', TRUE),
                             \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
                             TRUE
@@ -317,7 +317,7 @@ 
 
                     if (TYPO3_DLOG) {
 
-                        \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_indexing->delete('.$_uid.')] Apache Solr threw exception: "'.$e->getMessage().'"', self::$extKey, SYSLOG_SEVERITY_ERROR);
+                        \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_indexing->delete(' . $_uid . ')] Apache Solr threw exception: "' . $e->getMessage() . '"', self::$extKey, SYSLOG_SEVERITY_ERROR);
 
                     }
 
@@ -343,7 +343,7 @@ 
 
                 if (TYPO3_DLOG) {
 
-                    \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_indexing->delete('.$_uid.')] Could not connect to Apache Solr server', self::$extKey, SYSLOG_SEVERITY_ERROR);
+                    \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_indexing->delete(' . $_uid . ')] Could not connect to Apache Solr server', self::$extKey, SYSLOG_SEVERITY_ERROR);
 
                 }
 
@@ -371,7 +371,7 @@ 
 
             if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_indexing->delete('.$_uid.')] Invalid UID "'.$uid.'" for document deletion', self::$extKey, SYSLOG_SEVERITY_ERROR);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_indexing->delete(' . $_uid . ')] Invalid UID "' . $uid . '" for document deletion', self::$extKey, SYSLOG_SEVERITY_ERROR);
 
             }
 
@@ -403,7 +403,7 @@ 
 
             if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_indexing->getIndexFieldName('.$index_name.', '.$_pid.')] Invalid PID "'.$pid.'" for metadata configuration', self::$extKey, SYSLOG_SEVERITY_ERROR);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_indexing->getIndexFieldName(' . $index_name . ', ' . $_pid . ')] Invalid PID "' . $pid . '" for metadata configuration', self::$extKey, SYSLOG_SEVERITY_ERROR);
 
             }
 
@@ -421,7 +421,7 @@ 
 
         $suffix .= (in_array($index_name, self::$fields['indexed']) ? 'i' : 'u');
 
-        $index_name .= '_'.$suffix;
+        $index_name .= '_' . $suffix;
 
         return $index_name;
 
@@ -444,7 +444,7 @@ 
             $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
                 'tx_dlf_metadata.index_name AS index_name,tx_dlf_metadata.index_tokenized AS index_tokenized,tx_dlf_metadata.index_stored AS index_stored,tx_dlf_metadata.index_indexed AS index_indexed,tx_dlf_metadata.is_sortable AS is_sortable,tx_dlf_metadata.is_facet AS is_facet,tx_dlf_metadata.is_listed AS is_listed,tx_dlf_metadata.index_autocomplete AS index_autocomplete,tx_dlf_metadata.index_boost AS index_boost',
                 'tx_dlf_metadata',
-                'tx_dlf_metadata.pid='.intval($pid).tx_dlf_helper::whereClause('tx_dlf_metadata'),
+                'tx_dlf_metadata.pid=' . intval($pid) . tx_dlf_helper::whereClause('tx_dlf_metadata'),
                 '',
                 '',
                 ''
@@ -538,7 +538,7 @@ 
             $solrDoc = $updateQuery->createDocument();
 
             // Create unique identifier from document's UID and unit's XML ID.
-            $solrDoc->setField('id', $doc->uid.$logicalUnit['id']);
+            $solrDoc->setField('id', $doc->uid . $logicalUnit['id']);
 
             $solrDoc->setField('uid', $doc->uid);
 
@@ -585,7 +585,7 @@ 
 
             $solrDoc->setField('collection', $doc->metadataArray[$doc->toplevelId]['collection']);
 
-            $autocomplete = array ();
+            $autocomplete = array();
 
             foreach ($metadata as $index_name => $data) {
 
@@ -596,14 +596,14 @@ 
                     if (in_array($index_name, self::$fields['sortables'])) {
 
                         // Add sortable fields to index.
-                        $solrDoc->setField($index_name.'_sorting', $metadata[$index_name.'_sorting'][0]);
+                        $solrDoc->setField($index_name . '_sorting', $metadata[$index_name . '_sorting'][0]);
 
                     }
 
                     if (in_array($index_name, self::$fields['facets'])) {
 
                         // Add facets to index.
-                        $solrDoc->setField($index_name.'_faceting', $data);
+                        $solrDoc->setField($index_name . '_faceting', $data);
 
                     }
 
@@ -644,7 +644,7 @@ 
 
                     $message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
                         'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-                        tx_dlf_helper::getLL('flash.solrException', TRUE).'<br />'.htmlspecialchars($e->getMessage()),
+                        tx_dlf_helper::getLL('flash.solrException', TRUE) . '<br />' . htmlspecialchars($e->getMessage()),
                         tx_dlf_helper::getLL('flash.error', TRUE),
                         \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
                         TRUE
@@ -748,7 +748,7 @@ 
             $solrDoc = $updateQuery->createDocument();
 
             // Create unique identifier from document's UID and unit's XML ID.
-            $solrDoc->setField('id', $doc->uid.$physicalUnit['id']);
+            $solrDoc->setField('id', $doc->uid . $physicalUnit['id']);
 
             $solrDoc->setField('uid', $doc->uid);
 
@@ -784,7 +784,7 @@ 
                     if (in_array($index_name, self::$fields['facets'])) {
 
                         // Add facets to index.
-                        $solrDoc->setField($index_name.'_faceting', $data);
+                        $solrDoc->setField($index_name . '_faceting', $data);
 
                     }
 
@@ -811,7 +811,7 @@ 
 
                     $message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
                         'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-                        tx_dlf_helper::getLL('flash.solrException', TRUE).'<br />'.htmlspecialchars($e->getMessage()),
+                        tx_dlf_helper::getLL('flash.solrException', TRUE) . '<br />' . htmlspecialchars($e->getMessage()),
                         tx_dlf_helper::getLL('flash.error', TRUE),
                         \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
                         TRUE

ext_autoload.php

Spacing +42 added lines, -42 removed lines

@@ -11,46 +11,46 @@
 
 $extensionPath = \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('dlf');
 
-return array (
-    'tx_dlf_cli' => $extensionPath.'cli/class.tx_dlf_cli.php',
-    'tx_dlf_alto' => $extensionPath.'common/class.tx_dlf_alto.php',
-    'tx_dlf_document' => $extensionPath.'common/class.tx_dlf_document.php',
-    'tx_dlf_format' => $extensionPath.'common/class.tx_dlf_format.php',
-    'tx_dlf_fulltext' => $extensionPath.'common/class.tx_dlf_fulltext.php',
-    'tx_dlf_helper' => $extensionPath.'common/class.tx_dlf_helper.php',
-    'tx_dlf_indexing' => $extensionPath.'common/class.tx_dlf_indexing.php',
-    'tx_dlf_list' => $extensionPath.'common/class.tx_dlf_list.php',
-    'tx_dlf_mods' => $extensionPath.'common/class.tx_dlf_mods.php',
-    'tx_dlf_module' => $extensionPath.'common/class.tx_dlf_module.php',
-    'tx_dlf_plugin' => $extensionPath.'common/class.tx_dlf_plugin.php',
-    'tx_dlf_solr' => $extensionPath.'common/class.tx_dlf_solr.php',
-    'tx_dlf_teihdr' => $extensionPath.'common/class.tx_dlf_teihdr.php',
-    'tx_dlf_doctype' => $extensionPath.'hooks/class.tx_dlf_doctype.php',
-    'tx_dlf_em' => $extensionPath.'hooks/class.tx_dlf_em.php',
-    'tx_dlf_hacks' => $extensionPath.'hooks/class.tx_dlf_hacks.php',
-    'tx_dlf_tceforms' => $extensionPath.'hooks/class.tx_dlf_tceforms.php',
-    'tx_dlf_tcemain' => $extensionPath.'hooks/class.tx_dlf_tcemain.php',
-    'tx_dlf_modIndexing' => $extensionPath.'modules/indexing/index.php',
-    'tx_dlf_modNewclient' => $extensionPath.'modules/newclient/index.php',
-    'tx_dlf_audioplayer' => $extensionPath.'plugins/audioplayer/class.tx_dlf_audioplayer.php',
-    'tx_dlf_basket' => $extensionPath.'plugins/basket/class.tx_dlf_basket.php',
-    'tx_dlf_collection' => $extensionPath.'plugins/collection/class.tx_dlf_collection.php',
-    'tx_dlf_feeds' => $extensionPath.'plugins/feeds/class.tx_dlf_feeds.php',
-    'tx_dlf_listview' => $extensionPath.'plugins/listview/class.tx_dlf_listview.php',
-    'tx_dlf_metadata' => $extensionPath.'plugins/metadata/class.tx_dlf_metadata.php',
-    'tx_dlf_navigation' => $extensionPath.'plugins/navigation/class.tx_dlf_navigation.php',
-    'tx_dlf_newspaper' => $extensionPath.'plugins/newspaper/class.tx_dlf_newspaper.php',
-    'tx_dlf_oai' => $extensionPath.'plugins/oai/class.tx_dlf_oai.php',
-    'tx_dlf_pagegrid' => $extensionPath.'plugins/pagegrid/class.tx_dlf_pagegrid.php',
-    'tx_dlf_pageview' => $extensionPath.'plugins/pageview/class.tx_dlf_pageview.php',
-    'tx_dlf_search' => $extensionPath.'plugins/search/class.tx_dlf_search.php',
-    'tx_dlf_search_suggest' => $extensionPath.'plugins/search/class.tx_dlf_search_suggest.php',
-    'tx_dlf_statistics' => $extensionPath.'plugins/statistics/class.tx_dlf_statistics.php',
-    'tx_dlf_toc' => $extensionPath.'plugins/toc/class.tx_dlf_toc.php',
-    'tx_dlf_toolbox' => $extensionPath.'plugins/toolbox/class.tx_dlf_toolbox.php',
-    'tx_dlf_toolsPdf' => $extensionPath.'plugins/toolbox/tools/pdf/class.tx_dlf_toolsPdf.php',
-    'tx_dlf_toolsFulltext' => $extensionPath.'plugins/toolbox/tools/fulltext/class.tx_dlf_toolsFulltext.php',
-    'tx_dlf_toolsImagemanipulation' => $extensionPath.'plugins/toolbox/tools/imagemanipulation/class.tx_dlf_toolsImagemanipulation.php',
-    'tx_dlf_toolsImagedownload' => $extensionPath.'plugins/toolbox/tools/imagedownload/class.tx_dlf_toolsImagedownload.php',
-    'tx_dlf_validator' => $extensionPath.'plugins/validator/class.tx_dlf_validator.php'
+return array(
+    'tx_dlf_cli' => $extensionPath . 'cli/class.tx_dlf_cli.php',
+    'tx_dlf_alto' => $extensionPath . 'common/class.tx_dlf_alto.php',
+    'tx_dlf_document' => $extensionPath . 'common/class.tx_dlf_document.php',
+    'tx_dlf_format' => $extensionPath . 'common/class.tx_dlf_format.php',
+    'tx_dlf_fulltext' => $extensionPath . 'common/class.tx_dlf_fulltext.php',
+    'tx_dlf_helper' => $extensionPath . 'common/class.tx_dlf_helper.php',
+    'tx_dlf_indexing' => $extensionPath . 'common/class.tx_dlf_indexing.php',
+    'tx_dlf_list' => $extensionPath . 'common/class.tx_dlf_list.php',
+    'tx_dlf_mods' => $extensionPath . 'common/class.tx_dlf_mods.php',
+    'tx_dlf_module' => $extensionPath . 'common/class.tx_dlf_module.php',
+    'tx_dlf_plugin' => $extensionPath . 'common/class.tx_dlf_plugin.php',
+    'tx_dlf_solr' => $extensionPath . 'common/class.tx_dlf_solr.php',
+    'tx_dlf_teihdr' => $extensionPath . 'common/class.tx_dlf_teihdr.php',
+    'tx_dlf_doctype' => $extensionPath . 'hooks/class.tx_dlf_doctype.php',
+    'tx_dlf_em' => $extensionPath . 'hooks/class.tx_dlf_em.php',
+    'tx_dlf_hacks' => $extensionPath . 'hooks/class.tx_dlf_hacks.php',
+    'tx_dlf_tceforms' => $extensionPath . 'hooks/class.tx_dlf_tceforms.php',
+    'tx_dlf_tcemain' => $extensionPath . 'hooks/class.tx_dlf_tcemain.php',
+    'tx_dlf_modIndexing' => $extensionPath . 'modules/indexing/index.php',
+    'tx_dlf_modNewclient' => $extensionPath . 'modules/newclient/index.php',
+    'tx_dlf_audioplayer' => $extensionPath . 'plugins/audioplayer/class.tx_dlf_audioplayer.php',
+    'tx_dlf_basket' => $extensionPath . 'plugins/basket/class.tx_dlf_basket.php',
+    'tx_dlf_collection' => $extensionPath . 'plugins/collection/class.tx_dlf_collection.php',
+    'tx_dlf_feeds' => $extensionPath . 'plugins/feeds/class.tx_dlf_feeds.php',
+    'tx_dlf_listview' => $extensionPath . 'plugins/listview/class.tx_dlf_listview.php',
+    'tx_dlf_metadata' => $extensionPath . 'plugins/metadata/class.tx_dlf_metadata.php',
+    'tx_dlf_navigation' => $extensionPath . 'plugins/navigation/class.tx_dlf_navigation.php',
+    'tx_dlf_newspaper' => $extensionPath . 'plugins/newspaper/class.tx_dlf_newspaper.php',
+    'tx_dlf_oai' => $extensionPath . 'plugins/oai/class.tx_dlf_oai.php',
+    'tx_dlf_pagegrid' => $extensionPath . 'plugins/pagegrid/class.tx_dlf_pagegrid.php',
+    'tx_dlf_pageview' => $extensionPath . 'plugins/pageview/class.tx_dlf_pageview.php',
+    'tx_dlf_search' => $extensionPath . 'plugins/search/class.tx_dlf_search.php',
+    'tx_dlf_search_suggest' => $extensionPath . 'plugins/search/class.tx_dlf_search_suggest.php',
+    'tx_dlf_statistics' => $extensionPath . 'plugins/statistics/class.tx_dlf_statistics.php',
+    'tx_dlf_toc' => $extensionPath . 'plugins/toc/class.tx_dlf_toc.php',
+    'tx_dlf_toolbox' => $extensionPath . 'plugins/toolbox/class.tx_dlf_toolbox.php',
+    'tx_dlf_toolsPdf' => $extensionPath . 'plugins/toolbox/tools/pdf/class.tx_dlf_toolsPdf.php',
+    'tx_dlf_toolsFulltext' => $extensionPath . 'plugins/toolbox/tools/fulltext/class.tx_dlf_toolsFulltext.php',
+    'tx_dlf_toolsImagemanipulation' => $extensionPath . 'plugins/toolbox/tools/imagemanipulation/class.tx_dlf_toolsImagemanipulation.php',
+    'tx_dlf_toolsImagedownload' => $extensionPath . 'plugins/toolbox/tools/imagedownload/class.tx_dlf_toolsImagedownload.php',
+    'tx_dlf_validator' => $extensionPath . 'plugins/validator/class.tx_dlf_validator.php'
 );