[BUGFIX] Warning in list module
[Packages/TYPO3.CMS.git] / typo3 / alt_shortcut.php
old mode 100755 (executable)
new mode 100644 (file)
index 3776fd7..f7dff88
@@ -2,7 +2,7 @@
 /***************************************************************
 *  Copyright notice
 *
-*  (c) 1999-2005 Kasper Skaarhoj (kasperYYYY@typo3.com)
+*  (c) 1999-2011 Kasper Skårhøj (kasperYYYY@typo3.com)
 *  All rights reserved
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
  * If the 'cms' extension is loaded you will also have a field for entering page id/alias which will be found/edited
  *
  * $Id$
- * Revised for TYPO3 3.6 2/2003 by Kasper Skaarhoj
+ * Revised for TYPO3 3.6 2/2003 by Kasper Skårhøj
  * XHTML compliant output
  *
- * @author     Kasper Skaarhoj <kasperYYYY@typo3.com>
+ * @author     Kasper Skårhøj <kasperYYYY@typo3.com>
  */
 /**
  * [CLASS/FUNCTION INDEX of SCRIPT]
@@ -68,8 +68,6 @@
 require('init.php');
 require('template.php');
 $LANG->includeLLFile('EXT:lang/locallang_misc.xml');
-require_once(PATH_t3lib.'class.t3lib_loadmodules.php');
-require_once(PATH_t3lib.'class.t3lib_basicfilefunc.php');
 
 
 
@@ -79,7 +77,7 @@ require_once(PATH_t3lib.'class.t3lib_basicfilefunc.php');
 /**
  * Script Class for the shortcut frame, bottom frame of the backend frameset
  *
- * @author     Kasper Skaarhoj <kasperYYYY@typo3.com>
+ * @author     Kasper Skårhøj <kasperYYYY@typo3.com>
  * @package TYPO3
  * @subpackage core
  */
