kitodo / kitodo-presentation

class.ext_update.php

Spacing +9 added lines, -9 removed lines

@@ -63,7 +63,7 @@ 
      */
     protected function getMetadataConfig() {
 
-        $uids = array ();
+        $uids = array();
 
         // check if tx_dlf_metadata.xpath exists anyhow
         $fieldsInDatabase = $GLOBALS['TYPO3_DB']->admin_get_fields('tx_dlf_metadata');
@@ -78,7 +78,7 @@ 
         $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
             'tx_dlf_metadata.uid AS uid',
             'tx_dlf_metadata',
-            'tx_dlf_metadata.format=0 AND NOT tx_dlf_metadata.xpath=\'\''.tx_dlf_helper::whereClause('tx_dlf_metadata'),
+            'tx_dlf_metadata.format=0 AND NOT tx_dlf_metadata.xpath=\'\'' . tx_dlf_helper::whereClause('tx_dlf_metadata'),
             '',
             '',
             ''
@@ -222,13 +222,13 @@ 
 
         if (!empty($metadataUids)) {
 
-            $data = array ();
+            $data = array();
 
             // Get all old metadata configuration records.
             $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
                 'tx_dlf_metadata.uid AS uid,tx_dlf_metadata.pid AS pid,tx_dlf_metadata.cruser_id AS cruser_id,tx_dlf_metadata.encoded AS encoded,tx_dlf_metadata.xpath AS xpath,tx_dlf_metadata.xpath_sorting AS xpath_sorting',
                 'tx_dlf_metadata',
-                'tx_dlf_metadata.uid IN ('.implode(',', $metadataUids).')'.tx_dlf_helper::whereClause('tx_dlf_metadata'),
+                'tx_dlf_metadata.uid IN (' . implode(',', $metadataUids) . ')' . tx_dlf_helper::whereClause('tx_dlf_metadata'),
                 '',
                 '',
                 ''
@@ -239,7 +239,7 @@ 
                 $newId = uniqid('NEW');
 
                 // Copy record to new table.
-                $data['tx_dlf_metadataformat'][$newId] = array (
+                $data['tx_dlf_metadataformat'][$newId] = array(
                     'pid' => $resArray['pid'],
                     'cruser_id' => $resArray['cruser_id'],
                     'parent_id' => $resArray['uid'],
@@ -359,7 +359,7 @@ 
                 // Prepend username and password to hostname.
                 if ($solrInfo['username'] && $solrInfo['password']) {
 
-                    $host = $solrInfo['username'].':'.$solrInfo['password'].'@'.$solrInfo['host'];
+                    $host = $solrInfo['username'] . ':' . $solrInfo['password'] . '@' . $solrInfo['host'];
 
                 } else {
 
@@ -367,8 +367,8 @@ 
 
                 }
 
-                $context = stream_context_create(array (
-                    'http' => array (
+                $context = stream_context_create(array(
+                    'http' => array(
                         'method' => 'GET',
                         'user_agent' => ($conf['useragent'] ? $conf['useragent'] : ini_get('user_agent'))
                     )
@@ -376,7 +376,7 @@ 
 
                 // Build request for adding new Solr core.
                 // @see http://wiki.apache.org/solr/CoreAdmin
-                $url = $solrInfo['scheme'].'://'.$host.':'.$solrInfo['port'].'/'.$solrInfo['path'].'/admin/cores?wt=xml&action=CREATE&name='.$resArray['index_name'].'&instanceDir=dlfCore'.$resArray['index_name'].'&dataDir=data&configSet=dlf';
+                $url = $solrInfo['scheme'] . '://' . $host . ':' . $solrInfo['port'] . '/' . $solrInfo['path'] . '/admin/cores?wt=xml&action=CREATE&name=' . $resArray['index_name'] . '&instanceDir=dlfCore' . $resArray['index_name'] . '&dataDir=data&configSet=dlf';
 
                 $response = @simplexml_load_string(file_get_contents($url, FALSE, $context));
 

Braces +18 added lines, -9 removed lines

@@ -17,7 +17,8 @@ 
  * @subpackage	tx_dlf
  * @access	public
  */
-class ext_update {
+class ext_update
+{
 
     /**
      * This holds the output ready to return
@@ -34,7 +35,8 @@ 
      *
      * @return	boolean		Should the update option be shown?
      */
-    public function access() {
+    public function access()
+    {
 
         if (count($this->getMetadataConfig())) {
 
@@ -61,7 +63,8 @@ 
      *
      * @return	array		Array of UIDs of outdated records
      */
-    protected function getMetadataConfig() {
+    protected function getMetadataConfig()
+    {
 
         $uids = array ();
 
@@ -105,7 +108,8 @@ 
      *
      * @return	string		The content that is displayed on the website
      */
-    public function main() {
+    public function main()
+    {
 
         // Load localization file.
         $GLOBALS['LANG']->includeLLFile('EXT:dlf/locallang.xml');
@@ -138,7 +142,8 @@ 
      *
      * @return	boolean		true if old index related columns exist
      */
-    protected function oldIndexRelatedTableNames() {
+    protected function oldIndexRelatedTableNames()
+    {
 
         $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
             'column_name',
@@ -172,7 +177,8 @@ 
      *
      * @return	void
      */
-    protected function renameIndexRelatedColumns() {
+    protected function renameIndexRelatedColumns()
+    {
 
         $sqlQuery = "UPDATE tx_dlf_metadata SET `index_tokenized` = `tokenized`
 											, `index_stored` = `stored`
@@ -216,7 +222,8 @@ 
      *
      * @return	void
      */
-    protected function updateMetadataConfig() {
+    protected function updateMetadataConfig()
+    {
 
         $metadataUids = $this->getMetadataConfig();
 
@@ -297,7 +304,8 @@ 
      *
      * @return	boolean
      */
-    protected function solariumSolrUpdateRequired() {
+    protected function solariumSolrUpdateRequired()
+    {
 
         // Get all Solr cores that were not deleted.
         $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
@@ -333,7 +341,8 @@ 
      *
      * @return	void
      */
-    protected function doSolariumSolrUpdate() {
+    protected function doSolariumSolrUpdate()
+    {
 
         // Get all Solr cores that were not deleted.
         $result = $GLOBALS['TYPO3_DB']->exec_SELECTquery(

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

@@ -38,19 +38,19 @@ 
 
         if (count($this->getMetadataConfig())) {
 
-            return TRUE;
+            return true;
 
         } else if ($this->oldIndexRelatedTableNames()) {
 
-            return TRUE;
+            return true;
 
         } else if ($this->solariumSolrUpdateRequired()) {
 
-            return TRUE;
+            return true;
 
         }
 
-        return FALSE;
+        return false;
 
     }
 
@@ -157,7 +157,7 @@ 
                 || $resArray['column_name'] == 'boost'
                 || $resArray['column_name'] == 'autocomplete') {
 
-                    return TRUE;
+                    return true;
 
             }
 
@@ -187,20 +187,20 @@ 
 
             $message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
                 'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-                $GLOBALS['LANG']->getLL('update.copyIndexRelatedColumnsOkay', TRUE),
-                $GLOBALS['LANG']->getLL('update.copyIndexRelatedColumns', TRUE),
+                $GLOBALS['LANG']->getLL('update.copyIndexRelatedColumnsOkay', true),
+                $GLOBALS['LANG']->getLL('update.copyIndexRelatedColumns', true),
                 \TYPO3\CMS\Core\Messaging\FlashMessage::OK,
-                FALSE
+                false
                 );
 
         } else {
 
             $message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
                 'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-                $GLOBALS['LANG']->getLL('update.copyIndexRelatedColumnsNotOkay', TRUE),
-                $GLOBALS['LANG']->getLL('update.copyIndexRelatedColumns', TRUE),
+                $GLOBALS['LANG']->getLL('update.copyIndexRelatedColumnsNotOkay', true),
+                $GLOBALS['LANG']->getLL('update.copyIndexRelatedColumns', true),
                 \TYPO3\CMS\Core\Messaging\FlashMessage::WARNING,
-                FALSE
+                false
                 );
 
         }
@@ -264,20 +264,20 @@ 
 
                     $message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
                         'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-                        $GLOBALS['LANG']->getLL('update.metadataConfigOkay', TRUE),
-                        $GLOBALS['LANG']->getLL('update.metadataConfig', TRUE),
+                        $GLOBALS['LANG']->getLL('update.metadataConfigOkay', true),
+                        $GLOBALS['LANG']->getLL('update.metadataConfig', true),
                         \TYPO3\CMS\Core\Messaging\FlashMessage::OK,
-                        FALSE
+                        false
                     );
 
                 } else {
 
                     $message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
                         'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-                        $GLOBALS['LANG']->getLL('update.metadataConfigNotOkay', TRUE),
-                        $GLOBALS['LANG']->getLL('update.metadataConfig', TRUE),
+                        $GLOBALS['LANG']->getLL('update.metadataConfigNotOkay', true),
+                        $GLOBALS['LANG']->getLL('update.metadataConfig', true),
                         \TYPO3\CMS\Core\Messaging\FlashMessage::WARNING,
-                        FALSE
+                        false
                     );
 
                 }
@@ -316,13 +316,13 @@ 
 
             if (!$solr->ready) {
 
-                return TRUE;
+                return true;
 
             }
 
         }
 
-        return FALSE;
+        return false;
 
     }
 
@@ -378,7 +378,7 @@ 
                 // @see http://wiki.apache.org/solr/CoreAdmin
                 $url = $solrInfo['scheme'].'://'.$host.':'.$solrInfo['port'].'/'.$solrInfo['path'].'/admin/cores?wt=xml&action=CREATE&name='.$resArray['index_name'].'&instanceDir=dlfCore'.$resArray['index_name'].'&dataDir=data&configSet=dlf';
 
-                $response = @simplexml_load_string(file_get_contents($url, FALSE, $context));
+                $response = @simplexml_load_string(file_get_contents($url, false, $context));
 
                 // Process response.
                 if ($response) {
@@ -395,10 +395,10 @@ 
 
                 $message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
                     'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-                    $GLOBALS['LANG']->getLL('update.solariumSolrUpdateNotOkay', TRUE),
-                    sprintf($GLOBALS['LANG']->getLL('update.solariumSolrUpdate', TRUE), $resArray['index_name']),
+                    $GLOBALS['LANG']->getLL('update.solariumSolrUpdateNotOkay', true),
+                    sprintf($GLOBALS['LANG']->getLL('update.solariumSolrUpdate', true), $resArray['index_name']),
                     \TYPO3\CMS\Core\Messaging\FlashMessage::ERROR,
-                    FALSE
+                    false
                     );
 
                 $this->content .= $message->render();
@@ -411,10 +411,10 @@ 
 
         $message = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(
             'TYPO3\\CMS\\Core\\Messaging\\FlashMessage',
-            $GLOBALS['LANG']->getLL('update.solariumSolrUpdateOkay', TRUE),
-            $GLOBALS['LANG']->getLL('update.solariumSolrUpdate', TRUE),
+            $GLOBALS['LANG']->getLL('update.solariumSolrUpdateOkay', true),
+            $GLOBALS['LANG']->getLL('update.solariumSolrUpdate', true),
             \TYPO3\CMS\Core\Messaging\FlashMessage::OK,
-            FALSE
+            false
             );
 
         $this->content .= $message->render();

Configuration/TCA/tx_dlf_collections.php

Spacing +68 added lines, -68 removed lines

@@ -9,8 +9,8 @@ 
  * LICENSE.txt file that was distributed with this source code.
  */
 
-return array (
-    'ctrl' => array (
+return array(
+    'ctrl' => array(
         'title'     => 'LLL:EXT:dlf/locallang.xml:tx_dlf_collections',
         'label'     => 'label',
         'tstamp'    => 'tstamp',
@@ -23,7 +23,7 @@ 
         'transOrigDiffSourceField' => 'l18n_diffsource',
         'default_sortby' => 'ORDER BY label',
         'delete'	=> 'deleted',
-        'enablecolumns' => array (
+        'enablecolumns' => array(
             'disabled' => 'hidden',
             'fe_group' => 'fe_group',
         ),
@@ -33,65 +33,65 @@ 
         'dividers2tabs' => 2,
         'searchFields' => 'label,index_name,oai_name,fe_cruser_id',
     ),
-    'feInterface' => array (
+    'feInterface' => array(
         'fe_admin_fieldList' => 'label,description,thumbnail,documents',
     ),
-    'interface' => array (
+    'interface' => array(
         'showRecordFieldList' => 'label,index_name,oai_name,fe_cruser_id',
     ),
-    'columns' => array (
-        'sys_language_uid' => array (
+    'columns' => array(
+        'sys_language_uid' => array(
             'exclude' => 1,
             'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.language',
-            'config' => array (
+            'config' => array(
                 'type' => 'select',
                 'renderType' => 'selectSingle',
                 'foreign_table' => 'sys_language',
                 'foreign_table_where' => 'ORDER BY sys_language.title',
-                'items' => array (
-                    array ('LLL:EXT:lang/locallang_general.xml:LGL.allLanguages', -1),
-                    array ('LLL:EXT:lang/locallang_general.xml:LGL.default_value', 0),
+                'items' => array(
+                    array('LLL:EXT:lang/locallang_general.xml:LGL.allLanguages', -1),
+                    array('LLL:EXT:lang/locallang_general.xml:LGL.default_value', 0),
                 ),
                 'default' => 0,
             ),
         ),
-        'l18n_parent' => array (
+        'l18n_parent' => array(
             'displayCond' => 'FIELD:sys_language_uid:>:0',
             'exclude' => 1,
             'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.l18n_parent',
-            'config' => array (
+            'config' => array(
                 'type' => 'select',
                 'renderType' => 'selectSingle',
-                'items' => array (
-                    array ('', 0),
+                'items' => array(
+                    array('', 0),
                 ),
                 'foreign_table' => 'tx_dlf_collections',
                 'foreign_table_where' => 'AND tx_dlf_collections.pid=###CURRENT_PID### AND tx_dlf_collections.sys_language_uid IN (-1,0)',
             ),
         ),
-        'l18n_diffsource' => array (
-            'config' => array (
+        'l18n_diffsource' => array(
+            'config' => array(
                 'type' => 'passthrough'
             ),
         ),
-        'hidden' => array (
+        'hidden' => array(
             'exclude' => 1,
             'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.hidden',
-            'config' => array (
+            'config' => array(
                 'type' => 'check',
                 'default' => 0,
             ),
         ),
-        'fe_group' => array (
+        'fe_group' => array(
             'exclude' => 1,
             'label' => 'LLL:EXT:lang/locallang_general.xml:LGL.fe_group',
-            'config' => array (
+            'config' => array(
                 'type' => 'select',
                 'renderType' => 'selectMultipleSideBySide',
-                'items' => array (
-                    array ('LLL:EXT:lang/locallang_general.xml:LGL.hide_at_login', -1),
-                    array ('LLL:EXT:lang/locallang_general.xml:LGL.any_login', -2),
-                    array ('LLL:EXT:lang/locallang_general.xml:LGL.usergroups', '--div--'),
+                'items' => array(
+                    array('LLL:EXT:lang/locallang_general.xml:LGL.hide_at_login', -1),
+                    array('LLL:EXT:lang/locallang_general.xml:LGL.any_login', -2),
+                    array('LLL:EXT:lang/locallang_general.xml:LGL.usergroups', '--div--'),
                 ),
                 'foreign_table' => 'fe_groups',
                 'size' => 5,
@@ -101,54 +101,54 @@ 
                 'exclusiveKeys' => '-1,-2',
             ),
         ),
-        'label' => array (
+        'label' => array(
             'exclude' => 1,
             'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_collections.label',
-            'config' => array (
+            'config' => array(
                 'type' => 'input',
                 'size' => 30,
                 'max' => 255,
                 'eval' => 'required,trim',
             ),
         ),
-        'index_name' => array (
+        'index_name' => array(
             'exclude' => 1,
             'l10n_mode' => 'exclude',
             'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_collections.index_name',
-            'config' => array (
+            'config' => array(
                 'type' => 'none',
                 'size' => 30,
                 'max' => 255,
                 'eval' => 'required,uniqueInPid',
             ),
         ),
-        'index_search' => array (
+        'index_search' => array(
             'exclude' => 1,
             'l10n_mode' => 'exclude',
             'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_collections.index_search',
-            'config' => array (
+            'config' => array(
                 'type' => 'text',
                 'size' => 30,
                 'rows' => 5,
                 'eval' => 'trim',
             ),
         ),
-        'oai_name' => array (
+        'oai_name' => array(
             'exclude' => 1,
             'l10n_mode' => 'exclude',
             'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_collections.oai_name',
-            'config' => array (
+            'config' => array(
                 'type' => 'input',
                 'size' => 30,
                 'max' => 255,
                 'eval' => 'nospace,alphanum_x,uniqueInPid',
             ),
         ),
-        'description' => array (
+        'description' => array(
             'exclude' => 1,
             'l10n_mode' => 'mergeIfNotBlank',
             'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_collections.description',
-            'config' => array (
+            'config' => array(
                 'type' => 'text',
                 'cols' => 30,
                 'rows' => 10,
@@ -156,11 +156,11 @@ 
             ),
             'defaultExtras' => 'richtext[undo,redo,cut,copy,paste,link,image,line,acronym,chMode,blockstylelabel,formatblock,blockstyle,textstylelabel,textstyle,bold,italic,unorderedlist,orderedlist]:rte_transform[mode=ts_css]',
         ),
-        'thumbnail' => array (
+        'thumbnail' => array(
             'exclude' => 1,
             'l10n_mode' => 'exclude',
             'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_collections.thumbnail',
-            'config' => array (
+            'config' => array(
                 'type' => 'group',
                 'internal_type' => 'file_reference',
                 'allowed' => 'gif,jpg,png',
@@ -169,19 +169,19 @@ 
                 'maxitems' => 1,
             ),
         ),
-        'priority' => array (
+        'priority' => array(
             'exclude' => 1,
             'l10n_mode' => 'exclude',
             'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_collections.priority',
-            'config' => array (
+            'config' => array(
                 'type' => 'select',
                 'renderType' => 'selectSingle',
-                'items' => array (
-                    array ('1', 1),
-                    array ('2', 2),
-                    array ('3', 3),
-                    array ('4', 4),
-                    array ('5', 5),
+                'items' => array(
+                    array('1', 1),
+                    array('2', 2),
+                    array('3', 3),
+                    array('4', 4),
+                    array('5', 5),
                 ),
                 'size' => 1,
                 'minitems' => 1,
@@ -189,11 +189,11 @@ 
                 'default' => 3,
             ),
         ),
-        'documents' => array (
+        'documents' => array(
             'exclude' => 1,
             'l10n_mode' => 'exclude',
             'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_collections.documents',
-            'config' => array (
+            'config' => array(
                 'type' => 'select',
                 'renderType' => 'selectSingleBox',
                 'foreign_table' => 'tx_dlf_documents',
@@ -203,21 +203,21 @@ 
                 'minitems' => 0,
                 'maxitems' => 1048576,
                 'MM' => 'tx_dlf_relations',
-                'MM_match_fields' => array (
+                'MM_match_fields' => array(
                     'ident' => 'docs_colls',
                 ),
                 'MM_opposite_field' => 'collections',
             ),
         ),
-        'owner' => array (
+        'owner' => array(
             'exclude' => 1,
             'l10n_mode' => 'exclude',
             'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_collections.owner',
-            'config' => array (
+            'config' => array(
                 'type' => 'select',
                 'renderType' => 'selectSingle',
-                'items' => array (
-                    array ('LLL:EXT:dlf/locallang.xml:tx_dlf_collections.owner.none', 0),
+                'items' => array(
+                    array('LLL:EXT:dlf/locallang.xml:tx_dlf_collections.owner.none', 0),
                 ),
                 'foreign_table' => 'tx_dlf_libraries',
                 'foreign_table_where' => 'AND tx_dlf_libraries.sys_language_uid IN (-1,0) ORDER BY tx_dlf_libraries.label',
@@ -226,15 +226,15 @@ 
                 'maxitems' => 1,
             ),
         ),
-        'fe_cruser_id' => array (
+        'fe_cruser_id' => array(
             'exclude' => 1,
             'l10n_mode' => 'exclude',
             'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_collections.fe_cruser_id',
-            'config' => array (
+            'config' => array(
                 'type' => 'select',
                 'renderType' => 'selectSingle',
-                'items' => array (
-                    array ('LLL:EXT:dlf/locallang.xml:tx_dlf_collections.fe_cruser_id.none', 0),
+                'items' => array(
+                    array('LLL:EXT:dlf/locallang.xml:tx_dlf_collections.fe_cruser_id.none', 0),
                 ),
                 'foreign_table' => 'fe_users',
                 'foreign_table_where' => 'ORDER BY fe_users.username',
@@ -243,24 +243,24 @@ 
                 'maxitems' => 1,
             ),
         ),
-        'fe_admin_lock' => array (
+        'fe_admin_lock' => array(
             'exclude' => 1,
             'l10n_mode' => 'exclude',
             'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_collections.fe_admin_lock',
-            'config' => array (
+            'config' => array(
                 'type' => 'check',
                 'default' => 0,
             ),
         ),
-        'status' => array (
+        'status' => array(
             'exclude' => 1,
             'l10n_mode' => 'exclude',
             'label' => 'LLL:EXT:dlf/locallang.xml:tx_dlf_collections.status',
-            'config' => array (
+            'config' => array(
                 'type' => 'select',
                 'renderType' => 'selectSingle',
-                'items' => array (
-                    array ('LLL:EXT:dlf/locallang.xml:tx_dlf_collections.status.default', 0),
+                'items' => array(
+                    array('LLL:EXT:dlf/locallang.xml:tx_dlf_collections.status.default', 0),
                 ),
                 'size' => 1,
                 'minitems' => 1,
@@ -269,12 +269,12 @@ 
             ),
         ),
     ),
-    'types' => array (
-        '0' => array ('showitem' => '--div--;LLL:EXT:dlf/locallang.xml:tx_dlf_collections.tab1, label,--palette--;;1;;1-1-1, description,--palette--;;2;;2-2-2, --div--;LLL:EXT:dlf/locallang.xml:tx_dlf_collections.tab2, sys_language_uid;;;;1-1-1, l18n_parent, l18n_diffsource, --div--;LLL:EXT:dlf/locallang.xml:tx_dlf_collections.tab3, hidden;;;;1-1-1, fe_group;;;;2-2-2, status;;;;3-3-3, owner;;;;4-4-4, fe_cruser_id,--palette--;;3'),
+    'types' => array(
+        '0' => array('showitem' => '--div--;LLL:EXT:dlf/locallang.xml:tx_dlf_collections.tab1, label,--palette--;;1;;1-1-1, description,--palette--;;2;;2-2-2, --div--;LLL:EXT:dlf/locallang.xml:tx_dlf_collections.tab2, sys_language_uid;;;;1-1-1, l18n_parent, l18n_diffsource, --div--;LLL:EXT:dlf/locallang.xml:tx_dlf_collections.tab3, hidden;;;;1-1-1, fe_group;;;;2-2-2, status;;;;3-3-3, owner;;;;4-4-4, fe_cruser_id,--palette--;;3'),
     ),
-    'palettes' => array (
-        '1' => array ('showitem' => 'index_name, --linebreak--, index_search, --linebreak--, oai_name', 'canNotCollapse' => 1),
-        '2' => array ('showitem' => 'thumbnail, priority', 'canNotCollapse' => 1),
-        '3' => array ('showitem' => 'fe_admin_lock', 'canNotCollapse' => 1),
+    'palettes' => array(
+        '1' => array('showitem' => 'index_name, --linebreak--, index_search, --linebreak--, oai_name', 'canNotCollapse' => 1),
+        '2' => array('showitem' => 'thumbnail, priority', 'canNotCollapse' => 1),
+        '3' => array('showitem' => 'fe_admin_lock', 'canNotCollapse' => 1),
     ),
 );

plugins/pageview/class.tx_dlf_pageview.php

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

@@ -121,9 +121,9 @@ 
 
             if ($this->conf['crop']) {
 
-                $markerArray['###EDITBUTTON###'] = '<a href="javascript: tx_dlf_viewer.activateSelection();">'.$this->pi_getLL('editMode', '', TRUE).'</a>';
+                $markerArray['###EDITBUTTON###'] = '<a href="javascript: tx_dlf_viewer.activateSelection();">'.$this->pi_getLL('editMode', '', true).'</a>';
 
-                $markerArray['###EDITREMOVE###'] = '<a href="javascript: tx_dlf_viewer.resetCropSelection();">'.$this->pi_getLL('editRemove', '', TRUE).'</a>';
+                $markerArray['###EDITREMOVE###'] = '<a href="javascript: tx_dlf_viewer.resetCropSelection();">'.$this->pi_getLL('editRemove', '', true).'</a>';
 
             } else {
 
@@ -135,7 +135,7 @@ 
 
             if ($this->conf['magnifier']) {
 
-                $markerArray['###MAGNIFIER###'] = '<a href="javascript: tx_dlf_viewer.activateMagnifier();">'.$this->pi_getLL('magnifier', '', TRUE).'</a>';
+                $markerArray['###MAGNIFIER###'] = '<a href="javascript: tx_dlf_viewer.activateMagnifier();">'.$this->pi_getLL('magnifier', '', true).'</a>';
 
             } else {
 
@@ -162,11 +162,11 @@ 
         // Add basket button
         if ($this->conf['basketButton'] && $this->conf['targetBasket'] && $this->piVars['id']) {
 
-            $label = $this->pi_getLL('addBasket', '', TRUE);
+            $label = $this->pi_getLL('addBasket', '', true);
 
             $params = array (
                 'id' => $this->piVars['id'],
-                'addToBasket' => TRUE
+                'addToBasket' => true
             );
 
             if (empty($this->piVars['page'])) {
@@ -177,7 +177,7 @@ 
 
             $basketConf = array (
                 'parameter' => $this->conf['targetBasket'],
-                'additionalParams' => \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, $params, '', TRUE, FALSE),
+                'additionalParams' => \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, $params, '', true, false),
                 'title' => $label
             );
 
@@ -335,7 +335,7 @@ 
         // Load current document.
         $this->loadDocument();
 
-        if ($this->doc === NULL || $this->doc->numPages < 1) {
+        if ($this->doc === null || $this->doc->numPages < 1) {
 
             // Quit without doing anything if required variables are not set.
             return $content;

Braces +14 added lines, -7 removed lines

@@ -17,7 +17,8 @@ 
  * @subpackage	tx_dlf
  * @access	public
  */
-class tx_dlf_pageview extends tx_dlf_plugin {
+class tx_dlf_pageview extends tx_dlf_plugin
+{
 
     public $scriptRelPath = 'plugins/pageview/class.tx_dlf_pageview.php';
 
@@ -52,7 +53,8 @@ 
      *
      * @return	string		Viewer script tags ready for output
      */
-    protected function addViewerJS() {
+    protected function addViewerJS()
+    {
 
         $output = array ();
         $tmp = $this->getFulltext($this->piVars['page']);
@@ -121,7 +123,8 @@ 
      *
      * @return	array		Marker array
      */
-    protected function addInteraction() {
+    protected function addInteraction()
+    {
 
         $markerArray = array ();
 
@@ -169,7 +172,8 @@ 
      *
      * @return	array		Marker array
      */
-    protected function addBasketForm() {
+    protected function addBasketForm()
+    {
 
         $markerArray = array ();
 
@@ -246,7 +250,8 @@ 
      *
      * @return	array		URL and MIME type of image file
      */
-    protected function getImage($page) {
+    protected function getImage($page)
+    {
 
         $image = array ();
 
@@ -299,7 +304,8 @@ 
      *
      * @return	array		URL and MIME type of fulltext file
      */
-    protected function getFulltext($page) {
+    protected function getFulltext($page)
+    {
 
         $fulltext = array ();
 
@@ -342,7 +348,8 @@ 
      *
      * @return	string		The content that is displayed on the website
      */
-    public function main($content, $conf) {
+    public function main($content, $conf)
+    {
 
         $this->init($conf);
 

Spacing +43 added lines, -43 removed lines

@@ -27,7 +27,7 @@ 
      * @var	array
      * @access protected
      */
-    protected $controls = array ();
+    protected $controls = array();
 
     /**
      * Holds the current images' URLs and MIME types
@@ -35,7 +35,7 @@ 
      * @var	array
      * @access protected
      */
-    protected $images = array ();
+    protected $images = array();
 
     /**
      * Holds the current fulltexts' URLs
@@ -43,7 +43,7 @@ 
      * @var	array
      * @access protected
      */
-    protected $fulltexts = array ();
+    protected $fulltexts = array();
 
     /**
      * Adds Viewer javascript
@@ -54,7 +54,7 @@ 
      */
     protected function addViewerJS() {
 
-        $output = array ();
+        $output = array();
         $tmp = $this->getFulltext($this->piVars['page']);
         $bTeiXml = false;
         if (isset($tmp['mimetype']) && $tmp['mimetype'] == 'application/tei+xml') {
@@ -62,36 +62,36 @@ 
         }
 
         // Add OpenLayers library.
-        $output[] = '<link type="text/css" rel="stylesheet" href="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'lib/OpenLayers/ol3.css">';
+        $output[] = '<link type="text/css" rel="stylesheet" href="' . \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'lib/OpenLayers/ol3.css">';
 
-        $output[] = '<script type="text/javascript" src="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'lib/OpenLayers/glif.min.js"></script>';
+        $output[] = '<script type="text/javascript" src="' . \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'lib/OpenLayers/glif.min.js"></script>';
 
-        $output[] = '<script type="text/javascript" src="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'lib/OpenLayers/ol3-dlf.js"></script>';
+        $output[] = '<script type="text/javascript" src="' . \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'lib/OpenLayers/ol3-dlf.js"></script>';
 
         // Add viewer library.
-        $output[] = '<script type="text/javascript" src="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'plugins/pageview/tx_dlf_utils.js"></script>';
+        $output[] = '<script type="text/javascript" src="' . \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'plugins/pageview/tx_dlf_utils.js"></script>';
 
-        $output[] = '<script type="text/javascript" src="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'plugins/pageview/tx_dlf_ol3.js"></script>';
+        $output[] = '<script type="text/javascript" src="' . \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'plugins/pageview/tx_dlf_ol3.js"></script>';
 
-        $output[] = '<script type="text/javascript" src="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'plugins/pageview/tx_dlf_ol3_styles.js"></script>';
+        $output[] = '<script type="text/javascript" src="' . \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'plugins/pageview/tx_dlf_ol3_styles.js"></script>';
 
-        $output[] = '<script type="text/javascript" src="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'plugins/pageview/tx_dlf_ol3_source.js"></script>';
+        $output[] = '<script type="text/javascript" src="' . \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'plugins/pageview/tx_dlf_ol3_source.js"></script>';
 
         if ($bTeiXml) {
-            $output[] = '<script type="text/javascript" src="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'plugins/pageview/tx_dlf_teiparser.js"></script>';
+            $output[] = '<script type="text/javascript" src="' . \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'plugins/pageview/tx_dlf_teiparser.js"></script>';
         } else {
-            $output[] = '<script type="text/javascript" src="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'plugins/pageview/tx_dlf_altoparser.js"></script>';
+            $output[] = '<script type="text/javascript" src="' . \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'plugins/pageview/tx_dlf_altoparser.js"></script>';
         }
 
-        $output[] = '<script type="text/javascript" src="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'plugins/pageview/tx_dlf_pageview_imagemanipulation_control.js"></script>';
+        $output[] = '<script type="text/javascript" src="' . \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'plugins/pageview/tx_dlf_pageview_imagemanipulation_control.js"></script>';
 
         if ($bTeiXml) {
-            $output[] = '<script type="text/javascript" src="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'plugins/pageview/tx_dlf_pageview_teifulltext_control.js"></script>';
+            $output[] = '<script type="text/javascript" src="' . \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'plugins/pageview/tx_dlf_pageview_teifulltext_control.js"></script>';
         } else {
-            $output[] = '<script type="text/javascript" src="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'plugins/pageview/tx_dlf_pageview_fulltext_control.js"></script>';
+            $output[] = '<script type="text/javascript" src="' . \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'plugins/pageview/tx_dlf_pageview_fulltext_control.js"></script>';
         }
 
-        $output[] = '<script type="text/javascript" src="'.\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey).'plugins/pageview/tx_dlf_pageview.js"></script>';
+        $output[] = '<script type="text/javascript" src="' . \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::siteRelPath($this->extKey) . 'plugins/pageview/tx_dlf_pageview.js"></script>';
 
         // Add viewer configuration.
         $output[] = '
@@ -99,12 +99,12 @@ 
 			window.onload = function() {
 				if (dlfUtils.exists(dlfViewer)) {
 					tx_dlf_viewer = new dlfViewer({
-						controls: ["'.implode('", "', $this->controls).'"],
-						div: "'.$this->conf['elementId'].'",
-						images: '.json_encode($this->images).',
-						fulltexts: '.json_encode($this->fulltexts).',
-                        teifulltext: '.(($bTeiXml) ? 'true' : 'false').',
-						useInternalProxy: '.($this->conf['useInternalProxy'] ? 1 : 0).'
+						controls: ["'.implode('", "', $this->controls) . '"],
+						div: "'.$this->conf['elementId'] . '",
+						images: '.json_encode($this->images) . ',
+						fulltexts: '.json_encode($this->fulltexts) . ',
+                        teifulltext: '.(($bTeiXml) ? 'true' : 'false') . ',
+						useInternalProxy: '.($this->conf['useInternalProxy'] ? 1 : 0) . '
 					})
 				}
 			}
@@ -123,7 +123,7 @@ 
      */
     protected function addInteraction() {
 
-        $markerArray = array ();
+        $markerArray = array();
 
         if ($this->piVars['id']) {
 
@@ -135,9 +135,9 @@ 
 
             if ($this->conf['crop']) {
 
-                $markerArray['###EDITBUTTON###'] = '<a href="javascript: tx_dlf_viewer.activateSelection();">'.$this->pi_getLL('editMode', '', TRUE).'</a>';
+                $markerArray['###EDITBUTTON###'] = '<a href="javascript: tx_dlf_viewer.activateSelection();">' . $this->pi_getLL('editMode', '', TRUE) . '</a>';
 
-                $markerArray['###EDITREMOVE###'] = '<a href="javascript: tx_dlf_viewer.resetCropSelection();">'.$this->pi_getLL('editRemove', '', TRUE).'</a>';
+                $markerArray['###EDITREMOVE###'] = '<a href="javascript: tx_dlf_viewer.resetCropSelection();">' . $this->pi_getLL('editRemove', '', TRUE) . '</a>';
 
             } else {
 
@@ -149,7 +149,7 @@ 
 
             if ($this->conf['magnifier']) {
 
-                $markerArray['###MAGNIFIER###'] = '<a href="javascript: tx_dlf_viewer.activateMagnifier();">'.$this->pi_getLL('magnifier', '', TRUE).'</a>';
+                $markerArray['###MAGNIFIER###'] = '<a href="javascript: tx_dlf_viewer.activateMagnifier();">' . $this->pi_getLL('magnifier', '', TRUE) . '</a>';
 
             } else {
 
@@ -171,14 +171,14 @@ 
      */
     protected function addBasketForm() {
 
-        $markerArray = array ();
+        $markerArray = array();
 
         // Add basket button
         if ($this->conf['basketButton'] && $this->conf['targetBasket'] && $this->piVars['id']) {
 
             $label = $this->pi_getLL('addBasket', '', TRUE);
 
-            $params = array (
+            $params = array(
                 'id' => $this->piVars['id'],
                 'addToBasket' => TRUE
             );
@@ -189,17 +189,17 @@ 
 
             }
 
-            $basketConf = array (
+            $basketConf = array(
                 'parameter' => $this->conf['targetBasket'],
                 'additionalParams' => \TYPO3\CMS\Core\Utility\GeneralUtility::implodeArrayForUrl($this->prefixId, $params, '', TRUE, FALSE),
                 'title' => $label
             );
 
-            $output = '<form id="addToBasketForm" action="'.$this->cObj->typoLink_URL($basketConf).'" method="post">';
+            $output = '<form id="addToBasketForm" action="' . $this->cObj->typoLink_URL($basketConf) . '" method="post">';
 
-            $output .= '<input type="hidden" name="tx_dlf[startpage]" id="startpage" value="'.htmlspecialchars($this->piVars['page']).'">';
+            $output .= '<input type="hidden" name="tx_dlf[startpage]" id="startpage" value="' . htmlspecialchars($this->piVars['page']) . '">';
 
-            $output .= '<input type="hidden" name="tx_dlf[endpage]" id="endpage" value="'.htmlspecialchars($this->piVars['page']).'">';
+            $output .= '<input type="hidden" name="tx_dlf[endpage]" id="endpage" value="' . htmlspecialchars($this->piVars['page']) . '">';
 
             $output .= '<input type="hidden" name="tx_dlf[startX]" id="startX">';
 
@@ -211,7 +211,7 @@ 
 
             $output .= '<input type="hidden" name="tx_dlf[rotation]" id="rotation">';
 
-            $output .= '<button id="submitBasketForm" onclick="this.form.submit()">'.$label.'</button>';
+            $output .= '<button id="submitBasketForm" onclick="this.form.submit()">' . $label . '</button>';
 
             $output .= '</form>';
 
@@ -248,7 +248,7 @@ 
      */
     protected function getImage($page) {
 
-        $image = array ();
+        $image = array();
 
         // Get @USE value of METS fileGrp.
         $fileGrps = \TYPO3\CMS\Core\Utility\GeneralUtility::trimExplode(',', $this->conf['fileGrps']);
@@ -262,9 +262,9 @@ 
 
                 if ($this->conf['useInternalProxy']) {
                     // Configure @action URL for form.
-                    $linkConf = array (
+                    $linkConf = array(
                         'parameter' => $GLOBALS['TSFE']->id,
-                        'additionalParams' => '&eID=tx_dlf_geturl_eid&url='.urlencode($image['url']),
+                        'additionalParams' => '&eID=tx_dlf_geturl_eid&url=' . urlencode($image['url']),
                     );
 
                     $image['url'] = $this->cObj->typoLink_URL($linkConf);
@@ -278,7 +278,7 @@ 
 
                 if (TYPO3_DLOG) {
 
-                    \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_pageview->getImage('.$page.')] File not found in fileGrp "'.$fileGrp.'"', $this->extKey, SYSLOG_SEVERITY_WARNING);
+                    \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_pageview->getImage(' . $page . ')] File not found in fileGrp "' . $fileGrp . '"', $this->extKey, SYSLOG_SEVERITY_WARNING);
 
                 }
 
@@ -301,7 +301,7 @@ 
      */
     protected function getFulltext($page) {
 
-        $fulltext = array ();
+        $fulltext = array();
 
         // Get fulltext link.
         if (!empty($this->doc->physicalStructureInfo[$this->doc->physicalStructure[$page]]['files'][$this->conf['fileGrpFulltext']])) {
@@ -309,9 +309,9 @@ 
             $fulltext['url'] = $this->doc->getFileLocation($this->doc->physicalStructureInfo[$this->doc->physicalStructure[$page]]['files'][$this->conf['fileGrpFulltext']]);
 
             // Configure @action URL for form.
-            $linkConf = array (
+            $linkConf = array(
                 'parameter' => $GLOBALS['TSFE']->id,
-                'additionalParams' => '&eID=tx_dlf_geturl_eid&url='.urlencode($fulltext['url']),
+                'additionalParams' => '&eID=tx_dlf_geturl_eid&url=' . urlencode($fulltext['url']),
             );
 
             $fulltext['url'] = $this->cObj->typoLink_URL($linkConf);
@@ -322,7 +322,7 @@ 
 
             if (TYPO3_DLOG) {
 
-                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_pageview->getFulltext('.$page.')] File not found in fileGrp "'.$this->conf['fileGrpFulltext'].'"', $this->extKey, SYSLOG_SEVERITY_WARNING);
+                \TYPO3\CMS\Core\Utility\GeneralUtility::devLog('[tx_dlf_pageview->getFulltext(' . $page . ')] File not found in fileGrp "' . $this->conf['fileGrpFulltext'] . '"', $this->extKey, SYSLOG_SEVERITY_WARNING);
 
             }
 
@@ -406,7 +406,7 @@ 
         $this->controls = explode(',', $this->conf['features']);
 
         // Fill in the template markers.
-        $markerArray = array (
+        $markerArray = array(
             '###VIEWER_JS###' => $this->addViewerJS()
         );
 

ext_emconf.php

Spacing +7 added lines, -7 removed lines

@@ -9,7 +9,7 @@ 
  * LICENSE.txt file that was distributed with this source code.
  */
 
-$EM_CONF[$_EXTKEY] = array (
+$EM_CONF[$_EXTKEY] = array(
     'title' => 'Kitodo.Presentation',
     'description' => 'Base plugins, modules, services and API of the Digital Library Framework. It is part of the community-based Kitodo Digitization Suite.',
     'category' => 'fe',
@@ -22,18 +22,18 @@ 
     'createDirs' => '',
     'clearCacheOnLoad' => FALSE,
     'version' => '2.3.1',
-    'constraints' => array (
-        'depends' => array (
+    'constraints' => array(
+        'depends' => array(
             'php' => '7.0.0-',
             'typo3' => '7.6.0-',
         ),
-        'conflicts' => array (
+        'conflicts' => array(
         ),
-        'suggests' => array (
+        'suggests' => array(
         ),
     ),
-    'autoload' => array (
-        'classmap' => array (
+    'autoload' => array(
+        'classmap' => array(
             'vendor/solarium',
             'vendor/symfony/event-dispatcher',
             'cli/class.tx_dlf_cli.php',

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

@@ -18,9 +18,9 @@
     'author_company' => 'http://www.kitodo.org/',
     'state' => 'stable',
     'internal' => '',
-    'uploadfolder' => TRUE,
+    'uploadfolder' => true,
     'createDirs' => '',
-    'clearCacheOnLoad' => FALSE,
+    'clearCacheOnLoad' => false,
     'version' => '2.3.1',
     'constraints' => array (
         'depends' => array (