Project

General

Profile

Feature #20640 » 11370_v4.patch

Administrator Admin, 2009-08-18 09:56

View differences:

t3lib/class.t3lib_div.php (working copy)
}
/**
* Rename Array keys with a given mapping table
* @param array Array by reference which should be remapped
* @param array Array with remap information, array/$oldKey => $newKey)
*/
function remapArrayKeys(&$array, $mappingTable) {
if (is_array($mappingTable)) {
foreach ($mappingTable as $old => $new) {
if ($new && isset($array[$old])) {
$array[$new] = $array[$old];
unset ($array[$old]);
}
}
}
}
/**
* Merges two arrays recursively and "binary safe" (integer keys are
* overridden as well), overruling similar values in the first array
* ($arr0) with the values of the second array ($arr1)
t3lib/class.t3lib_tsparser_ext.php (working copy)
'ctable' => Array('Content: \'Table\'', 'mf'),
'cuploads' => Array('Content: \'Filelinks\'', 'mg'),
'cmultimedia' => Array('Content: \'Multimedia\'', 'mh'),
'cmedia' => Array('Content: \'Media\'', 'mr'),
'cmailform' => Array('Content: \'Form\'', 'mi'),
'csearch' => Array('Content: \'Search\'', 'mj'),
'clogin' => Array('Content: \'Login\'', 'mk'),
typo3/index.php (working copy)
'NEWS' => $this->makeLoginNews(),
'COPYRIGHT' => $this->makeCopyrightNotice(),
'CSS_ERRORCLASS' => ($this->commandLI ? ' class="error"' : ''),
'SITE_LINK' => '<a href="/">###SITENAME###</a>',
// the labels will be replaced later on, thus the other parts above
// can use these markers as well and it will be replaced
'HEADLINE' => $GLOBALS['LANG']->getLL('headline', true),
'INFO' => $GLOBALS['LANG']->getLL('info.jscookies', true),
'INFO_ABOUT' => $GLOBALS['LANG']->getLL('info.about', true),
'INFO_RELOAD' => $GLOBALS['LANG']->getLL('info.reload', true),
'ERROR_JAVASCRIPT' => $GLOBALS['LANG']->getLL('error.javascript', true),
'ERROR_COOKIES' => $GLOBALS['LANG']->getLL('error.cookies', true),
'ERROR_CAPSLOCK' => $GLOBALS['LANG']->getLL('error.capslock', true),
'LABEL_DONATELINK' => $GLOBALS['LANG']->getLL('labels.donate', true),
'LABEL_USERNAME' => $GLOBALS['LANG']->getLL('labels.username', true),
'LABEL_PASSWORD' => $GLOBALS['LANG']->getLL('labels.password', true),
'CLEAR' => $GLOBALS['LANG']->getLL('clear', true),
// global variables will now be replaced (at last)
'SITENAME' => $GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename']
......
<option value="'.htmlspecialchars($jumpScript[$valueStr]).'">'.htmlspecialchars($labels[$valueStr]).'</option>';
}
$this->interfaceSelector='
<select id="interfaceselector" name="interface" class="c-interfaceselector">'.$this->interfaceSelector.'
<select id="interfaceselector" name="interface" class="c-interfaceselector" tabindex="3">'.$this->interfaceSelector.'
</select>';
$this->interfaceSelector_jump='
<select id="interfaceselector" name="interface" class="c-interfaceselector" onchange="window.location.href=this.options[this.selectedIndex].value;">'.$this->interfaceSelector_jump.'
<select id="interfaceselector" name="interface" class="c-interfaceselector" tabindex="3" onchange="window.location.href=this.options[this.selectedIndex].value;">'.$this->interfaceSelector_jump.'
</select>';
} else { // If there is only ONE interface value set:
......
$GLOBALS['LANG']->getLL('typo3.cms') . ($GLOBALS['TYPO3_CONF_VARS']['SYS']['loginCopyrightShowVersion']?' ' . $GLOBALS['LANG']->getLL('version.short') . ' ' . htmlspecialchars($GLOBALS['TYPO_VERSION']):'') .
'</a>. ' .
$GLOBALS['LANG']->getLL('copyright') . ' &copy; ' . TYPO3_copyright_year . ' Kasper Sk&#229;rh&#248;j. ' . $GLOBALS['LANG']->getLL('extension.copyright') . ' ' .
sprintf($GLOBALS['LANG']->getLL('details.link'), '<a href="http://typo3.com/" target="_blank">http://typo3.com/</a>') . ' ' .
sprintf($GLOBALS['LANG']->getLL('details.link'), '<a href="http://typo3.com/" target="_blank">http://typo3.com/</a>') . '<br /> ' .
$warrantyNote . ' ' .
sprintf($GLOBALS['LANG']->getLL('free.software'), '<a href="http://typo3.com/1316.0.html" target="_blank">', '</a> ') .
$GLOBALS['LANG']->getLL('keep.notice');
......
document.loginform.p_field.focus();
}
}
// This function shows a warning, if user has capslock enabled
function checkCapslock(e) {
if (isCapslock(e)) {
document.getElementById(\'t3-capslock\').style.display = \'block\';
} else {
document.getElementById(\'t3-capslock\').style.display = \'none\';
}
}
// Checks weather capslock is enabled (returns true if enabled, false otherwise)
// thanks to http://24ways.org/2007/capturing-caps-lock
function isCapslock(e) {
var ev = e ? e : window.event;
if (!ev) {
return;
}
var targ = ev.target ? ev.target : ev.srcElement;
// get key pressed
var which = -1;
if (ev.which) {
which = ev.which;
} else if (ev.keyCode) {
which = ev.keyCode;
}
// get shift status
var shift_status = false;
if (ev.shiftKey) {
shift_status = ev.shiftKey;
} else if (ev.modifiers) {
shift_status = !!(ev.modifiers & 4);
}
return (((which >= 65 && which <= 90) && !shift_status) ||
((which >= 97 && which <= 122) && shift_status))
}
');
return $JSCode;
typo3/sysext/t3skin/ext_tables.php (working copy)
//print_a($TBE_STYLES,2);
// Adding HTML template for login screen
$TBE_STYLES['htmlTemplates']['templates/login.html'] = 'sysext/t3skin/templates/login.html';
$GLOBALS['TYPO3_CONF_VARS']['typo3/backend.php']['additionalBackendItems'][] = t3lib_extMgm::extPath('t3skin').'registerIe6Stylesheet.php';
}
(4-4/5)