@@ -96,12 +94,24 @@ class SC_alt_shortcut {
        var $whichItem;
 
                // Internal, static:
-       var $loadModules;               // Modules object
-       var $doc;                       // Document template object
+       /**
+        * Object for backend modules, load modules-object
+        *
+        * @var t3lib_loadModules
+        */
+       var $loadModules;
+       protected $isAjaxCall;
+
+       /**
+        * Document template object
+        *
+        * @var template
+        */
+       var $doc;
 
                // Internal, dynamic:
        var $content;                   // Accumulation of output HTML (string)
-       var $lines;                     // Accumulation of table cells (array)
+       var $lines;                             // Accumulation of table cells (array)
 
        var $editLoaded;                // Flag for defining whether we are editing
        var $editError;                 // Can contain edit error message
@@ -126,18 +136,19 @@ class SC_alt_shortcut {
                global $TBE_MODULES;
 
                        // Setting GPvars:
-               $this->modName = t3lib_div::_GP('modName');
-               $this->M_modName = t3lib_div::_GP('motherModName');
-               $this->URL = t3lib_div::_GP('URL');
-               $this->editSC = t3lib_div::_GP('editShortcut');
-
-               $this->deleteCategory = t3lib_div::_GP('deleteCategory');
-               $this->editPage = t3lib_div::_GP('editPage');
-               $this->changeWorkspace = t3lib_div::_GP('changeWorkspace');
+               $this->isAjaxCall             = (boolean) t3lib_div::_GP('ajax');
+               $this->modName                = t3lib_div::_GP('modName');
+               $this->M_modName              = t3lib_div::_GP('motherModName');
+               $this->URL                    = t3lib_div::_GP('URL');
+               $this->editSC                 = t3lib_div::_GP('editShortcut');
+
+               $this->deleteCategory         = t3lib_div::_GP('deleteCategory');
+               $this->editPage               = t3lib_div::_GP('editPage');
+               $this->changeWorkspace        = t3lib_div::_GP('changeWorkspace');
                $this->changeWorkspacePreview = t3lib_div::_GP('changeWorkspacePreview');
-               $this->editName = t3lib_div::_GP('editName');
-               $this->editGroup = t3lib_div::_GP('editGroup');
-               $this->whichItem = t3lib_div::_GP('whichItem');
+               $this->editName               = t3lib_div::_GP('editName');
+               $this->editGroup              = t3lib_div::_GP('editGroup');
+               $this->whichItem              = t3lib_div::_GP('whichItem');
 
                        // Creating modules object
                $this->loadModules = t3lib_div::makeInstance('t3lib_loadModules');
@@ -153,6 +164,7 @@ class SC_alt_shortcut {
                global $BE_USER;
                $description = '';      // Default description
                $url = urldecode($this->URL);
+               $queryParts = parse_url($url);
 
                        // Lookup the title of this page and use it as default description
                $page_id = $this->getLinkedPageId($url);
@@ -176,14 +188,15 @@ class SC_alt_shortcut {
                }
 
 
-                       // Adding a shortcut being set from another frame
-               if ($this->modName && $this->URL)       {
+                       // Adding a shortcut being set from another frame,
+                       // but only if it's a relative URL (i.e. scheme part is not defined)
+               if ($this->modName && $this->URL && empty($queryParts['scheme'])) {
                        $fields_values = array(
                                'userid' => $BE_USER->user['uid'],
                                'module_name' => $this->modName.'|'.$this->M_modName,
                                'url' => $this->URL,
                                'description' => $description,
-                               'sorting' => time(),
+                               'sorting' => $GLOBALS['EXEC_TIME'],
                        );
                        $GLOBALS['TYPO3_DB']->exec_INSERTquery('sys_be_shortcuts', $fields_values);
                }
@@ -237,7 +250,6 @@ class SC_alt_shortcut {
                $this->doc = t3lib_div::makeInstance('template');
                $this->doc->backPath = $BACK_PATH;
                $this->doc->form='<form action="alt_shortcut.php" name="shForm" method="post">';
-               $this->doc->docType='xhtml_trans';
                $this->doc->divClass='typo3-shortcut';
                $this->doc->JScode.=$this->doc->wrapScriptTags('
                        function jump(url,modName,mainModName)  {       //
@@ -254,14 +266,17 @@ class SC_alt_shortcut {
                                window.location.href="alt_shortcut.php?editShortcut="+uid;
                        }
                        function submitEditPage(id)     {       //
-                               window.location.href="alt_shortcut.php?editPage="+top.rawurlencode(id);
+                               window.location.href="alt_shortcut.php?editPage="+top.rawurlencodeAndRemoveSiteUrl(id);
                        }
                        function changeWorkspace(workspaceId)   {       //
-                               window.location.href="alt_shortcut.php?changeWorkspace="+top.rawurlencode(workspaceId);
+                               window.location.href="alt_shortcut.php?changeWorkspace="+top.rawurlencodeAndRemoveSiteUrl(workspaceId);
                        }
                        function changeWorkspacePreview(newstate)       {       //
                                window.location.href="alt_shortcut.php?changeWorkspacePreview="+newstate;
                        }
+                       function refreshShortcuts() {
+                               window.location.href = document.URL;
+                       }
 
                        ');
                $this->content.=$this->doc->startPage('Shortcut frame');
@@ -284,9 +299,18 @@ class SC_alt_shortcut {
                        5 => 1,
                );
 
-               $shortCutGroups = $BE_USER->getTSConfig('options.shortcutGroups');
-               if (is_array($shortCutGroups['properties']) && count($shortCutGroups['properties']))    {
-                       foreach ($shortCutGroups['properties'] as $k=>$v)       {
+                       // "Shortcuts" have been renamed to "Bookmarks"
+                       // @deprecated remove shortcuts code in TYPO3 4.7
+               $shortCutGroups = $BE_USER->getTSConfigProp('options.shortcutGroups');
+               if ($shortCutGroups !== NULL) {
+                       t3lib_div::deprecationLog('options.shortcutGroups - since TYPO3 4.5, will be removed in TYPO3 4.7 - use options.bookmarkGroups instead');
+               }
+               $bookmarkGroups = $BE_USER->getTSConfigProp('options.bookmarkGroups');
+               if ($bookmarkGroups !== NULL) {
+                       $shortCutGroups = $bookmarkGroups;
+               }
+               if (is_array($shortCutGroups) && count($shortCutGroups)) {
+                       foreach ($shortCutGroups as $k=>$v)     {
                                if (strcmp('',$v) && strcmp('0',$v))    {
                                        $this->groupLabels[$k] = (string)$v;
                                } elseif ($BE_USER->isAdmin())  {
@@ -352,10 +376,10 @@ class SC_alt_shortcut {
                                        }
 
                                        if ($sc_group>=0)       {
-                                               $onC = 'if (confirm('.$GLOBALS['LANG']->JScharCode($LANG->getLL('shortcut_delAllInCat')).')){window.location.href=\'alt_shortcut.php?deleteCategory='.$sc_group.'\';}return false;';
-                                               $this->linesPre[]='<td>&nbsp;</td><td class="bgColor5"><a href="#" onclick="'.htmlspecialchars($onC).'" title="'.$LANG->getLL('shortcut_delAllInCat',1).'">'.$label.'</a></td>';
+                                               $onC = 'if (confirm('.$GLOBALS['LANG']->JScharCode($LANG->getLL('bookmark_delAllInCat')).')){window.location.href=\'alt_shortcut.php?deleteCategory='.$sc_group.'\';}return false;';
+                                               $this->linesPre[]='<td>&nbsp;</td><td class="bgColor5"><a href="#" onclick="'.htmlspecialchars($onC).'" title="'.$LANG->getLL('bookmark_delAllInCat',1).'">'.$label.'</a></td>';
                                        } else {
-                                               $label = $LANG->getLL('shortcut_global',1).': '.($label ? $label : abs($sc_group));     // Fallback label
+                                               $label = $LANG->getLL('bookmark_global',1).': '.($label ? $label : abs($sc_group));     // Fallback label
                                                $this->lines[]='<td>&nbsp;</td><td class="bgColor5">'.$label.'</td>';
                                        }
                                        unset($label);
@@ -367,11 +391,11 @@ class SC_alt_shortcut {
                        if ($row['description']&&($row['uid']!=$this->editSC))  {
                                $label = $row['description'];
                        } else {
-                               $label = t3lib_div::fixed_lgd(rawurldecode($qParts['query']),150);
+                               $label = t3lib_div::fixed_lgd_cs(rawurldecode($qParts['query']),150);
                        }
                        $titleA = $this->itemLabel($label,$row['module_name'],$row['M_module_name']);
 
-                       $editSH = ($row['sc_group']>=0 || $BE_USER->isAdmin()) ? 'editSh('.intval($row['uid']).');' : "alert('".$LANG->getLL('shortcut_onlyAdmin')."')";
+                       $editSH = ($row['sc_group']>=0 || $BE_USER->isAdmin()) ? 'editSh('.intval($row['uid']).');' : "alert('".$LANG->getLL('bookmark_onlyAdmin')."')";
                        $jumpSC = 'jump(unescape(\''.rawurlencode($row['url']).'\'),\''.implode('_',$mParts).'\',\''.$mParts[0].'\');';
                        $onC = 'if (document.shForm.editShortcut_check && document.shForm.editShortcut_check.checked){'.$editSH.'}else{'.$jumpSC.'}return false;';
                        if ($sc_group>=0)       {       // user defined groups show up first
@@ -386,21 +410,21 @@ class SC_alt_shortcut {
                        $formerGr=$row['sc_group'];
                }
                ksort($this->selOpt);
-               array_unshift($this->selOpt,'<option>['.$LANG->getLL('shortcut_selSC',1).']</option>');
+               array_unshift($this->selOpt,'<option>['.$LANG->getLL('bookmark_selSC',1).']</option>');
 
                $this->editLoadedFunc();
                $this->editPageIdFunc();
 
                if (!$this->editLoaded && t3lib_extMgm::isLoaded('cms'))        {
-                               $editIdCode = '<td nowrap="nowrap">'.$LANG->getLL('shortcut_editID',1).': <input type="text" value="'.($this->editError?htmlspecialchars($this->editPage):'').'" name="editPage"'.$this->doc->formWidth(15).' onchange="submitEditPage(this.value);" />'.
+                               $editIdCode = '<td nowrap="nowrap">'.$LANG->getLL('bookmark_editID',1).': <input type="text" value="'.($this->editError?htmlspecialchars($this->editPage):'').'" name="editPage"'.$this->doc->formWidth(15).' onchange="submitEditPage(this.value);" />'.
                                        ($this->editError?'&nbsp;<strong><span class="typo3-red">'.htmlspecialchars($this->editError).'</span></strong>':'').
-                                       (is_array($this->theEditRec)?'&nbsp;<strong>'.$LANG->getLL('shortcut_loadEdit',1).' \''.t3lib_BEfunc::getRecordTitle('pages',$this->theEditRec,TRUE).'\'</strong> ('.htmlspecialchars($this->editPath).')':'').
-                                       ($this->searchFor?'&nbsp;'.$LANG->getLL('shortcut_searchFor',1).' <strong>\''.htmlspecialchars($this->searchFor).'\'</strong>':'').
+                                       (is_array($this->theEditRec)?'&nbsp;<strong>'.$LANG->getLL('bookmark_loadEdit',1).' \''.t3lib_BEfunc::getRecordTitle('pages',$this->theEditRec,TRUE).'\'</strong> ('.htmlspecialchars($this->editPath).')':'').
+                                       ($this->searchFor?'&nbsp;'.$LANG->getLL('bookmark_searchFor',1).' <strong>\''.htmlspecialchars($this->searchFor).'\'</strong>':'').
                                        '</td>';
                } else $editIdCode = '';
 
                        // Adding CSH:
-               $editIdCode.= '<td>&nbsp;'.t3lib_BEfunc::cshItem('xMOD_csh_corebe', 'shortcuts', $GLOBALS['BACK_PATH'],'',TRUE).'</td>';
+               $editIdCode.= '<td>&nbsp;'.t3lib_BEfunc::cshItem('xMOD_csh_corebe', 'bookmarks', $GLOBALS['BACK_PATH'],'',TRUE).'</td>';
 
                        // Compile it all:
                $this->content.='
@@ -413,8 +437,20 @@ class SC_alt_shortcut {
                                                -->
                                                <table border="0" cellpadding="0" cellspacing="2" id="typo3-shortcuts">
                                                        <tr>
-                                                       '.implode('
-                                                       ',$this->lines).$editIdCode.'
+                                                       ';
+                                                               // "Shortcuts" have been renamed to "Bookmarks"
+                                                               // @deprecated remove shortcuts code in TYPO3 4.7
+                                                       $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>
                                        </td>
@@ -432,6 +468,7 @@ class SC_alt_shortcut {
                        // Launch Edit page:
                if ($this->theEditRec['uid'])   {
                        $this->content.=$this->doc->wrapScriptTags('top.loadEditId('.$this->theEditRec['uid'].');');
+
                }
 
                        // Load alternative table/uid into editing form.
@@ -442,8 +479,13 @@ class SC_alt_shortcut {
 
                        // Load search for something.
                if ($this->searchFor)   {
-                       $firstMP = intval($GLOBALS['WEBMOUNTS'][0]);
-                       $this->content.= $this->doc->wrapScriptTags('jump(unescape("'.rawurlencode('db_list.php?id='.$firstMP.'&search_field='.rawurlencode($this->searchFor).'&search_levels=4').'"),"web_list","web");');
+                       $urlParameters = array();
+                       $urlParameters['id'] = intval($GLOBALS['WEBMOUNTS'][0]);
+                       $urlParameters['search_field'] = $this->searchFor;
+                       $urlParameters['search_levels'] = 4;
+                       $this->content .= $this->doc->wrapScriptTags('jump(unescape("' .
+                               rawurlencode(t3lib_BEfunc::getModuleUrl('web_list', $urlParameters, '')) .
+                       '"), "web_list", "web");');
                }
        }
 
@@ -466,8 +508,8 @@ class SC_alt_shortcut {
                                if ($v && strcmp('1',$v))       {
                                        $label = $v;
                                } else {
-                                       $label = $LANG->getLL('shortcut_group_'.$k,1);
-                                       if (!$label)    $label = $LANG->getLL('shortcut_group',1).' '.$k;       // Fallback label
+                                       $label = $LANG->getLL('bookmark_group_'.$k,1);
+                                       if (!$label)    $label = $LANG->getLL('bookmark_group',1).' '.$k;       // Fallback label
                                }
                                $opt[]='<option value="'.$k.'"'.(!strcmp($this->editSC_rec['sc_group'],$k)?' selected="selected"':'').'>'.$label.'</option>';
                        }
@@ -477,14 +519,14 @@ class SC_alt_shortcut {
                                        if ($v && strcmp('1',$v))       {
                                                $label = $v;
                                        } else {
-                                               $label = $LANG->getLL('shortcut_group_'.$k,1);
-                                               if (!$label)    $label = $LANG->getLL('shortcut_group',1).' '.$k;       // Fallback label
+                                               $label = $LANG->getLL('bookmark_group_'.$k,1);
+                                               if (!$label)    $label = $LANG->getLL('bookmark_group',1).' '.$k;       // Fallback label
                                        }
-                                       $label = $LANG->getLL('shortcut_global',1).': '.$label; // Add a prefix for global groups
+                                       $label = $LANG->getLL('bookmark_global',1).': '.$label; // Add a prefix for global groups
 
                                        $opt[]='<option value="-'.$k.'"'.(!strcmp($this->editSC_rec['sc_group'],'-'.$k)?' selected="selected"':'').'>'.$label.'</option>';
                                }
-                               $opt[]='<option value="-100"'.(!strcmp($this->editSC_rec['sc_group'],'-100')?' selected="selected"':'').'>'.$LANG->getLL('shortcut_global',1).': '.$LANG->getLL('shortcut_all',1).'</option>';
+                               $opt[]='<option value="-100"'.(!strcmp($this->editSC_rec['sc_group'],'-100')?' selected="selected"':'').'>'.$LANG->getLL('bookmark_global',1).': '.$LANG->getLL('bookmark_all',1).'</option>';
                        }
 
                                // border="0" hspace="2" width="21" height="16" - not XHTML compliant in <input type="image" ...>
@@ -497,9 +539,9 @@ class SC_alt_shortcut {
                                        <tr>
                                                <td>&nbsp;&nbsp;</td>
                                                <td><input type="image" class="c-inputButton" name="_savedok"'.t3lib_iconWorks::skinImg($this->doc->backPath,'gfx/savedok.gif','').' title="'.$LANG->getLL('shortcut_save',1).'" /></td>
-                                               <td><input type="image" class="c-inputButton" name="_saveclosedok"'.t3lib_iconWorks::skinImg($this->doc->backPath,'gfx/saveandclosedok.gif','').' title="'.$LANG->getLL('shortcut_saveClose',1).'" /></td>
-                                               <td><input type="image" class="c-inputButton" name="_closedok"'.t3lib_iconWorks::skinImg($this->doc->backPath,'gfx/closedok.gif','').' title="'.$LANG->getLL('shortcut_close',1).'" /></td>
-                                               <td><input type="image" class="c-inputButton" name="_deletedok"'.t3lib_iconWorks::skinImg($this->doc->backPath,'gfx/deletedok.gif','').' title="'.$LANG->getLL('shortcut_delete',1).'" /></td>
+                                               <td><input type="image" class="c-inputButton" name="_saveclosedok"'.t3lib_iconWorks::skinImg($this->doc->backPath,'gfx/saveandclosedok.gif','').' title="'.$LANG->getLL('bookmark_saveClose',1).'" /></td>
+                                               <td><input type="image" class="c-inputButton" name="_closedok"'.t3lib_iconWorks::skinImg($this->doc->backPath,'gfx/closedok.gif','').' title="'.$LANG->getLL('bookmark_close',1).'" /></td>
+                                               <td><input type="image" class="c-inputButton" name="_deletedok"'.t3lib_iconWorks::skinImg($this->doc->backPath,'gfx/deletedok.gif','').' title="'.$LANG->getLL('bookmark_delete',1).'" /></td>
                                                <td><input name="editName" type="text" value="'.htmlspecialchars($this->editSC_rec['description']).'"'.$this->doc->formWidth(15).' /></td>
                                                <td><select name="editGroup">'.implode('',$opt).'</select></td>
                                        </tr>
@@ -517,10 +559,19 @@ class SC_alt_shortcut {
                        // $this->linesPre contains elements with sc_group>=0
                $this->lines = array_merge($this->linesPre,$this->lines);
 
-               if (count($this->lines))        {
-                       if (!$BE_USER->getTSConfigVal('options.mayNotCreateEditShortcuts'))     {
-                               $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('shortcut_edit',1).'</label>&nbsp;</td>'),$this->lines);
+               if (count($this->lines)) {
+                               // "Shortcuts" have been renamed to "Bookmarks"
+                               // @deprecated remove shortcuts code in TYPO3 4.7
+                       $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>';
                }
@@ -538,7 +589,7 @@ class SC_alt_shortcut {
                if (!t3lib_extMgm::isLoaded('cms'))     return;
 
                        // EDIT page:
-               $this->editPage = trim(strtolower($this->editPage));
+               $this->editPage = trim($LANG->csConvObj->conv_case($LANG->charSet,$this->editPage,'toLower'));
                $this->editError = '';
                $this->theEditRec = '';
                $this->searchFor = '';
@@ -564,17 +615,32 @@ class SC_alt_shortcut {
                                        $this->searchFor = $this->editPage;
                                } elseif (!$BE_USER->isInWebMount($this->theEditRec['uid'])) {
                                        unset($this->theEditRec);
-                                       $this->editError=$LANG->getLL('shortcut_notEditable');
+                                       $this->editError=$LANG->getLL('bookmark_notEditable');
                                } else {
 
                                                // Visual path set:
                                        $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"
+                                               // @deprecated remove shortcuts code in TYPO3 4.7
+                                       $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');
+                                               }
                                        }
                                }
                        }
@@ -587,9 +653,45 @@ class SC_alt_shortcut {
         * @return      void
         */
        function printContent() {
+               $content = '';
+
                $this->content.= $this->doc->endPage();
                $this->content = $this->doc->insertStylesAndJS($this->content);
-               echo $this->content;
+
+               if($this->editPage && $this->isAjaxCall) {
+                       $data = array();
+
+                               // edit page
+                       if($this->theEditRec['uid']) {
+                               $data['type']       = 'page';
+                               $data['editRecord'] = $this->theEditRec['uid'];
+                       }
+
+                               // edit alternative table/uid
+                       if(count($this->alternativeTableUid) == 2
+                       && isset($GLOBALS['TCA'][$this->alternativeTableUid[0]])
+                       && t3lib_div::testInt($this->alternativeTableUid[1])) {
+                               $data['type']             = 'alternative';
+                               $data['alternativeTable'] = $this->alternativeTableUid[0];
+                               $data['alternativeUid']   = $this->alternativeTableUid[1];
+                       }
+
+                               // search for something else
+                       if($this->searchFor) {
+                               $data['type']            = 'search';
+                               $data['firstMountPoint'] = intval($GLOBALS['WEBMOUNTS'][0]);
+                               $data['searchFor']       = $this->searchFor;
+                       }
+
+                       $content = json_encode($data);
+
+                       header('Content-type: application/json; charset=utf-8');
+                       header('X-JSON: '.$content);
+               } else {
+                       $content = $this->content;
+               }
+
+               echo $content;
        }
 
 
@@ -617,7 +719,7 @@ class SC_alt_shortcut {
                        // Changing workspace and if so, reloading entire backend:
                if (strlen($this->changeWorkspace))     {
                        $BE_USER->setWorkspace($this->changeWorkspace);
-                       return $this->doc->wrapScriptTags('top.location.href="alt_main.php";');
+                       return $this->doc->wrapScriptTags('top.location.href="'. t3lib_BEfunc::getBackendScript() . '";');
                }
                        // Changing workspace and if so, reloading entire backend:
                if (strlen($this->changeWorkspacePreview))      {
@@ -627,18 +729,20 @@ class SC_alt_shortcut {
                        // Create options array:
                $options = array();
                if ($BE_USER->checkWorkspace(array('uid' => 0)))        {
-                       $options[0] = '['.$LANG->getLL('shortcut_onlineWS').']';
+                       $options[0] = '['.$LANG->getLL('bookmark_onlineWS').']';
                }
                if ($BE_USER->checkWorkspace(array('uid' => -1)))       {
-                       $options[-1] = '['.$LANG->getLL('shortcut_offlineWS').']';
+                       $options[-1] = '['.$LANG->getLL('bookmark_offlineWS').']';
                }
 
                        // Add custom workspaces (selecting all, filtering by BE_USER check):
-               $workspaces = $TYPO3_DB->exec_SELECTgetRows('uid,title,adminusers,members,reviewers','sys_workspace','pid=0'.t3lib_BEfunc::deleteClause('sys_workspace'),'','title');
-               if (count($workspaces)) {
-                       foreach ($workspaces as $rec)   {
-                               if ($BE_USER->checkWorkspace($rec))     {
-                                       $options[$rec['uid']] = $rec['uid'].': '.$rec['title'];
+               if (t3lib_extMgm::isLoaded('workspaces')) {
+                       $workspaces = $TYPO3_DB->exec_SELECTgetRows('uid,title,adminusers,members,reviewers','sys_workspace','pid=0'.t3lib_BEfunc::deleteClause('sys_workspace'),'','title');
+                       if (count($workspaces)) {
+                               foreach ($workspaces as $rec)   {
+                                       if ($BE_USER->checkWorkspace($rec))     {
+                                               $options[$rec['uid']] = $rec['uid'].': '.$rec['title'];
+                                       }
                                }
                        }
                }
@@ -650,7 +754,7 @@ class SC_alt_shortcut {
                                $options[$value] = '<option value="'.htmlspecialchars($value).'"'.$selected.'>'.htmlspecialchars($label).'</option>';
                        }
                } else {
-                       $options[] = '<option value="-99">'.$LANG->getLL('shortcut_noWSfound',1).'</option>';
+                       $options[] = '<option value="-99">'.$LANG->getLL('bookmark_noWSfound',1).'</option>';
                }
 
                $selector = '';
@@ -660,7 +764,7 @@ class SC_alt_shortcut {
                }
 
                $selector.= '<a href="mod/user/ws/index.php" target="content">'.
-                                       t3lib_iconWorks::getIconImage('sys_workspace',array(),$this->doc->backPath,'align="top"').
+                                       t3lib_iconWorks::getSpriteIconForRecord('sys_workspace', array()).
                                        '</a>';
                if (count($options) > 1) {
                        $selector .= '<select name="_workspaceSelector" onchange="changeWorkspace(this.options[this.selectedIndex].value);">'.implode('',$options).'</select>';
@@ -762,22 +866,14 @@ class SC_alt_shortcut {
        function hasWorkspaceAccess() {
                $MCONF = array();
                include('mod/user/ws/conf.php');
-               return $GLOBALS['BE_USER']->modAccess($MCONF, false);
+               return $GLOBALS['BE_USER']->modAccess(array('name' => 'user', 'access' => 'user,group'), false) && $GLOBALS['BE_USER']->modAccess($MCONF, false);
        }
 }
 
-// Include extension?
-if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['typo3/alt_shortcut.php']) {
-       include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['typo3/alt_shortcut.php']);
-}
-
-
-
-
-
-
-
 
+if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['typo3/alt_shortcut.php'])) {
+       include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['typo3/alt_shortcut.php']);
+}
 
 
 
@@ -788,4 +884,5 @@ $SOBE->preprocess();
 $SOBE->init();
 $SOBE->main();
 $SOBE->printContent();
+
 ?>