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);
 
         }
 

Braces +8 added lines, -4 removed lines

@@ -18,7 +18,8 @@ 
  * @access	public
  * @abstract
  */
-abstract class tx_dlf_module extends \TYPO3\CMS\Backend\Module\BaseScriptClass {
+abstract class tx_dlf_module extends \TYPO3\CMS\Backend\Module\BaseScriptClass
+{
 
     public $extKey = 'dlf';
 
@@ -87,7 +88,8 @@ 
      *
      * @return	void
      */
-    public function __construct() {
+    public function __construct()
+    {
 
         $GLOBALS['BE_USER']->modAccess($GLOBALS['MCONF'], 1);
 
@@ -124,7 +126,8 @@ 
      *
      * @return	void
      */
-    protected function setMOD_MENU() {
+    protected function setMOD_MENU()
+    {
 
         // Set $this->MOD_MENU array here or leave empty.
 
@@ -157,7 +160,8 @@ 
      *
      * @return	void
      */
-    protected function printContent() {
+    protected function printContent()
+    {
 
         // Add Javascript for function menu.
         $this->doc->JScode .= '

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";
 
             }
         }

Braces +14 added lines, -7 removed lines

@@ -18,7 +18,8 @@ 
  * @access	public
  * @abstract
  */
-abstract class tx_dlf_plugin extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin {
+abstract class tx_dlf_plugin extends \TYPO3\CMS\Frontend\Plugin\AbstractPlugin
+{
 
     public $extKey = 'dlf';
 
@@ -57,7 +58,8 @@ 
      *
      * @return	void
      */
-    protected function init(array $conf) {
+    protected function init(array $conf)
+    {
 
         // Read FlexForm configuration.
         $flexFormConf = array ();
@@ -123,7 +125,8 @@ 
      *
      * @return	void
      */
-    protected function loadDocument() {
+    protected function loadDocument()
+    {
 
         // Check for required variable.
         if (!empty($this->piVars['id']) && !empty($this->conf['pages'])) {
@@ -222,7 +225,8 @@ 
      *
      * @return	void
      */
-    public function pi_setPiVarDefaults() {
+    public function pi_setPiVarDefaults()
+    {
 
         if (is_array($this->conf['_DEFAULT_PI_VARS.'])) {
 
@@ -261,7 +265,8 @@ 
      *
      * @return	string		HTML content wrapped, ready to return to the parent object.
      */
-    public function pi_wrapInBaseClass($content) {
+    public function pi_wrapInBaseClass($content)
+    {
 
         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.
@@ -287,7 +292,8 @@ 
      *
      * @return	array		The resulting typoscript array
      */
-    protected function parseTS($string = '') {
+    protected function parseTS($string = '')
+    {
 
         $parser = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\TypoScript\\Parser\\TypoScriptParser');
 
@@ -306,7 +312,8 @@ 
      *
      * @return	void
      */
-    protected function setCache($cache = TRUE) {
+    protected function setCache($cache = TRUE)
+    {
 
         if ($cache) {
 

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'],

Braces +38 added lines, -19 removed lines

@@ -18,7 +18,8 @@ 
  * @subpackage	tx_dlf
  * @access	public
  */
-class tx_dlf_solr {
+class tx_dlf_solr
+{
 
     /**
      * This holds the core name
@@ -101,7 +102,8 @@ 
      *
      * @return	string		The escaped query string
      */
-    public static function escapeQuery($query) {
+    public static function escapeQuery($query)
+    {
 
         $helper = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('Solarium\Core\Query\Helper');
 
@@ -128,7 +130,8 @@ 
      *
      * @return	string		The escaped query string
      */
-    public static function escapeQueryKeepField($query, $pid) {
+    public static function escapeQueryKeepField($query, $pid)
+    {
 
         // Is there a field query?
         if (preg_match('/^[[:alnum:]]+_[tu][su]i:\(?.*\)?$/', $query)) {
@@ -188,7 +191,8 @@ 
      *
      * @return	tx_dlf_solr		Instance of this class
      */
-    public static function getInstance($core) {
+    public static function getInstance($core)
+    {
 
         // Save parameter for logging purposes.
         $_core = $core;
@@ -253,7 +257,8 @@ 
      *
      * @return	string		The connection parameters for a specific Solr core
      */
-    public static function getSolrConnectionInfo() {
+    public static function getSolrConnectionInfo()
+    {
 
         $solrInfo = array ();
 
@@ -292,7 +297,8 @@ 
      *
      * @return	string		The request URL for a specific Solr core
      */
-    public static function getSolrUrl($core = '') {
+    public static function getSolrUrl($core = '')
+    {
 
         // Get Solr connection information.
         $solrInfo = self::getSolrConnectionInfo();
@@ -321,7 +327,8 @@ 
      *
      * @return	integer		First unused core number found
      */
-    public static function solrGetCoreNumber($start = 0) {
+    public static function solrGetCoreNumber($start = 0)
+    {
 
         $start = max(intval($start), 0);
 
@@ -345,7 +352,8 @@ 
      *
      * @return	tx_dlf_list		The result list
      */
-    public function search() {
+    public function search()
+    {
 
         $toplevel = array ();
 
@@ -447,7 +455,8 @@ 
      *
      * @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;
@@ -494,7 +503,8 @@ 
      *
      * @return	integer		The max number of results
      */
-    protected function _getLimit() {
+    protected function _getLimit()
+    {
 
         return $this->limit;
 
@@ -507,7 +517,8 @@ 
      *
      * @return	integer		Total number of hits for last search
      */
-    protected function _getNumberOfHits() {
+    protected function _getNumberOfHits()
+    {
 
         return $this->numberOfHits;
 
@@ -520,7 +531,8 @@ 
      *
      * @return	boolean		Is the search instantiated successfully?
      */
-    protected function _getReady() {
+    protected function _getReady()
+    {
 
         return $this->ready;
 
@@ -533,7 +545,8 @@ 
      *
      * @return	Solarium\Client		Apache Solr service object
      */
-    protected function _getService() {
+    protected function _getService()
+    {
 
         return $this->service;
 
@@ -548,7 +561,8 @@ 
      *
      * @return	void
      */
-    protected function _setCPid($value) {
+    protected function _setCPid($value)
+    {
 
         $this->cPid = max(intval($value), 0);
 
@@ -563,7 +577,8 @@ 
      *
      * @return	void
      */
-    protected function _setLimit($value) {
+    protected function _setLimit($value)
+    {
 
         $this->limit = max(intval($value), 0);
 
@@ -578,7 +593,8 @@ 
      *
      * @return	void
      */
-    protected function _setParams(array $value) {
+    protected function _setParams(array $value)
+    {
 
         $this->params = $value;
 
@@ -593,7 +609,8 @@ 
      *
      * @return	mixed		Value of $this->$var
      */
-    public function __get($var) {
+    public function __get($var)
+    {
 
         $method = '_get'.ucfirst($var);
 
@@ -625,7 +642,8 @@ 
      *
      * @return	void
      */
-    public function __set($var, $value) {
+    public function __set($var, $value)
+    {
 
         $method = '_set'.ucfirst($var);
 
@@ -654,7 +672,8 @@ 
      *
      * @return	void
      */
-    protected function __construct($core) {
+    protected function __construct($core)
+    {
 
         $solrInfo = self::getSolrConnectionInfo();
 

common/class.tx_dlf_fulltext.php

Braces +2 added lines, -1 removed lines

@@ -18,7 +18,8 @@
  * @access	public
  * @abstract
  */
-interface tx_dlf_fulltext {
+interface tx_dlf_fulltext
+{
 
     /**
      * This extracts raw fulltext data from XML

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');
 
     }
 

Braces +59 added lines, -29 removed lines

@@ -89,7 +89,8 @@ 
      *
      * @return	void
      */
-    public function add(array $elements, $position = -1) {
+    public function add(array $elements, $position = -1)
+    {
 
         $position = \TYPO3\CMS\Core\Utility\MathUtility::forceIntegerInRange($position, 0, $this->count, $this->count);
 
@@ -111,7 +112,8 @@ 
      *
      * @return	integer		The number of elements in the list
      */
-    public function count() {
+    public function count()
+    {
 
         return $this->count;
 
@@ -125,7 +127,8 @@ 
      *
      * @return	array		The current element
      */
-    public function current() {
+    public function current()
+    {
 
         if ($this->valid()) {
 
@@ -154,7 +157,8 @@ 
      *
      * @return	mixed		The element's full record
      */
-    protected function getRecord($element) {
+    protected function getRecord($element)
+    {
 
         if (is_array($element) && array_keys($element) == array ('u', 'h', 's', 'p')) {
 
@@ -378,7 +382,8 @@ 
      *
      * @return	integer		The current position
      */
-    public function key() {
+    public function key()
+    {
 
         return $this->position;
 
@@ -396,7 +401,8 @@ 
      *
      * @return	void
      */
-    public function move($position, $steps) {
+    public function move($position, $steps)
+    {
 
         // Save parameters for logging purposes.
         $_position = $position;
@@ -448,7 +454,8 @@ 
      *
      * @return	void
      */
-    public function moveUp($position) {
+    public function moveUp($position)
+    {
 
         $this->move($position, -1);
 
@@ -463,7 +470,8 @@ 
      *
      * @return	void
      */
-    public function moveDown($position) {
+    public function moveDown($position)
+    {
 
         $this->move($position, 1);
 
@@ -477,7 +485,8 @@ 
      *
      * @return	void
      */
-    public function next() {
+    public function next()
+    {
 
         $this->position++;
 
@@ -493,7 +502,8 @@ 
      *
      * @return	boolean		Does the given offset exist?
      */
-    public function offsetExists($offset) {
+    public function offsetExists($offset)
+    {
 
         return isset($this->elements[$offset]);
 
@@ -509,7 +519,8 @@ 
      *
      * @return	array		The element at the given offset
      */
-    public function offsetGet($offset) {
+    public function offsetGet($offset)
+    {
 
         if ($this->offsetExists($offset)) {
 
@@ -540,7 +551,8 @@ 
      *
      * @return	void
      */
-    public function offsetSet($offset, $value) {
+    public function offsetSet($offset, $value)
+    {
 
         if (\TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($offset)) {
 
@@ -568,7 +580,8 @@ 
      *
      * @return	array		The removed element
      */
-    public function remove($position) {
+    public function remove($position)
+    {
 
         // Save parameter for logging purposes.
         $_position = $position;
@@ -606,7 +619,8 @@ 
      *
      * @return	array		The indizes of the removed elements
      */
-    public function removeRange($position, $length) {
+    public function removeRange($position, $length)
+    {
 
         // Save parameter for logging purposes.
         $_position = $position;
@@ -637,7 +651,8 @@ 
      *
      * @return	void
      */
-    public function reset() {
+    public function reset()
+    {
 
         $this->elements = array ();
 
@@ -659,7 +674,8 @@ 
      *
      * @return	void
      */
-    public function rewind() {
+    public function rewind()
+    {
 
         $this->position = 0;
 
@@ -674,7 +690,8 @@ 
      *
      * @return	void
      */
-    public function save($pid = 0) {
+    public function save($pid = 0)
+    {
 
         $pid = max(intval($pid), 0);
 
@@ -698,7 +715,8 @@ 
      *
      * @return	boolean		TRUE on success or FALSE on failure
      */
-    protected function solrConnect() {
+    protected function solrConnect()
+    {
 
         // Get Solr instance.
         if (!$this->solr) {
@@ -747,7 +765,8 @@ 
      *
      * @return	void
      */
-    public function sort($by, $asc = TRUE) {
+    public function sort($by, $asc = TRUE)
+    {
 
         $newOrder = array ();
 
@@ -809,7 +828,8 @@ 
      *
      * @return	void
      */
-    public function offsetUnset($offset) {
+    public function offsetUnset($offset)
+    {
 
         unset ($this->elements[$offset]);
 
@@ -828,7 +848,8 @@ 
      *
      * @return	boolean		Is the current list position valid?
      */
-    public function valid() {
+    public function valid()
+    {
 
         return isset($this->elements[$this->position]);
 
@@ -841,7 +862,8 @@ 
      *
      * @return	array		The list's metadata
      */
-    protected function _getMetadata() {
+    protected function _getMetadata()
+    {
 
         return $this->metadata;
 
@@ -856,7 +878,8 @@ 
      *
      * @return	void
      */
-    protected function _setMetadata(array $metadata = array ()) {
+    protected function _setMetadata(array $metadata = array ())
+    {
 
         $this->metadata = $metadata;
 
@@ -872,7 +895,8 @@ 
      *
      * @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)) {
 
@@ -918,7 +942,9 @@ 
      *
      * @return	void
      */
-    protected function __clone() {}
+    protected function __clone()
+    {
+}
 
     /**
      * This magic method is called each time an invisible property is referenced from the object
@@ -929,7 +955,8 @@ 
      *
      * @return	mixed		Value of $this->$var
      */
-    public function __get($var) {
+    public function __get($var)
+    {
 
         $method = '_get'.ucfirst($var);
 
@@ -961,7 +988,8 @@ 
      *
      * @return	void
      */
-    public function __set($var, $value) {
+    public function __set($var, $value)
+    {
 
         $method = '_set'.ucfirst($var);
 
@@ -989,7 +1017,8 @@ 
      *
      * @return	array		Properties to be serialized
      */
-    public function __sleep() {
+    public function __sleep()
+    {
 
         return array ('elements', 'metadata');
 
@@ -1003,7 +1032,8 @@ 
      *
      * @return	void
      */
-    public function __wakeup() {
+    public function __wakeup()
+    {
 
         $this->count = count($this->elements);
 

common/class.tx_dlf_teihdr.php

Braces +4 added lines, -2 removed lines

@@ -17,7 +17,8 @@ 
  * @subpackage	tx_dlf
  * @access	public
  */
-class tx_dlf_teihdr implements tx_dlf_format {
+class tx_dlf_teihdr implements tx_dlf_format
+{
 
     /**
      * This extracts the essential TEIHDR metadata from XML
@@ -29,7 +30,8 @@ 
      *
      * @return	void
      */
-    public function extractMetadata(SimpleXMLElement $xml, array &$metadata) {
+    public function extractMetadata(SimpleXMLElement $xml, array &$metadata)
+    {
 
         $xml->registerXPathNamespace('teihdr', 'http://www.tei-c.org/ns/1.0');
 

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'];
                 }
 
             }

Braces +4 added lines, -2 removed lines

@@ -17,7 +17,8 @@ 
  * @subpackage	tx_dlf
  * @access	public
  */
-class tx_dlf_mods implements tx_dlf_format {
+class tx_dlf_mods implements tx_dlf_format
+{
 
     /**
      * This extracts the essential MODS metadata from XML
@@ -29,7 +30,8 @@ 
      *
      * @return	void
      */
-    public function extractMetadata(SimpleXMLElement $xml, array &$metadata) {
+    public function extractMetadata(SimpleXMLElement $xml, array &$metadata)
+    {
 
         $xml->registerXPathNamespace('mods', 'http://www.loc.gov/mods/v3');
 

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');
 
     }
 

Braces +91 added lines, -45 removed lines

@@ -18,7 +18,8 @@ 
  * @subpackage	tx_dlf
  * @access	public
  */
-final class tx_dlf_document {
+final class tx_dlf_document
+{
 
     /**
      * This holds the whole XML file as string for serialization purposes
@@ -351,7 +352,8 @@ 
      *
      * @return  void
      */
-    public function addMetadataFromMets(&$metadata, $id) {
+    public function addMetadataFromMets(&$metadata, $id)
+    {
         $details = $this->getLogicalStructure($id);
         if (!empty($details)) {
             $metadata['mets_label'][0] = $details['label'];
@@ -370,7 +372,8 @@ 
      *
      * @return	void
      */
-    public static function clearRegistry() {
+    public static function clearRegistry()
+    {
 
         // Reset registry array.
         self::$registry = array ();
@@ -386,7 +389,8 @@ 
      *
      * @return	string		The file's location as URL
      */
-    public function getFileLocation($id) {
+    public function getFileLocation($id)
+    {
 
         if (!empty($id) && ($location = $this->mets->xpath('./mets:fileSec/mets:fileGrp/mets:file[@ID="'.$id.'"]/mets:FLocat[@LOCTYPE="URL"]'))) {
 
@@ -415,7 +419,8 @@ 
      *
      * @return	string		The file's MIME type
      */
-    public function getFileMimeType($id) {
+    public function getFileMimeType($id)
+    {
 
         if (!empty($id) && ($mimetype = $this->mets->xpath('./mets:fileSec/mets:fileGrp/mets:file[@ID="'.$id.'"]/@MIMETYPE'))) {
 
@@ -529,7 +534,8 @@ 
      *
      * @return	array		Array of the element's id, label, type and physical page indexes/mptr link
      */
-    public function getLogicalStructure($id, $recursive = FALSE) {
+    public function getLogicalStructure($id, $recursive = FALSE)
+    {
 
         $details = array ();
 
@@ -585,7 +591,8 @@ 
      *
      * @return	array		Array of the element's id, label, type and physical page indexes/mptr link
      */
-    protected function getLogicalStructureInfo(SimpleXMLElement $structure, $recursive = FALSE) {
+    protected function getLogicalStructureInfo(SimpleXMLElement $structure, $recursive = FALSE)
+    {
 
         // Get attributes.
         foreach ($structure->attributes() as $attribute => $value) {
@@ -725,7 +732,8 @@ 
      *
      * @return	array		The logical structure node's parsed metadata array
      */
-    public function getMetadata($id, $cPid = 0) {
+    public function getMetadata($id, $cPid = 0)
+    {
 
         // Save parameter for logging purposes.
         $_cPid = $cPid;
@@ -982,7 +990,8 @@ 
      *
      * @return	integer		The physical page number
      */
-    public function getPhysicalPage($logicalPage) {
+    public function getPhysicalPage($logicalPage)
+    {
 
         if (!empty($this->lastSearchedPhysicalPage['logicalPage']) && $this->lastSearchedPhysicalPage['logicalPage'] == $logicalPage) {
 
@@ -1022,7 +1031,8 @@ 
      *
      * @return	string		The physical structure node's raw text
      */
-    public function getRawText($id) {
+    public function getRawText($id)
+    {
 
         $rawText = '';
 
@@ -1134,7 +1144,8 @@ 
      *
      * @return	string		The title of the document itself or a parent document
      */
-    public static function getTitle($uid, $recursive = FALSE) {
+    public static function getTitle($uid, $recursive = FALSE)
+    {
 
         // Save parameter for logging purposes.
         $_uid = $uid;
@@ -1200,7 +1211,8 @@ 
      *
      * @return	array		The logical structure node's parsed metadata array
      */
-    public function getTitledata($cPid = 0) {
+    public function getTitledata($cPid = 0)
+    {
 
         $titledata = $this->getMetadata($this->_getToplevelId(), $cPid);
 
@@ -1229,7 +1241,8 @@ 
      *
      * @return	void
      */
-    protected function init() {
+    protected function init()
+    {
 
         // Get METS node from XML file.
         $this->registerNamespaces($this->xml);
@@ -1264,7 +1277,8 @@ 
      *
      * @return	boolean		TRUE on success or FALSE on failure
      */
-    protected function load($location) {
+    protected function load($location)
+    {
 
         // Load XML file.
         if (\TYPO3\CMS\Core\Utility\GeneralUtility::isValidUrl($location)) {
@@ -1332,7 +1346,8 @@ 
      *
      * @return	void
      */
-    protected function loadFormats() {
+    protected function loadFormats()
+    {
 
         if (!$this->formatsLoaded) {
 
@@ -1372,7 +1387,8 @@ 
      *
      * @return	void
      */
-    public function registerNamespaces(&$obj) {
+    public function registerNamespaces(&$obj)
+    {
 
         $this->loadFormats();
 
@@ -1416,7 +1432,8 @@ 
      *
      * @return	boolean		TRUE on success or FALSE on failure
      */
-    public function save($pid = 0, $core = 0) {
+    public function save($pid = 0, $core = 0)
+    {
 
         // Save parameters for logging purposes.
         $_pid = $pid;
@@ -1864,7 +1881,8 @@ 
      *
      * @return	integer		The PID of the metadata definitions
      */
-    protected function _getCPid() {
+    protected function _getCPid()
+    {
 
         return $this->cPid;
 
@@ -1877,7 +1895,8 @@ 
      *
      * @return	array		Array of dmdSecs with their IDs as array key
      */
-    protected function _getDmdSec() {
+    protected function _getDmdSec()
+    {
 
         if (!$this->dmdSecLoaded) {
 
@@ -1938,7 +1957,8 @@ 
      *
      * @return	array		Array of file use groups with file IDs
      */
-    protected function _getFileGrps() {
+    protected function _getFileGrps()
+    {
 
         if (!$this->fileGrpsLoaded) {
 
@@ -2011,7 +2031,8 @@ 
      *
      * @return	boolean		Are there any fulltext files available?
      */
-    protected function _getHasFulltext() {
+    protected function _getHasFulltext()
+    {
 
         // Are the fileGrps already loaded?
         if (!$this->fileGrpsLoaded) {
@@ -2031,7 +2052,8 @@ 
      *
      * @return	string		The location of the document
      */
-    protected function _getLocation() {
+    protected function _getLocation()
+    {
 
         return $this->location;
 
@@ -2044,7 +2066,8 @@ 
      *
      * @return	array		Array of metadata with their corresponding logical structure node ID as key
      */
-    protected function _getMetadataArray() {
+    protected function _getMetadataArray()
+    {
 
         // Set metadata definitions' PID.
         $cPid = ($this->cPid ? $this->cPid : $this->pid);
@@ -2092,7 +2115,8 @@ 
      *
      * @return	SimpleXMLElement		The XML's METS part as SimpleXMLElement object
      */
-    protected function _getMets() {
+    protected function _getMets()
+    {
 
         return $this->mets;
 
@@ -2105,7 +2129,8 @@ 
      *
      * @return	integer		The total number of pages and/or tracks
      */
-    protected function _getNumPages() {
+    protected function _getNumPages()
+    {
 
         $this->_getPhysicalStructure();
 
@@ -2120,7 +2145,8 @@ 
      *
      * @return	integer		The UID of the parent document or zero if not applicable
      */
-    protected function _getParentId() {
+    protected function _getParentId()
+    {
 
         return $this->parentId;
 
@@ -2133,7 +2159,8 @@ 
      *
      * @return	array		Array of physical elements' id, type, label and file representations ordered by @ORDER attribute
      */
-    protected function _getPhysicalStructure() {
+    protected function _getPhysicalStructure()
+    {
 
         // Is there no physical structure array yet?
         if (!$this->physicalStructureLoaded) {
@@ -2238,7 +2265,8 @@ 
      *
      * @return	array		Array of elements' type, label and file representations ordered by @ID attribute
      */
-    protected function _getPhysicalStructureInfo() {
+    protected function _getPhysicalStructureInfo()
+    {
 
         // Is there no physical structure array yet?
         if (!$this->physicalStructureLoaded) {
@@ -2259,7 +2287,8 @@ 
      *
      * @return	integer		The PID of the document or zero if not in database
      */
-    protected function _getPid() {
+    protected function _getPid()
+    {
 
         return $this->pid;
 
@@ -2272,7 +2301,8 @@ 
      *
      * @return	boolean		Is the document instantiated successfully?
      */
-    protected function _getReady() {
+    protected function _getReady()
+    {
 
         return $this->ready;
 
@@ -2285,7 +2315,8 @@ 
      *
      * @return	mixed		The METS file's record identifier
      */
-    protected function _getRecordId() {
+    protected function _getRecordId()
+    {
 
         return $this->recordId;
 
@@ -2298,7 +2329,8 @@ 
      *
      * @return	integer		The UID of the root document or zero if not applicable
      */
-    protected function _getRootId() {
+    protected function _getRootId()
+    {
 
         if (!$this->rootIdLoaded) {
 
@@ -2325,7 +2357,8 @@ 
      *
      * @return	array		The links between logical and physical nodes
      */
-    protected function _getSmLinks() {
+    protected function _getSmLinks()
+    {
 
         if (!$this->smLinksLoaded) {
 
@@ -2354,7 +2387,8 @@ 
      *
      * @return	array		Array of structure nodes' id, label, type and physical page indexes/mptr link with original hierarchy preserved
      */
-    protected function _getTableOfContents() {
+    protected function _getTableOfContents()
+    {
 
         // Is there no logical structure array yet?
         if (!$this->tableOfContentsLoaded) {
@@ -2379,7 +2413,8 @@ 
      *
      * @return	string		The document's thumbnail location
      */
-    protected function _getThumbnail($forceReload = FALSE) {
+    protected function _getThumbnail($forceReload = FALSE)
+    {
 
         if (!$this->thumbnailLoaded || $forceReload) {
 
@@ -2486,7 +2521,8 @@ 
      *
      * @return	string		The logical structure node's ID
      */
-    protected function _getToplevelId() {
+    protected function _getToplevelId()
+    {
 
         if (empty($this->toplevelId)) {
 
@@ -2532,7 +2568,8 @@ 
      *
      * @return	mixed		The UID or the URL of the document
      */
-    protected function _getUid() {
+    protected function _getUid()
+    {
 
         return $this->uid;
 
@@ -2547,7 +2584,8 @@ 
      *
      * @return	void
      */
-    protected function _setCPid($value) {
+    protected function _setCPid($value)
+    {
 
         $this->cPid = max(intval($value), 0);
 
@@ -2561,7 +2599,9 @@ 
      *
      * @return	void
      */
-    protected function __clone() {}
+    protected function __clone()
+    {
+}
 
     /**
      * This is a singleton class, thus the constructor should be private/protected
@@ -2574,7 +2614,8 @@ 
      *
      * @return	void
      */
-    protected function __construct($uid, $pid) {
+    protected function __construct($uid, $pid)
+    {
 
         // Prepare to check database for the requested document.
         if (\TYPO3\CMS\Core\Utility\MathUtility::canBeInterpretedAsInteger($uid)) {
@@ -2720,7 +2761,8 @@ 
      *
      * @return	mixed		Value of $this->$var
      */
-    public function __get($var) {
+    public function __get($var)
+    {
 
         $method = '_get'.ucfirst($var);
 
@@ -2752,7 +2794,8 @@ 
      *
      * @return	void
      */
-    public function __set($var, $value) {
+    public function __set($var, $value)
+    {
 
         $method = '_set'.ucfirst($var);
 
@@ -2780,7 +2823,8 @@ 
      *
      * @return	array		Properties to be serialized
      */
-    public function __sleep() {
+    public function __sleep()
+    {
 
         // SimpleXMLElement objects can't be serialized, thus save the XML as string for serialization
         $this->asXML = $this->xml->asXML();
@@ -2796,7 +2840,8 @@ 
      *
      * @return	string		String representing the METS object
      */
-    public function __toString() {
+    public function __toString()
+    {
 
         $xml = new DOMDocument('1.0', 'utf-8');
 
@@ -2816,7 +2861,8 @@ 
      *
      * @return	void
      */
-    public function __wakeup() {
+    public function __wakeup()
+    {
 
         // Turn off libxml's error logging.
         $libxmlErrors = libxml_use_internal_errors(TRUE);

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);
 
             }
 

Braces +49 added lines, -24 removed lines

@@ -18,7 +18,8 @@ 
  * @subpackage	tx_dlf
  * @access	public
  */
-class tx_dlf_helper {
+class tx_dlf_helper
+{
 
     /**
      * The extension key
@@ -45,7 +46,8 @@ 
      *
      * @return	void
      */
-    public static function addMessage($message) {
+    public static function addMessage($message)
+    {
 
         $flashMessageService = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessageService');
 
@@ -64,7 +66,8 @@ 
      *
      * @return	array		Merged array with second array overruling first one
      */
-    static public function array_merge_recursive_overrule($array1, $array2) {
+    static public function array_merge_recursive_overrule($array1, $array2)
+    {
 
         if (class_exists('\\TYPO3\\CMS\\Core\\Utility\\ArrayUtility')) {
 
@@ -92,7 +95,8 @@ 
      *
      * @return	boolean		Is $id a valid GNL identifier of the given $type?
      */
-    public static function checkIdentifier($id, $type) {
+    public static function checkIdentifier($id, $type)
+    {
 
         $digits = substr($id, 0, 8);
 
@@ -209,7 +213,8 @@ 
      *
      * @return	mixed		The decrypted value or NULL on error
      */
-    public static function decrypt($encrypted, $hash) {
+    public static function decrypt($encrypted, $hash)
+    {
 
         $decrypted = NULL;
 
@@ -284,7 +289,8 @@ 
      *
      * @return	array		Array with encrypted string and control hash
      */
-    public static function encrypt($string) {
+    public static function encrypt($string)
+    {
 
         // Check for PHP extension "mcrypt".
         if (!extension_loaded('mcrypt')) {
@@ -330,7 +336,8 @@ 
      *
      * @return	\TYPO3\CMS\Core\Authentication\BackendUserAuthentication		Instance of \TYPO3\CMS\Core\Authentication\BackendUserAuthentication or NULL on failure
      */
-    public static function getBeUser() {
+    public static function getBeUser()
+    {
 
         if (TYPO3_MODE === 'FE' || TYPO3_MODE === 'BE') {
 
@@ -370,7 +377,8 @@ 
      *
      * @return	string		The cleaned up string
      */
-    public static function getCleanString($string) {
+    public static function getCleanString($string)
+    {
 
         // Convert to lowercase.
         $string = strtolower($string);
@@ -395,7 +403,8 @@ 
      *
      * @return	\TYPO3\CMS\Frontend\Authentication\FrontendUserAuthentication		Instance of \TYPO3\CMS\Frontend\Authentication\FrontendUserAuthentication or NULL on failure
      */
-    public static function getFeUser() {
+    public static function getFeUser()
+    {
 
         if (TYPO3_MODE === 'FE') {
 
@@ -433,7 +442,8 @@ 
      *
      * @return	array		Array of hook objects for the class
      */
-    public static function getHookObjects($scriptRelPath) {
+    public static function getHookObjects($scriptRelPath)
+    {
 
         $hookObjects = array ();
 
@@ -462,7 +472,8 @@ 
      *
      * @return	string		"index_name" for the given UID
      */
-    public static function getIndexName($uid, $table, $pid = -1) {
+    public static function getIndexName($uid, $table, $pid = -1)
+    {
 
         // Save parameters for logging purposes.
         $_uid = $uid;
@@ -536,7 +547,8 @@ 
      *
      * @return	string		"uid" for the given index_name
      */
-    public static function getIdFromIndexName($index_name, $table, $pid = -1) {
+    public static function getIdFromIndexName($index_name, $table, $pid = -1)
+    {
 
         // Save parameters for logging purposes.
         $_index_name = $index_name;
@@ -605,7 +617,8 @@ 
      *
      * @return	string		Localized full name of language or unchanged input
      */
-    public static function getLanguageName($code) {
+    public static function getLanguageName($code)
+    {
 
         // Analyze code and set appropriate ISO table.
         $isoCode = strtolower(trim($code));
@@ -685,7 +698,8 @@ 
      *
      * @return	string		The translated string or the given key on failure
      */
-    public static function getLL($key, $hsc = FALSE, $default = '') {
+    public static function getLL($key, $hsc = FALSE, $default = '')
+    {
 
         // Set initial output to default value.
         $translated = (string) $default;
@@ -752,7 +766,8 @@ 
      *
      * @return	string		Uniform Resource Name as string
      */
-    public static function getURN($base, $id) {
+    public static function getURN($base, $id)
+    {
 
         $concordance = array (
             '0' => 1,
@@ -840,7 +855,8 @@ 
      *
      * @return	boolean		Is $id a valid PPN?
      */
-    public static function isPPN($id) {
+    public static function isPPN($id)
+    {
 
         return self::checkIdentifier($id, 'PPN');
 
@@ -855,7 +871,8 @@ 
      *
      * @return	mixed		Session value for given key or NULL on failure
      */
-    public static function loadFromSession($key) {
+    public static function loadFromSession($key)
+    {
 
         // Save parameter for logging purposes.
         $_key = $key;
@@ -910,7 +927,8 @@ 
      *
      * @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 +986,8 @@ 
      *
      * @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()) {
 
@@ -993,7 +1012,8 @@ 
      *
      * @return	string		All flash messages in the queue rendered as HTML.
      */
-    public static function renderFlashMessages() {
+    public static function renderFlashMessages()
+    {
 
         $flashMessageService = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Messaging\\FlashMessageService');
 
@@ -1053,7 +1073,8 @@ 
      *
      * @return	boolean		TRUE on success, FALSE on failure
      */
-    public static function saveToSession($value, $key) {
+    public static function saveToSession($value, $key)
+    {
 
         // Save parameter for logging purposes.
         $_key = $key;
@@ -1113,7 +1134,8 @@ 
      *
      * @return	string		Localized label for $index_name
      */
-    public static function translate($index_name, $table, $pid) {
+    public static function translate($index_name, $table, $pid)
+    {
 
         // Save parameters for logging purposes.
         $_index_name = $index_name;
@@ -1271,7 +1293,8 @@ 
      *
      * @return	string		Additional WHERE clause
      */
-    public static function whereClause($table, $showHidden = FALSE) {
+    public static function whereClause($table, $showHidden = FALSE)
+    {
 
         if (TYPO3_MODE === 'FE') {
 
@@ -1329,6 +1352,8 @@ 
      *
      * @access private
      */
-    private function __construct() {}
+    private function __construct()
+    {
+}
 
 }