Project

General

Profile

Download (9.1 KB)

Bug #23943 » 16252.diff

Administrator Admin, 2010-11-04 21:21

View differences:

typo3_src/typo3/alt_shortcut.php (revision )
);
$shortCutGroups = $BE_USER->getTSConfig('options.shortcutGroups');
if ($shortCutGroups !== '') {
t3lib_div::deprecationLog('options.shortcutGroups - since TYPO3 4.5, will be removed in TYPO3 4.7 - use options.bookmarkGroups instead');
}
$bookmarkGroups = $BE_USER->getTSConfig('options.bookmarkGroups');
if ($bookmarkGroups !== '') {
$shortCutGroups = $bookmarkGroups;
}
if (is_array($shortCutGroups['properties']) && count($shortCutGroups['properties'])) {
foreach ($shortCutGroups['properties'] as $k=>$v) {
if (strcmp('',$v) && strcmp('0',$v)) {
......
<table border="0" cellpadding="0" cellspacing="2" id="typo3-shortcuts">
<tr>
';
if ($GLOBALS['BE_USER']->getTSConfigVal('options.enableShortcuts')) {
// "Shortcuts" have been renamed to "Bookmarks"
$useShortcuts = $GLOBALS['BE_USER']->getTSConfigVal('options.enableShortcuts');
$useBookmarks = $GLOBALS['BE_USER']->getTSConfigVal('options.enableBookmarks');
if ($useShortcuts || $useBookmarks) {
$this->content .= implode('
', $this->lines);
if ($useShortcuts) {
t3lib_div::deprecationLog('options.enableShortcuts - since TYPO3 4.5, will be removed in TYPO3 4.7 - use options.enableBookmarks instead');
}
}
}
$this->content .= $editIdCode . '
</tr>
</table>
......
// $this->linesPre contains elements with sc_group>=0
$this->lines = array_merge($this->linesPre,$this->lines);
if (count($this->lines)) {
if (count($this->lines)) {
if (!$BE_USER->getTSConfigVal('options.mayNotCreateEditShortcuts')) {
// "Shortcuts" have been renamed to "Bookmarks"
$createShortcuts = !$BE_USER->getTSConfigVal('options.mayNotCreateEditShortcuts');
$createBookmarks = !$BE_USER->getTSConfigVal('options.mayNotCreateEditBookmarks');
if ($createShortcuts || $createBookmarks) {
$this->lines=array_merge(array('<td><input type="checkbox" id="editShortcut_check" name="editShortcut_check" value="1"'.($this->editSC?' checked="checked"':'').' /> <label for="editShortcut_check">'.$LANG->getLL('bookmark_edit',1).'</label>&nbsp;</td>'),$this->lines);
$this->lines[]='<td>'.$manageForm.'</td>';
if ($createShortcuts) {
t3lib_div::deprecationLog('options.mayNotCreateEditShortcuts - since TYPO3 4.5, will be removed in TYPO3 4.7 - use options.mayNotCreateEditBookmarks instead');
}
}
}
$this->lines[]='<td><img src="clear.gif" width="10" height="1" alt="" /></td>';
}
}
......
$perms_clause = $BE_USER->getPagePermsClause(1);
$this->editPath = t3lib_BEfunc::getRecordPath($this->theEditRec['pid'], $perms_clause, 30);
if(!$BE_USER->getTSConfigVal('options.shortcut_onEditId_dontSetPageTree')) {
// "Shortcuts" have been renamed to "Bookmarks"
$shortcutSetPageTree = !$BE_USER->getTSConfigVal('options.shortcut_onEditId_dontSetPageTree');
$bookmarkSetPageTree = !$BE_USER->getTSConfigVal('options.bookmark_onEditId_dontSetPageTree');
if ($shortcutSetPageTree && $bookmarkSetPageTree) {
$shortcutKeepExpanded = $BE_USER->getTSConfigVal('options.shortcut_onEditId_keepExistingExpanded');
$bookmarkKeepExpanded = $BE_USER->getTSConfigVal('options.bookmark_onEditId_keepExistingExpanded');
$keepNotExpanded = (!$shortcutKeepExpanded || !$bookmarkKeepExpanded);
// Expanding page tree:
t3lib_BEfunc::openPageTree($this->theEditRec['pid'],!$BE_USER->getTSConfigVal('options.shortcut_onEditId_keepExistingExpanded'));
t3lib_BEfunc::openPageTree($this->theEditRec['pid'], $keepNotExpanded);
if ($shortcutSetPageTree) {
t3lib_div::deprecationLog('options.shortcut_onEditId_dontSetPageTree - since TYPO3 4.5, will be removed in TYPO3 4.7 - use options.bookmark_onEditId_dontSetPageTree instead');
}
}
if ($shortcutKeepExpanded) {
t3lib_div::deprecationLog('options.shortcut_onEditId_keepExistingExpanded - since TYPO3 4.5, will be removed in TYPO3 4.7 - use options.bookmark_onEditId_keepExistingExpanded instead');
}
}
}
}
}
}
}
}
}
}
/**
* Outputting the accumulated content to screen
typo3_src/typo3/backend.php (revision )
// Load page to edit:
window.setTimeout("top.loadEditId('.intval($editRecord['uid']).');", 500);
';
// "Shortcuts" have been renamed to "Bookmarks"
$shortcutSetPageTree = $GLOBALS['BE_USER']->getTSConfigVal('options.shortcut_onEditId_dontSetPageTree');
$bookmarkSetPageTree = $GLOBALS['BE_USER']->getTSConfigVal('options.bookmark_onEditId_dontSetPageTree');
if ($shortcutSetPageTree !== '') {
t3lib_div::deprecationLog('options.shortcut_onEditId_dontSetPageTree - since TYPO3 4.5, will be removed in TYPO3 4.7 - use options.bookmark_onEditId_dontSetPageTree instead');
}
// Checking page edit parameter:
if(!$GLOBALS['BE_USER']->getTSConfigVal('options.shortcut_onEditId_dontSetPageTree')) {
if (!$shortcutSetPageTree && !$bookmarkSetPageTree) {
$shortcutKeepExpanded = $GLOBALS['BE_USER']->getTSConfigVal('options.shortcut_onEditId_keepExistingExpanded');
$bookmarkKeepExpanded = $GLOBALS['BE_USER']->getTSConfigVal('options.bookmark_onEditId_keepExistingExpanded');
$keepExpanded = ($shortcutKeepExpanded || $bookmarkKeepExpanded);
// Expanding page tree:
t3lib_BEfunc::openPageTree(intval($editRecord['pid']), !$GLOBALS['BE_USER']->getTSConfigVal('options.shortcut_onEditId_keepExistingExpanded'));
t3lib_BEfunc::openPageTree(intval($editRecord['pid']), !$keepExpanded);
if ($shortcutKeepExpanded) {
t3lib_div::deprecationLog('options.shortcut_onEditId_keepExistingExpanded - since TYPO3 4.5, will be removed in TYPO3 4.7 - use options.bookmark_onEditId_keepExistingExpanded instead');
}
}
}
} else {
$this->js .= '
// Warning about page editing:
typo3_src/typo3/classes/class.shortcutmenu.php (revision )
* @return boolean true if user has access, false if not
*/
public function checkAccess() {
if ($GLOBALS['BE_USER']->getTSConfigVal('options.enableShortcuts')) {
return true;
// "Shortcuts" have been renamed to "Bookmarks"
$useShortcuts = $GLOBALS['BE_USER']->getTSConfigVal('options.enableShortcuts');
if ($useShortcuts !== '') {
t3lib_div::deprecationLog('options.enableShortcuts - since TYPO3 4.5, will be removed in TYPO3 4.7 - use options.enableBookmarks instead');
return (bool) $useShortcuts;
}
return false;
return (bool) $GLOBALS['BE_USER']->getTSConfigVal('options.enableBookmarks');
}
/**
......
protected function initShortcutGroups($params = array(), TYPO3AJAX &$ajaxObj = null) {
// groups from TSConfig
$userShortcutGroups = $GLOBALS['BE_USER']->getTSConfig('options.shortcutGroups');
if ($userShortcutGroups !== '') {
t3lib_div::deprecationLog('options.shortcutGroups - since TYPO3 4.5, will be removed in TYPO3 4.7 - use options.bookmarkGroups instead');
}
$bookmarkGroups = $GLOBALS['BE_USER']->getTSConfig('options.bookmarkGroups');
if ($bookmarkGroups !== '') {
$userShortcutGroups = $bookmarkGroups;
}
if(is_array($userShortcutGroups['properties']) && count($userShortcutGroups['properties'])) {
foreach($userShortcutGroups['properties'] as $groupId => $label) {
typo3_src/t3lib/config_default.php (revision )
'maxFileSize' => '10240', // Integer: If set this is the max filesize in KB's for file operations in the backend. Can be overridden through $TCA per table field separately.
'forceCharset' => '', // String: Normally the charset of the backend users language selection is used. If you set this value to a charset found in t3lib/csconvtbl/ (or "utf-8") the backend (and database) will ALWAYS use this charset. Always use a lowercase value.
'installToolPassword' => '', // String: This is the md5-hashed password for the Install Tool. Set this to '' and access will be totally denied. PLEASE consider to externally password protect the typo3/install/ folder, eg. with a .htaccess file.
'defaultUserTSconfig' => 'options.enableShortcuts=1
'defaultUserTSconfig' => 'options.enableBookmarks=1
options.enableShowPalettes=1
options.file_list.enableDisplayBigControlPanel=selectable
options.file_list.enableDisplayThumbnails=selectable
(1-1/2)