Fixed bug #9046: Nested domain linking
[Packages/TYPO3.CMS.git] / typo3 / sysext / cms / tbl_cms.php
index 2f5843f..2458617 100755 (executable)
@@ -2,7 +2,7 @@
 /***************************************************************
 *  Copyright notice
 *
-*  (c) 1999-2008 Kasper Skaarhoj (kasperYYYY@typo3.com)
+*  (c) 1999-2009 Kasper Skaarhoj (kasperYYYY@typo3.com)
 *  All rights reserved
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
@@ -71,6 +71,7 @@ $TCA['fe_users'] = array(
                        'config' => array(
                                'type' => 'select',
                                'foreign_table' => 'fe_groups',
+                               'foreign_table_where' => 'ORDER BY fe_groups.title',
                                'size' => '6',
                                'minitems' => '1',
                                'maxitems' => '50'
@@ -273,8 +274,8 @@ $TCA['fe_users'] = array(
                        'config' => array(
                                'type' => 'input',
                                'readOnly' => '1',
-                               'size' => '8',
-                               'eval' => 'date'
+                               'size' => '12',
+                               'eval' => 'datetime',
                        )
                )
        ),
@@ -452,10 +453,18 @@ $TCA['sys_domain'] = array(
                                'type' => 'check',
                                'default' => '0'
                        )
+               ),
+               'forced' => array(
+                       'label' => 'LLL:EXT:cms/locallang_tca.php:sys_domain.forced',
+                       'exclude' => 1,
+                       'config' => array(
+                               'type' => 'check',
+                               'default' => '1'
+                       )
                )
        ),
        'types' => array(
-               '1' => array('showitem' => 'hidden;;;;1-1-1,domainName;;1;;3-3-3,prepend_params')
+               '1' => array('showitem' => 'hidden;;;;1-1-1,domainName;;1;;3-3-3,prepend_params,forced;;;;4-4-4')
        ),
        'palettes' => array(
                '1' => array('showitem' => 'redirectTo, redirectHttpStatusCode')
@@ -635,8 +644,13 @@ $TCA['pages_language_overlay'] = array(
                                'size' => '3',
                                'maxitems' => '1',
                                'minitems' => '0',
-                               'show_thumbs' => '1'
-                       )
+                               'show_thumbs' => '1',
+                               'wizards' => array(
+                                       'suggest' => array(
+                                               'type' => 'suggest',
+                                       ),
+                               ),
+                       ),
                ),
                'shortcut_mode' => array (
                        'exclude' => 1,
@@ -665,7 +679,7 @@ $TCA['pages_language_overlay'] = array(
                        'config' => array(
                                'type' => 'input',
                                'size' => '30',
-                               'max' => '30',
+                               'max' => '255',
                        )
                ),
        ),
@@ -811,7 +825,12 @@ $TCA['sys_template'] = array(
                                'size' => '1',
                                'maxitems' => '1',
                                'minitems' => '0',
-                               'default' => ''
+                               'default' => '',
+                               'wizards' => array(
+                                       'suggest' => array(
+                                               'type' => 'suggest',
+                                       ),
+                               ),
                        )
                ),
                'include_static' => array(
@@ -851,6 +870,9 @@ $TCA['sys_template'] = array(
                                'wizards' => array(
                                        '_PADDING' => 4,
                                        '_VERTICAL' => 1,
+                                       'suggest' => array(
+                                               'type' => 'suggest',
+                                       ),
                                        'edit' => array(
                                                'type' => 'popup',
                                                'title' => 'Edit template',
@@ -925,9 +947,9 @@ $TCA['sys_template'] = array(
                        'config' => array(
                                'type' => 'select',
                                'items' => array(
-                                       array('Default (Include before if Root-flag is set)', '0'),
-                                       array('Always include before this template record', '1'),
-                                       array('Never include before this template record', '2'),
+                                       array('LLL:EXT:cms/locallang_tca.xml:sys_template.static_file_mode.0', '0'),
+                                       array('LLL:EXT:cms/locallang_tca.xml:sys_template.static_file_mode.1', '1'),
+                                       array('LLL:EXT:cms/locallang_tca.xml:sys_template.static_file_mode.2', '2'),
                                ),
                                'default' => '0'
                        )
@@ -938,7 +960,7 @@ $TCA['sys_template'] = array(
                        'config' => array(
                                'type' => 'input',
                                'size' => '30',
-                               'max'  => '30',
+                               'max'  => '255',
                        )
                ),
        ),