Feature #17153 » subdomain_patch_realurl.diff
| t3lib/class.t3lib_page.php 2007-03-22 16:51:29.277260920 +0100 | ||
|---|---|---|
|
$domain = ereg_replace('\/*$','',$domain);
|
||
|
$res = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
|
||
|
'pages.uid,sys_domain.redirectTo,sys_domain.prepend_params',
|
||
|
'pages.uid,sys_domain.redirectTo,sys_domain.prepend_params,sys_domain.getContentFromPage',
|
||
|
'pages,sys_domain',
|
||
|
'pages.uid=sys_domain.pid
|
||
|
AND sys_domain.hidden=0
|
||
| ... | ... | |
|
}
|
||
|
Header('Location: '.t3lib_div::locationHeaderUrl($rURL));
|
||
|
exit;
|
||
|
} elseif ($row["getContentFromPage"] != 0) {
|
||
|
if ($_SERVER["REQUEST_URI"] == "" || $_SERVER["REQUEST_URI"] == "index.php")
|
||
|
{
|
||
|
return $row['getContentFromPage'];
|
||
|
}
|
||
|
else
|
||
|
{
|
||
|
return $row['uid'];
|
||
|
}
|
||
|
} else {
|
||
|
return $row['uid'];
|
||
|
}
|
||
|
-- typo3/sysext/cms/ext_tables.sql.old 2007-03-22 16:44:02.669155672 +0100
|
||
|
++ typo3/sysext/cms/ext_tables.sql 2007-03-22 16:44:42.717067464 +0100
|
||
| ... | ... | |
|
redirectTo varchar(120) DEFAULT '' NOT NULL,
|
||
|
sorting int(10) unsigned DEFAULT '0' NOT NULL,
|
||
|
prepend_params int(10) DEFAULT '0' NOT NULL,
|
||
|
getContentFromPage int(10) DEFAULT '0' NOT NULL,
|
||
|
PRIMARY KEY (uid),
|
||
|
KEY parent (pid)
|
||
|
-- typo3/sysext/cms/locallang_tca.xml.old 2007-03-22 16:30:01.610016096 +0100
|
||
|
++ typo3/sysext/cms/locallang_tca.xml 2007-03-22 16:30:23.888629232 +0100
|
||
| ... | ... | |
|
<label index="sys_domain.domainName">Domain:</label>
|
||
|
<label index="sys_domain.redirectTo">Redirect to:</label>
|
||
|
<label index="sys_domain.prepend_params">Transfer parameters to Redirect URL:</label>
|
||
|
<label index="sys_domain.getContentFromPage">Show Content from page:</label>
|
||
|
<label index="pages_language_overlay">Alternative Page Language</label>
|
||
|
<label index="sys_template">Template</label>
|
||
|
<label index="static_template">Static templates</label>
|
||
|
-- typo3/sysext/cms/tbl_cms.php.old 2007-03-22 16:27:59.320606912 +0100
|
||
|
++ typo3/sysext/cms/tbl_cms.php 2007-03-22 16:43:43.278103560 +0100
|
||
| ... | ... | |
|
'type' => 'check',
|
||
|
'default' => '0'
|
||
|
)
|
||
|
),
|
||
|
'getContentFromPage' => Array (
|
||
|
'label' => 'LLL:EXT:cms/locallang_tca.php:sys_domain.getContentFromPage',
|
||
|
'exclude' => 1,
|
||
|
'config' => Array (
|
||
|
'type' => 'group',
|
||
|
'internal_type' => 'db',
|
||
|
'allowed' => 'pages',
|
||
|
'size' => 1,
|
||
|
'maxitems' => 1,
|
||
|
'minitems' => 0,
|
||
|
'default' => '0'
|
||
|
)
|
||
|
)
|
||
|
),
|
||
|
'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,getContentFromPage')
|
||
|
),
|
||
|
'palettes' => Array (
|
||
|
'1' => Array('showitem' => 'redirectTo')
|
||