Commit 8d2d1655 authored by Kasper Skårhøj's avatar Kasper Skårhøj
Browse files

See changelog


git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@335 709f56b5-9817-0410-a4d7-c38de5d9e867
parent 364985d9
2004-06-03 Kasper Skårhøj,,, <kasper@typo3.com>
* Added base url to typo3 error dialog in frontend. Means it shows logo when using realurls now.
* Added "READFILE:" prefix for pageNotFound handler in frontend; This will read the contents of an html file and output with substitution of a few marker strings.
* Added feature in page tree; Temporary mounting a point in the users page tree as root. (available in the "More options..." - needs upgrade of that extension as well...).
* Fixed frontend edit icons under real-url conditions. They didn't work in MSIE. Had to prefix them with base url.
2004-05-29 Kasper Skårhøj,,, <kasper@typo3.com>
* Fixed bug; All page types (doktype) was shown to uses even if they were not all in their list of possible type values.
......
......@@ -84,8 +84,8 @@ class t3lib_browseTree extends t3lib_treeView {
// This is very important for making trees of pages: Filtering out deleted pages, pages with no access to and sorting them correctly:
parent::init(' AND '.$GLOBALS['BE_USER']->getPagePermsClause(1).' '.$clause, 'sorting');
$this->table='pages';
$this->treeName='browsePages';
$this->table = 'pages';
$this->setTreeName('browsePages');
$this->domIdPrefix = 'pages';
$this->iconName = '';
$this->title = $GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename'];
......
......@@ -2482,7 +2482,7 @@ class t3lib_div {
TYPO3_REQUEST_URL = [scheme]://[host][:[port]][path]?[query] (sheme will by default be 'http' until we can detect if it's https -
TYPO3_REQUEST_SCRIPT = [scheme]://[host][:[port]][path_script]
TYPO3_REQUEST_DIR = [scheme]://[host][:[port]][path_dir]
TYPO3_SITE_URL = [scheme]://[host][:[port]][path_dir] of the TYPO3 website
TYPO3_SITE_URL = [scheme]://[host][:[port]][path_dir] of the TYPO3 website frontend
TYPO3_SITE_SCRIPT = [script / Speaking URL] of the TYPO3 website
TYPO3_DOCUMENT_ROOT = Absolute path of root of documents: TYPO3_DOCUMENT_ROOT.SCRIPT_NAME = SCRIPT_FILENAME (typically)
......
......@@ -545,13 +545,14 @@ class t3lib_timeTrack {
* @param boolean If set, then this will produce a alert() line for inclusion in JavaScript.
* @return string
*/
function debug_typo3PrintError($header,$text,$js) {
function debug_typo3PrintError($header,$text,$js,$baseUrl='') {
if ($js) {
echo"alert('".t3lib_div::slashJS($header."\n".$text)."');";
} else {
echo '
<html>
<head>
'.($baseUrl ? '<base href="'.htmlspecialchars($baseUrl).'" />' : '').'
<title>Error!</title>
</head>
<body bgcolor="white">
......
......@@ -118,7 +118,7 @@ $TYPO3_CONF_VARS = Array(
'defaultUserTSconfig' => '', // Enter lines of default backend user/group TSconfig.
'defaultPageTSconfig' => '', // Enter lines of default Page TSconfig.
'defaultPermissions' => array ( // Default permissions set for new pages in t3lib/tce_main.php. Keys are 'show,edit,delete,new,editcontent'. Enter as comma-list
// 'user' => '', // default in tce_main is 'show,edit,delete,new,editcontent'. If this is set (uncomment), this value is used instead.
// 'user' => '', READFILE: // default in tce_main is 'show,edit,delete,new,editcontent'. If this is set (uncomment), this value is used instead.
// 'group' => '', // default in tce_main is 'show,edit,new,editcontent'. If this is set (uncomment), this value is used instead.
// 'everybody' => '' // default in tce_main is ''. If this is set (uncomment), this value is used instead.
),
......@@ -157,7 +157,7 @@ $TYPO3_CONF_VARS = Array(
'strictFormmail' => TRUE, // Boolean. If set, the internal "formmail" feature in TYPO3 will send mail ONLY to recipients which has been encoded by the system itself. This protects against spammers misusing the formmailer.
'compressionLevel' => 0, // Determines output compression. Requires zlib in your php4 install. Range 1-9, where 1 is least compression (approx. 50%) and 9 is greatest compression (approx 33%). 'true' as value will set the compression based on system load (works with Linux, freebsd). Good default value is 3. For more info, see class in t3lib/class.gzip_encode.php written by Sandy McArthur, Jr. <Leknor@Leknor.com>
'compressionDebugInfo' => 0, // Boolean. If set, then in the end of the pages, the sizes of the compressed and non-compressed document is output. This should be used ONLY as a test, because the content is compressed twice in order to output this statistics!
'pageNotFound_handling' => '', // How TYPO3 should handle requests for non-existing/accessible pages. false (default): The 'nearest' page is shown. TRUE or '1': An TYPO3 error box is displayed. Integer > 1: Not used yet. Strings: redirect URL, eg. 'notfound.html' or 'http://www.domain.org/errors/notfound.html'.
'pageNotFound_handling' => '', // How TYPO3 should handle requests for non-existing/accessible pages. false (default): The 'nearest' page is shown. TRUE or '1': An TYPO3 error box is displayed. Integer > 1: Not used yet (outputs "ERROR: ###"). Strings: redirect URL, eg. 'notfound.html' or 'http://www.domain.org/errors/notfound.html'. If prefixed with "READFILE:" then it will expect the remaining string to be a HTML file which will be read and outputted directly after having the marker "###CURRENT_URL###" substituted with REQUEST_URI and ###REASON### with reason text, for example: "READFILE:fileadmin/notfound.html"
'pageNotFound_handling_statheader' => 'Status: 404 Not Found', // If 'pageNotFound_handling' is enabled, this string will always be sent as header before the actual handling.
'userFuncClassPrefix' => 'user_', // This prefix must be the first part of any function or class name called from TypoScript, for instance in the stdWrap function.
'addRootLineFields' => '', // Comma-list of fields from the 'pages'-table. These fields are added to the select query for fields in the rootline.
......
......@@ -720,6 +720,22 @@ class clickMenu {
);
}
/**
* Adding element for setting temporary mount point.
*
* @param integer Page uid (PID)
* @return array Item array, element in $menuItems
* @internal
*/
function DB_tempMountPoint($page_id) {
return $this->linkItem(
$this->label('tempMountPoint'),
#$this->excludeIcon('<img'.t3lib_iconWorks::skinImg($this->PH_backPath,'gfx/___.gif','width="12" height="12"').' alt="" />'),
'',
"if (top.content.nav_frame) { top.content.nav_frame.document.location = 'alt_db_navframe.php?setTempDBmount=".intval($page_id)."'; } return hideCM();"
);
}
......
......@@ -55,9 +55,9 @@
$BACK_PATH='';
require ('init.php');
require ('template.php');
require_once (PATH_t3lib.'class.t3lib_browsetree.php');
require('init.php');
require('template.php');
require_once(PATH_t3lib.'class.t3lib_browsetree.php');
......@@ -97,7 +97,7 @@ class localPageTree extends t3lib_browseTree {
$lockIcon='<a href="#" onclick="'.htmlspecialchars($aOnClick).'">'.
'<img'.t3lib_iconWorks::skinImg('','gfx/recordlock_warning3.gif','width="17" height="12"').' title="'.htmlspecialchars($lockInfo['msg']).'" alt="" />'.
'</a>';
} else $lockIcon="";
} else $lockIcon = '';
// Add title attribute to input icon tag
$thePageIcon = $this->addTagAttributes($icon, $this->titleAttrib.'="'.$this->getTitleAttrib($row).'"');
......@@ -145,10 +145,12 @@ class SC_alt_db_navframe {
var $content;
var $pagetree;
var $doc;
var $active_tempMountPoint = 0; // Temporary mount point (record), if any
// Internal, static: GPvar:
var $currentSubScript;
var $cMR;
var $setTempDBmount; // If not '' (blank) then it will clear (0) or set (>0) Temporary DB mount.
/**
* Initialiation of the class
......@@ -161,6 +163,7 @@ class SC_alt_db_navframe {
// Setting GPvars:
$this->currentSubScript = t3lib_div::_GP('currentSubScript');
$this->cMR = t3lib_div::_GP('cMR');
$this->setTempDBmount = t3lib_div::_GP('setTempDBmount');
// Create page tree object:
$this->pagetree = t3lib_div::makeInstance('localPageTree');
......@@ -175,6 +178,10 @@ class SC_alt_db_navframe {
$this->pagetree->addField('nav_hide');
$this->pagetree->addField('url');
# $this->settingTemporaryMountPoint(11);
// Temporary DB mounts:
$this->initializeTemporaryDBmount();
// Setting highlight mode:
$this->doHighlight = !$BE_USER->getTSConfigVal('options.pageTree.disableTitleHighlight');
......@@ -237,7 +244,7 @@ class SC_alt_db_navframe {
// Click menu code is added:
$CMparts=$this->doc->getContextMenuCode();
$this->doc->bodyTagAdditions = $CMparts[1];
$this->doc->JScode.=$CMparts[0];
$this->doc->JScode.= $CMparts[0];
$this->doc->postCode.= $CMparts[2];
}
......@@ -252,16 +259,38 @@ class SC_alt_db_navframe {
// Produce browse-tree:
$tree = $this->pagetree->getBrowsableTree();
// Start page:
$this->content = '';
$this->content.= $this->doc->startPage('Page tree');
// Outputting Temporary DB mount notice:
if ($this->active_tempMountPoint) {
$this->content.= '
<div class="bgColor4 c-notice">
<img'.t3lib_iconWorks::skinImg('','gfx/icon_note.gif','width="18" height="16"').' align="top" alt="" />'.
'<a href="'.htmlspecialchars(t3lib_div::linkThisScript(array('setTempDBmount' => 0))).'">'.
$LANG->sl('LLL:EXT:lang/locallang_core.php:labels.temporaryDBmount',1).
'</a><br/>
'.$LANG->sl('LLL:EXT:lang/locallang_core.php:labels.path',1).': <span title="'.htmlspecialchars($this->active_tempMountPoint['_thePathFull']).'">'.htmlspecialchars(t3lib_div::fixed_lgd_cs($this->active_tempMountPoint['_thePath'],-50)).'</span>
</div>
';
}
// Outputting page tree:
$this->content.= $tree;
// Outputting refresh-link
$refreshUrl = t3lib_div::getIndpEnv('REQUEST_URI');
$this->content.= '
<p class="c-refresh">
<a href="'.htmlspecialchars(t3lib_div::getIndpEnv('REQUEST_URI')).'">'.
<a href="'.htmlspecialchars($refreshUrl).'">'.
'<img'.t3lib_iconWorks::skinImg('','gfx/refresh_n.gif','width="14" height="14"').' title="'.$LANG->sL('LLL:EXT:lang/locallang_core.php:labels.refresh',1).'" alt="" />'.
'</a><a href="'.htmlspecialchars($refreshUrl).'">'.
$LANG->sL('LLL:EXT:lang/locallang_core.php:labels.refresh',1).'</a>
</p>
<br />';
// CSH icon:
$this->content.= t3lib_BEfunc::cshItem('xMOD_csh_corebe', 'pagetree', $GLOBALS['BACK_PATH']);
// Adding highlight - JavaScript
......@@ -279,6 +308,59 @@ class SC_alt_db_navframe {
$this->content.= $this->doc->endPage();
echo $this->content;
}
/**********************************
*
* Temporary DB mounts
*
**********************************/
/**
* Getting temporary DB mount
*/
function initializeTemporaryDBmount(){
global $BE_USER;
// Set/Cancel Temporary DB Mount:
if (strlen($this->setTempDBmount)) {
$set = t3lib_div::intInRange($this->setTempDBmount,0);
if ($set>0 && $BE_USER->isInWebMount($set)) { // Setting...:
$this->settingTemporaryMountPoint($set);
} else { // Clear:
$this->settingTemporaryMountPoint(0);
}
}
// Getting temporary mount point ID:
$temporaryMountPoint = intval($BE_USER->getSessionData('pageTree_temporaryMountPoint'));
// If mount point ID existed and is within users real mount points, then set it temporarily:
if ($temporaryMountPoint > 0 && $BE_USER->isInWebMount($temporaryMountPoint)) {
$this->pagetree->MOUNTS = array($temporaryMountPoint);
$this->active_tempMountPoint = t3lib_BEfunc::readPageAccess($temporaryMountPoint, $BE_USER->getPagePermsClause(1));
}
}
/**
* Setting temporary page id as DB mount
*/
function settingTemporaryMountPoint($pageId) {
global $BE_USER;
// Setting temporary mount point ID:
$BE_USER->setAndSaveSessionData('pageTree_temporaryMountPoint',intval($pageId));
}
}
// Include extension?
......
......@@ -169,15 +169,17 @@ class SC_alt_file_navframe {
global $LANG,$CLIENT;
// Produce browse-tree:
$tree=$this->foldertree->getBrowsableTree();
$tree = $this->foldertree->getBrowsableTree();
$this->content = '';
$this->content.= $this->doc->startPage('Folder tree');
$this->content.= $tree;
$refreshUrl = t3lib_div::getIndpEnv('REQUEST_URI');
$this->content.= '
<p class="c-refresh">
<a href="'.htmlspecialchars(t3lib_div::getIndpEnv('REQUEST_URI')).'">'.
<a href="'.htmlspecialchars($refreshUrl).'">'.
'<img'.t3lib_iconWorks::skinImg('','gfx/refresh_n.gif','width="14" height="14"').' title="'.$LANG->sL('LLL:EXT:lang/locallang_core.php:labels.refresh',1).'" alt="" />'.
'</a><a href="'.htmlspecialchars($refreshUrl).'">'.
$LANG->sL('LLL:EXT:lang/locallang_core.php:labels.refresh',1).'</a>
</p>
<br />';
......
......@@ -121,11 +121,11 @@ class localRecordList extends recordList {
global $LANG;
// Makes the code for the pageicon in the top
$this->pageRow=$row;
$this->pageRow = $row;
$this->counter++;
$alttext = t3lib_BEfunc::getRecordIconAltText($row,'pages');
$iconImg = t3lib_iconWorks::getIconImage('pages',$row,$this->backPath,'title="'.htmlspecialchars($alttext).'"');
$titleCol='test'; // pseudo title column name
$titleCol = 'test'; // pseudo title column name
$this->fieldArray = Array($titleCol,'up'); // Setting the fields to display in the list (this is of course "pseudo fields" since this is the top!)
......@@ -249,7 +249,7 @@ class localRecordList extends recordList {
$theData[$titleCol].='<br />'.htmlspecialchars(t3lib_div::fixed_lgd_cs($GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename'],-$this->fixedL));
// Make Icon:
$theIcon='<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/i/_icon_website.gif','width="18" height="16"').' alt="" />';
$theIcon = '<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/i/_icon_website.gif','width="18" height="16"').' alt="" />';
}
// If there is a returnUrl given, add a back-link:
......@@ -269,7 +269,7 @@ class localRecordList extends recordList {
</table>';
// ... and the element row is created:
$out.=$this->addelement(1,'',$theData,'',$this->leftMargin,$theIcon);
$out.=$this->addelement(1,'',$theData,'',$this->leftMargin, $theIcon);
// ... and wrapped into a table and added to the internal ->HTMLcode variable:
$this->HTMLcode.='
......
......@@ -222,6 +222,7 @@ TABLE#typo3-tree TR TD IMG { vertical-align: middle; }
TABLE#typo3-tree TR TD IMG.c-recIcon { margin-right: 1px;}
TABLE#typo3-tree { margin-bottom: 10px; width: 95%; }
P.c-refresh IMG { vertical-align: middle; margin-right: 7px; }
BODY#typo3-alt-db-navframe-php DIV.c-notice { border: 1px solid black; padding: 5px 5px 5px 5px; margin-top: 5px; margin-bottom: 10px; width : 95%; }
/* TCEforms */
TABLE.typo3-TCEforms SPAN.typo3-TCEforms-recHeader { font-weight: bold; color: #333366; }
......
......@@ -6563,7 +6563,8 @@ class tslib_cObj {
$iconTitle = $this->stdWrap($conf['iconTitle'],$conf['iconTitle.']);
$iconImg = $conf['iconImg'] ? $conf['iconImg'] : '<img src="t3lib/gfx/edit_fe.gif" width="11" height="12" border="0" align="top" title="'.t3lib_div::deHSCentities(htmlspecialchars($iconTitle)).'"'.$style.' class="frontEndEditIcons" alt="" title="" />';
$nV=t3lib_div::_GP('ADMCMD_view')?1:0;
$icon = $this->editPanelLinkWrap_doWrap($iconImg,TYPO3_mainDir.'alt_doc.php?edit['.$rParts[0].']['.$rParts[1].']=edit&columnsOnly='.rawurlencode($fieldList).'&noView='.$nV.$addUrlParamStr,implode(':',$rParts));
$adminURL = t3lib_div::getIndpEnv('TYPO3_SITE_URL').TYPO3_mainDir;
$icon = $this->editPanelLinkWrap_doWrap($iconImg, $adminURL.'alt_doc.php?edit['.$rParts[0].']['.$rParts[1].']=edit&columnsOnly='.rawurlencode($fieldList).'&noView='.$nV.$addUrlParamStr,implode(':',$rParts));
if ($conf['beforeLastTag']<0) {
$content=$icon.$content;
} elseif ($conf['beforeLastTag']>0) {
......@@ -6597,16 +6598,18 @@ class tslib_cObj {
function editPanelLinkWrap($string,$formName,$cmd,$currentRecord='',$confirm='') {
$eFONPage = $GLOBALS['BE_USER']->uc['TSFE_adminConfig']['edit_editFormsOnPage'];
$nV=t3lib_div::_GP('ADMCMD_view')?1:0;
$adminURL = t3lib_div::getIndpEnv('TYPO3_SITE_URL').TYPO3_mainDir;
if ($cmd=='edit' && !$eFONPage) {
$rParts = explode(':',$currentRecord);
$out=$this->editPanelLinkWrap_doWrap($string,TYPO3_mainDir.'alt_doc.php?edit['.$rParts[0].']['.$rParts[1].']=edit&noView='.$nV,$currentRecord);
$out=$this->editPanelLinkWrap_doWrap($string,$adminURL.'alt_doc.php?edit['.$rParts[0].']['.$rParts[1].']=edit&noView='.$nV,$currentRecord);
} elseif ($cmd=='new' && !$eFONPage) {
$rParts = explode(':',$currentRecord);
if ($rParts[0]=='pages') {
$out=$this->editPanelLinkWrap_doWrap($string,TYPO3_mainDir.'db_new.php?id='.$rParts[1].'&pagesOnly=1',$currentRecord);
$out=$this->editPanelLinkWrap_doWrap($string,$adminURL.'db_new.php?id='.$rParts[1].'&pagesOnly=1',$currentRecord);
} else {
$nPid = t3lib_div::testInt($rParts[1]) ? -$rParts[1] : $GLOBALS['TSFE']->id;
$out=$this->editPanelLinkWrap_doWrap($string,TYPO3_mainDir.'alt_doc.php?edit['.$rParts[0].']['.$nPid.']=new&noView='.$nV,$currentRecord);
$out=$this->editPanelLinkWrap_doWrap($string,$adminURL.'alt_doc.php?edit['.$rParts[0].']['.$nPid.']=new&noView='.$nV,$currentRecord);
}
} else {
if ($confirm) {
......@@ -6626,7 +6629,7 @@ class tslib_cObj {
* Creates a link to a script (eg. typo3/alt_doc.php or typo3/db_new.php) which either opens in the current frame OR in a pop-up window.
*
* @param string The string to wrap in a link, typ. and image used as button in the edit panel.
* @param string The URL of the link
* @param string The URL of the link. Should be absolute if supposed to work with <base> path set.
* @param string The "table:uid" of the record being processed by the panel.
* @return string A <a> tag wrapped string.
* @access private
......
......@@ -288,6 +288,7 @@
var $indexedDocTitle=''; // This value will be used as the title for the page in the indexer (if indexing happens)
var $altPageTitle=''; // Alternative page title (normally the title of the page record). Can be set from applications you make.
var $pEncAllowedParamNames=array(); // An array that holds parameter names (keys) of GET parameters which MAY be MD5/base64 encoded with simulate_static_documents method.
var $baseUrl=''; // The Base url set for the page header.
// Page content render object
var $cObj =''; // is instantiated object of tslib_cObj
......@@ -721,7 +722,7 @@
$GLOBALS['TT']->pull();
if ($this->pageNotFound && $this->TYPO3_CONF_VARS['FE']['pageNotFound_handling']) {
$this->pageNotFoundHandler($this->TYPO3_CONF_VARS['FE']['pageNotFound_handling'],$this->TYPO3_CONF_VARS['FE']['pageNotFound_handling_statheader']);
$this->pageNotFoundHandler();
}
// set no_cache if set
......@@ -763,7 +764,7 @@
// If still no page...
if (!count($this->page)) {
if ($this->TYPO3_CONF_VARS['FE']['pageNotFound_handling']) {
$this->pageNotFoundHandler($this->TYPO3_CONF_VARS['FE']['pageNotFound_handling'],$this->TYPO3_CONF_VARS['FE']['pageNotFound_handling_statheader']);
$this->pageNotFoundHandler();
} else {
$this->printError('The requested page does not exist!');
exit;
......@@ -981,26 +982,54 @@
}
}
/**
* Page-not-found handler for use in frontend plugins from extensions.
*
* @param string Reason text
* @return void Function exits.
*/
function pageNotFoundAndExit($reason='') {
$this->pageNotFoundHandler($this->TYPO3_CONF_VARS['FE']['pageNotFound_handling'], $this->TYPO3_CONF_VARS['FE']['pageNotFound_handling_statheader'], $reason);
exit;
}
/**
* Page not found handler.
* Exits.
*
* @param mixed Which type of handling; If a true PHP-boolean and TRUE then a ->printError message is outputted. If integer an error message with that number is shown. Otherwise the $code value is expected to be a "Location:" header value.
* @param string If set, this is passed directly to the PHP function, header()
* @param string If set, error messages will also mention this as the reason for the page-not-found.
* @return void (The function exists!)
*/
function pageNotFoundHandler($code,$header='') {
if ($header) {header($header);}
function pageNotFoundHandler($code, $header='', $reason='') {
// Issue header in any case:
if ($header) { header($header); }
// Create response:
if (gettype($code)=='boolean' || !strcmp($code,1)) {
$this->printError('The page did not exist or was inaccessible.');
$this->printError('The page did not exist or was inaccessible.'.($reason ? ' Reason: '.htmlspecialchars($reason) : ''));
exit;
} else if (t3lib_div::testInt($code)) {
$this->printError('Error '.$code);
} elseif (t3lib_div::testInt($code)) {
$this->printError('Error '.$code.($reason ? ' Reason: '.htmlspecialchars($reason) : ''));
exit;
} else {
} elseif (t3lib_div::isFirstPartOfStr($code,'READFILE:')) {
$readFile = t3lib_div::getFileAbsFileName(trim(substr($code,9)));
if (@is_file($readFile)) {
$fileContent = t3lib_div::getUrl($readFile);
$fileContent = str_replace('###CURRENT_URL###', t3lib_div::getIndpEnv('REQUEST_URI'), $fileContent);
$fileContent = str_replace('###REASON###', htmlspecialchars($reason), $fileContent);
echo $fileContent;
} else {
$this->printError('Configuration Error: 404 page "'.$readFile.'" could not be found.');
}
exit;
} elseif (strlen($code)) {
header('Location: '.t3lib_div::locationHeaderUrl($code));
exit;
} else {
$this->printError('Error.'.($reason ? ' Reason: '.htmlspecialchars($reason) : ''));
exit;
}
}
......@@ -2639,7 +2668,7 @@ if (version == "n3") {
* @see t3lib_timeTrack::debug_typo3PrintError()
*/
function printError($label,$header='Error!') {
t3lib_timeTrack::debug_typo3PrintError($header,$label,0);
t3lib_timeTrack::debug_typo3PrintError($header,$label,0,t3lib_div::getIndpEnv('TYPO3_SITE_URL'));
}
/**
......
......@@ -121,6 +121,11 @@ class TSpagegen {
$GLOBALS['TSFE']->indexedDocTitle = $GLOBALS['TSFE']->page['title'];
$GLOBALS['TSFE']->debug = ''.$GLOBALS['TSFE']->config['config']['debug'];
// Base url:
if ($GLOBALS['TSFE']->config['config']['baseURL']) {
$GLOBALS['TSFE']->baseUrl = (intval($GLOBALS['TSFE']->config['config']['baseURL']) ? t3lib_div::getIndpEnv('TYPO3_SITE_URL') : $GLOBALS['TSFE']->config['config']['baseURL']);
}
// Internal and External target defaults
$GLOBALS['TSFE']->intTarget = ''.$GLOBALS['TSFE']->config['config']['intTarget'];
$GLOBALS['TSFE']->extTarget = ''.$GLOBALS['TSFE']->config['config']['extTarget'];
......@@ -414,10 +419,9 @@ function linkTo_UnCryptMailto(s) { //
';
if ($GLOBALS['TSFE']->config['config']['baseURL']) {
$ss = intval($GLOBALS['TSFE']->config['config']['baseURL']) ? t3lib_div::getIndpEnv('TYPO3_SITE_URL') : $GLOBALS['TSFE']->config['config']['baseURL'];
if ($GLOBALS['TSFE']->baseUrl) {
$GLOBALS['TSFE']->content.='
<base href="'.htmlspecialchars($ss).'" />';
<base href="'.htmlspecialchars($GLOBALS['TSFE']->baseUrl).'" />';
}
if ($GLOBALS['TSFE']->pSetup['shortcutIcon']) {
......
......@@ -52,6 +52,7 @@ Do you want to continue WITHOUT saving?',
'labels.depth_2' => '2 levels',
'labels.depth_3' => '3 levels',
'labels.refresh' => 'Reload the tree from server',
'labels.temporaryDBmount' => 'Cancel temporary DB mount',
'labels.refreshList' => 'Reload list from server',
'labels.close' => 'Close',
'labels.new' => 'NEW',
......@@ -154,6 +155,7 @@ Would you like to save now in order to refresh the display?',
'cm.unzip' => 'Unzip',
'cm.info' => 'Info',
'cm.createnew' => 'Create new',
'cm.tempMountPoint' => 'Mount as treeroot',
),
'dk' => 'EXT',
'de' => 'EXT',
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment