kitodo / kitodo-presentation

ext_tables.php

Spacing +4 added lines, -4 removed lines

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

cli/class.tx_dlf_cli.php

Spacing +19 added lines, -19 removed lines

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

Braces +6 added lines, -3 removed lines

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

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

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

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