[FEATURE] Add support for native date/time fields
[Packages/TYPO3.CMS.git] / t3lib / class.t3lib_userauthgroup.php
index cbd0684..f0d08cb 100644 (file)
 <?php
 /***************************************************************
 <?php
 /***************************************************************
-*  Copyright notice
-*
-*  (c) 1999-2009 Kasper Skaarhoj (kasperYYYY@typo3.com)
-*  All rights reserved
-*
-*  This script is part of the TYPO3 project. The TYPO3 project is
-*  free software; you can redistribute it and/or modify
-*  it under the terms of the GNU General Public License as published by
-*  the Free Software Foundation; either version 2 of the License, or
-*  (at your option) any later version.
-*
-*  The GNU General Public License can be found at
-*  http://www.gnu.org/copyleft/gpl.html.
-*  A copy is found in the textfile GPL.txt and important notices to the license
-*  from the author is found in LICENSE.txt distributed with these scripts.
-*
-*
-*  This script is distributed in the hope that it will be useful,
-*  but WITHOUT ANY WARRANTY; without even the implied warranty of
-*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-*  GNU General Public License for more details.
-*
-*  This copyright notice MUST APPEAR in all copies of the script!
-***************************************************************/
-/**
- * Contains an extension class specifically for authentication/initialization of backend users in TYPO3
- *
- * $Id$
- * Revised for TYPO3 3.6 July/2003 by Kasper Skaarhoj
- *
- * @author     Kasper Skaarhoj <kasperYYYY@typo3.com>
- */
-/**
- * [CLASS/FUNCTION INDEX of SCRIPT]
- *
- *
+ *  Copyright notice
  *
  *
- *  135: class t3lib_userAuthGroup extends t3lib_userAuth
+ *  (c) 1999-2011 Kasper Skårhøj (kasperYYYY@typo3.com)
+ *  All rights reserved
  *
  *
- *              SECTION: Permission checking functions:
- *  199:     function isAdmin()
- *  211:     function isMemberOfGroup($groupId)
- *  233:     function doesUserHaveAccess($row,$perms)
- *  250:     function isInWebMount($id,$readPerms='',$exitOnError=0)
- *  277:     function modAccess($conf,$exitOnError)
- *  328:     function getPagePermsClause($perms)
- *  367:     function calcPerms($row)
- *  405:     function isRTE()
- *  439:     function check($type,$value)
- *  456:     function checkAuthMode($table,$field,$value,$authMode)
- *  522:     function checkLanguageAccess($langValue)
- *  544:     function recordEditAccessInternals($table,$idOrRow,$newRecord=FALSE)
- *  619:     function isPSet($lCP,$table,$type='')
- *  636:     function mayMakeShortcut()
- *  650:     function workspaceCannotEditRecord($table,$recData)
- *  689:     function workspaceCannotEditOfflineVersion($table,$recData)
- *  712:     function workspaceAllowLiveRecordsInPID($pid, $table)
- *  733:     function workspaceCreateNewRecord($pid, $table)
- *  752:     function workspaceAllowAutoCreation($table,$id,$recpid)
- *  772:     function workspaceCheckStageForCurrent($stage)
- *  795:     function workspacePublishAccess($wsid)
- *  823:     function workspaceSwapAccess()
- *  835:     function workspaceVersioningTypeAccess($type)
- *  866:     function workspaceVersioningTypeGetClosest($type)
+ *  This script is part of the TYPO3 project. The TYPO3 project is
+ *  free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
  *
  *
- *              SECTION: Miscellaneous functions
- *  909:     function getTSConfig($objectString,$config='')
- *  935:     function getTSConfigVal($objectString)
- *  947:     function getTSConfigProp($objectString)
- *  959:     function inList($in_list,$item)
- *  970:     function returnWebmounts()
- *  980:     function returnFilemounts()
- *  997:     function jsConfirmation($bitmask)
+ *  The GNU General Public License can be found at
+ *  http://www.gnu.org/copyleft/gpl.html.
+ *  A copy is found in the textfile GPL.txt and important notices to the license
+ *  from the author is found in LICENSE.txt distributed with these scripts.
  *
  *
- *              SECTION: Authentication methods
- * 1035:     function fetchGroupData()
- * 1168:     function fetchGroups($grList,$idList='')
- * 1266:     function setCachedList($cList)
- * 1286:     function addFileMount($title, $altTitle, $path, $webspace, $type)
- * 1333:     function addTScomment($str)
  *
  *
- *              SECTION: Workspaces
- * 1369:     function workspaceInit()
- * 1412:     function checkWorkspace($wsRec,$fields='uid,title,adminusers,members,reviewers,publish_access,stagechg_notification')
- * 1487:     function checkWorkspaceCurrent()
- * 1500:     function setWorkspace($workspaceId)
- * 1528:     function setWorkspacePreview($previewState)
- * 1538:     function getDefaultWorkspace()
+ *  This script is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
  *
  *
- *              SECTION: Logging
- * 1589:     function writelog($type,$action,$error,$details_nr,$details,$data,$tablename='',$recuid='',$recpid='',$event_pid=-1,$NEWid='',$userId=0)
- * 1621:     function simplelog($message, $extKey='', $error=0)
- * 1642:     function checkLogFailures($email, $secondsBack=3600, $max=3)
- *
- * TOTAL FUNCTIONS: 45
- * (This index is automatically created/updated by the extension "extdeveval")
- *
- */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ *  This copyright notice MUST APPEAR in all copies of the script!
+ ***************************************************************/
 
 /**
  * Extension to class.t3lib_userauth.php; Authentication of users in TYPO3 Backend
 
 /**
  * Extension to class.t3lib_userauth.php; Authentication of users in TYPO3 Backend
  * Actually this class is extended again by t3lib_beuserauth which is the actual backend user class that will be instantiated.
  * In fact the two classes t3lib_beuserauth and this class could just as well be one, single class since t3lib_userauthgroup is not - to my knowledge - used separately elsewhere. But for historical reasons they are two separate classes.
  *
  * Actually this class is extended again by t3lib_beuserauth which is the actual backend user class that will be instantiated.
  * In fact the two classes t3lib_beuserauth and this class could just as well be one, single class since t3lib_userauthgroup is not - to my knowledge - used separately elsewhere. But for historical reasons they are two separate classes.
  *
- * @author     Kasper Skaarhoj <kasperYYYY@typo3.com>
+ * @author Kasper Skårhøj <kasperYYYY@typo3.com>
  * @package TYPO3
  * @subpackage t3lib
  * @package TYPO3
  * @subpackage t3lib
+ * @deprecated since 6.0, will be removed in 6.2. The functionality was merged wih t3lib_beUserAuth
  */
  */
-class t3lib_userAuthGroup extends t3lib_userAuth {
-       var $usergroup_column = 'usergroup';            // Should be set to the usergroup-column (id-list) in the user-record
-       var $usergroup_table = 'be_groups';                     // The name of the group-table
-
-               // internal
-       var $groupData = Array(                         // This array holds lists of eg. tables, fields and other values related to the permission-system. See fetchGroupData
-               'filemounts' => Array()                 // Filemounts are loaded here
+abstract class t3lib_userAuthGroup extends t3lib_userAuth {
+               // Should be set to the usergroup-column (id-list) in the user-record
+       var $usergroup_column = 'usergroup';
+               // The name of the group-table
+       var $usergroup_table = 'be_groups';
+
+               // Internal
+               // This array holds lists of eg. tables, fields and other values related to the permission-system. See fetchGroupData
+       var $groupData = array(
+               'filemounts' => array() // Filemounts are loaded here
        );
        );
-       var $workspace = -99;                           // User workspace. -99 is ERROR (none available), -1 is offline, 0 is online, >0 is custom workspaces.
-       var $workspaceRec = array();            // Custom workspace record if any
-
-       var $userGroups = Array();                      // This array will hold the groups that the user is a member of
-       var $userGroupsUID = Array();           // This array holds the uid's of the groups in the listed order
-       var $groupList ='';                                     // This is $this->userGroupsUID imploded to a comma list... Will correspond to the 'usergroup_cached_list'
-       var $dataLists=array(                           // Used internally to accumulate data for the user-group. DONT USE THIS EXTERNALLY! Use $this->groupData instead
-               'webmount_list'=>'',
-               'filemount_list'=>'',
+               // User workspace. -99 is ERROR (none available), -1 is offline, 0 is online, >0 is custom workspaces.
+       var $workspace = -99;
+               // Custom workspace record if any
+       var $workspaceRec = array();
+               // This array will hold the groups that the user is a member of
+       var $userGroups = array();
+               // This array holds the uid's of the groups in the listed order
+       var $userGroupsUID = array();
+               // This is $this->userGroupsUID imploded to a comma list... Will correspond to the 'usergroup_cached_list'
+       var $groupList = '';
+               // Used internally to accumulate data for the user-group. DONT USE THIS EXTERNALLY! Use $this->groupData instead
+       var $dataLists = array(
+               'webmount_list' => '',
+               'filemount_list' => '',
                'fileoper_perms' => 0,
                'fileoper_perms' => 0,
-               'modList'=>'',
-               'tables_select'=>'',
-               'tables_modify'=>'',
-               'pagetypes_select'=>'',
-               'non_exclude_fields'=>'',
-               'explicit_allowdeny'=>'',
+               'modList' => '',
+               'tables_select' => '',
+               'tables_modify' => '',
+               'pagetypes_select' => '',
+               'non_exclude_fields' => '',
+               'explicit_allowdeny' => '',
                'allowed_languages' => '',
                'workspace_perms' => '',
                'custom_options' => '',
        );
                'allowed_languages' => '',
                'workspace_perms' => '',
                'custom_options' => '',
        );
-       var $includeHierarchy=array();          // For debugging/display of order in which subgroups are included.
-       var $includeGroupArray=array();         // List of group_id's in the order they are processed.
-
-       var $OS='';                                                     // Set to 'WIN', if windows
-       var $TSdataArray=array();                       // Used to accumulate the TSconfig data of the user
-       var $userTS_text = '';                          // Contains the non-parsed user TSconfig
-       var $userTS = array();                          // Contains the parsed user TSconfig
-       var $userTSUpdated=0;                           // Set internally if the user TSconfig was parsed and needs to be cached.
-       var $userTS_dontGetCached=0;            // Set this from outside if you want the user TSconfig to ALWAYS be parsed and not fetched from cache.
-
-       var $RTE_errors = array();                      // RTE availability errors collected.
-       var $errorMsg = '';                                     // Contains last error message
-
-       var $checkWorkspaceCurrent_cache=NULL;  // Cache for checkWorkspaceCurrent()
-
-
-
-
-
-
-
+               // For debugging/display of order in which subgroups are included.
+       var $includeHierarchy = array();
+               // List of group_id's in the order they are processed.
+       var $includeGroupArray = array();
+               // Set to 'WIN', if windows
+       var $OS = '';
+               // Used to accumulate the TSconfig data of the user
+       var $TSdataArray = array();
+               // Contains the non-parsed user TSconfig
+       var $userTS_text = '';
+               // Contains the parsed user TSconfig
+       var $userTS = array();
+               // Set internally if the user TSconfig was parsed and needs to be cached.
+       var $userTSUpdated = 0;
+               // Set this from outside if you want the user TSconfig to ALWAYS be parsed and not fetched from cache.
+       var $userTS_dontGetCached = 0;
+               // RTE availability errors collected.
+       var $RTE_errors = array();
+               // Contains last error message
+       var $errorMsg = '';
+               // Cache for checkWorkspaceCurrent()
+       var $checkWorkspaceCurrent_cache = NULL;
 
 
+       /**
+        * @var t3lib_file_Storage[]
+        */
+       protected $fileStorages;
 
 
+       /**
+        * @var array
+        */
+       protected $filePermissions;
 
 
+       /**
+        * Constructor deprecates class.
+        */
+       public function __construct() {
+               t3lib_div::logDeprecatedFunction(
+                       'Class t3lib_userAuthGroup is deprecated and unused since TYPO3 6.0. ' .
+                       'All methods are merged with t3lib_beUserAuth.'
+               );
+       }
 
        /************************************
         *
 
        /************************************
         *
@@ -190,27 +122,27 @@ class t3lib_userAuthGroup extends t3lib_userAuth {
         ************************************/
 
        /**
         ************************************/
 
        /**
-        * Returns true if user is admin
+        * Returns TRUE if user is admin
         * Basically this function evaluates if the ->user[admin] field has bit 0 set. If so, user is admin.
         *
         * Basically this function evaluates if the ->user[admin] field has bit 0 set. If so, user is admin.
         *
-        * @return      boolean
+        * @return boolean
         */
         */
-       function isAdmin()      {
-               return (($this->user['admin']&1) ==1);
+       function isAdmin() {
+               return (($this->user['admin'] & 1) == 1);
        }
 
        /**
        }
 
        /**
-        * Returns true if the current user is a member of group $groupId
+        * Returns TRUE if the current user is a member of group $groupId
         * $groupId must be set. $this->groupList must contain groups
         * $groupId must be set. $this->groupList must contain groups
-        * Will return true also if the user is a member of a group through subgroups.
+        * Will return TRUE also if the user is a member of a group through subgroups.
         *
         *
-        * @param       integer         Group ID to look for in $this->groupList
-        * @return      boolean
+        * @param integer $groupId Group ID to look for in $this->groupList
+        * @return boolean
         */
         */
-       function isMemberOfGroup($groupId)      {
+       function isMemberOfGroup($groupId) {
                $groupId = intval($groupId);
                $groupId = intval($groupId);
-               if ($this->groupList && $groupId)       {
-                       return $this->inList($this->groupList, $groupId);
+               if ($this->groupList && $groupId) {
+                       return t3lib_div::inList($this->groupList, $groupId);
                }
        }
 
                }
        }
 
@@ -219,19 +151,19 @@ class t3lib_userAuthGroup extends t3lib_userAuth {
         *
         * Bits for permissions, see $perms variable:
         *
         *
         * Bits for permissions, see $perms variable:
         *
-        *              1 - Show:       See/Copy page and the pagecontent.
-        *              16- Edit pagecontent: Change/Add/Delete/Move pagecontent.
-        *              2- Edit page: Change/Move the page, eg. change title, startdate, hidden.
-        *              4- Delete page: Delete the page and pagecontent.
-        *              8- New pages: Create new pages under the page.
+        *               1 - Show:      See/Copy page and the pagecontent.
+        *               16- Edit pagecontent: Change/Add/Delete/Move pagecontent.
+        *               2- Edit page: Change/Move the page, eg. change title, startdate, hidden.
+        *               4- Delete page: Delete the page and pagecontent.
+        *               8- New pages: Create new pages under the page.
         *
         *
-        * @param       array           $row is the pagerow for which the permissions is checked
-        * @param       integer         $perms is the binary representation of the permission we are going to check. Every bit in this number represents a permission that must be set. See function explanation.
-        * @return      boolean         True or False upon evaluation
+        * @param array $row Is the pagerow for which the permissions is checked
+        * @param integer $perms Is the binary representation of the permission we are going to check. Every bit in this number represents a permission that must be set. See function explanation.
+        * @return boolean TRUE or False upon evaluation
         */
         */
-       function doesUserHaveAccess($row,$perms)        {
+       function doesUserHaveAccess($row, $perms) {
                $userPerms = $this->calcPerms($row);
                $userPerms = $this->calcPerms($row);
-               return ($userPerms & $perms)==$perms;
+               return ($userPerms & $perms) == $perms;
        }
 
        /**
        }
 
        /**
@@ -241,118 +173,122 @@ class t3lib_userAuthGroup extends t3lib_userAuth {
         * If the user is admin OR if this feature is disabled (fx. by setting TYPO3_CONF_VARS['BE']['lockBeUserToDBmounts']=0) then it returns "1" right away
         * Otherwise the function will return the uid of the webmount which was first found in the rootline of the input page $id
         *
         * If the user is admin OR if this feature is disabled (fx. by setting TYPO3_CONF_VARS['BE']['lockBeUserToDBmounts']=0) then it returns "1" right away
         * Otherwise the function will return the uid of the webmount which was first found in the rootline of the input page $id
         *
-        * @param       integer         Page ID to check
-        * @param       string          Content of "->getPagePermsClause(1)" (read-permissions). If not set, they will be internally calculated (but if you have the correct value right away you can save that database lookup!)
-        * @param       boolean         If set, then the function will exit with an error message.
-        * @return      integer         The page UID of a page in the rootline that matched a mount point
+        * @param integer $id Page ID to check
+        * @param string $readPerms Content of "->getPagePermsClause(1)" (read-permissions). If not set, they will be internally calculated (but if you have the correct value right away you can save that database lookup!)
+        * @param boolean $exitOnError If set, then the function will exit with an error message.
+        * @return integer The page UID of a page in the rootline that matched a mount point
         */
         */
-       function isInWebMount($id,$readPerms='',$exitOnError=0) {
-               if (!$GLOBALS['TYPO3_CONF_VARS']['BE']['lockBeUserToDBmounts'] || $this->isAdmin())     return 1;
+       function isInWebMount($id, $readPerms = '', $exitOnError = 0) {
+               if (!$GLOBALS['TYPO3_CONF_VARS']['BE']['lockBeUserToDBmounts'] || $this->isAdmin()) {
+                       return 1;
+               }
                $id = intval($id);
 
                        // Check if input id is an offline version page in which case we will map id to the online version:
                $id = intval($id);
 
                        // Check if input id is an offline version page in which case we will map id to the online version:
-               $checkRec = t3lib_beFUnc::getRecord('pages',$id,'pid,t3ver_oid');
-               if ($checkRec['pid']==-1)       {
+               $checkRec = t3lib_beFUnc::getRecord('pages', $id, 'pid,t3ver_oid');
+               if ($checkRec['pid'] == -1) {
                        $id = intval($checkRec['t3ver_oid']);
                }
 
                        $id = intval($checkRec['t3ver_oid']);
                }
 
-               if (!$readPerms)        $readPerms = $this->getPagePermsClause(1);
-               if ($id>0)      {
+               if (!$readPerms) {
+                       $readPerms = $this->getPagePermsClause(1);
+               }
+               if ($id > 0) {
                        $wM = $this->returnWebmounts();
                        $wM = $this->returnWebmounts();
-                       $rL = t3lib_BEfunc::BEgetRootLine($id,' AND '.$readPerms);
+                       $rL = t3lib_BEfunc::BEgetRootLine($id, ' AND ' . $readPerms);
 
 
-                       foreach($rL as $v)      {
-                               if ($v['uid'] && in_array($v['uid'],$wM))       {
+                       foreach ($rL as $v) {
+                               if ($v['uid'] && in_array($v['uid'], $wM)) {
                                        return $v['uid'];
                                }
                        }
                }
                                        return $v['uid'];
                                }
                        }
                }
-               if ($exitOnError)       {
-                       t3lib_BEfunc::typo3PrintError ('Access Error','This page is not within your DB-mounts',0);
-                       exit;
+               if ($exitOnError) {
+                       throw new RuntimeException('Access Error: This page is not within your DB-mounts', 1294586445);
                }
        }
 
        /**
         * Checks access to a backend module with the $MCONF passed as first argument
         *
                }
        }
 
        /**
         * Checks access to a backend module with the $MCONF passed as first argument
         *
-        * @param       array           $MCONF array of a backend module!
-        * @param       boolean         If set, an array will issue an error message and exit.
-        * @return      boolean         Will return true if $MCONF['access'] is not set at all, if the BE_USER is admin or if the module is enabled in the be_users/be_groups records of the user (specifically enabled). Will return false if the module name is not even found in $TBE_MODULES
+        * @param array $conf $MCONF array of a backend module!
+        * @param boolean $exitOnError If set, an array will issue an error message and exit.
+        * @return boolean Will return TRUE if $MCONF['access'] is not set at all, if the BE_USER is admin or if the module is enabled in the be_users/be_groups records of the user (specifically enabled). Will return FALSE if the module name is not even found in $TBE_MODULES
         */
         */
-       function modAccess($conf,$exitOnError)  {
-               if (!t3lib_BEfunc::isModuleSetInTBE_MODULES($conf['name']))     {
-                       if ($exitOnError)       {
-                               t3lib_BEfunc::typo3PrintError ('Fatal Error','This module "'.$conf['name'].'" is not enabled in TBE_MODULES',0);
-                               exit;
+       function modAccess($conf, $exitOnError) {
+               if (!t3lib_BEfunc::isModuleSetInTBE_MODULES($conf['name'])) {
+                       if ($exitOnError) {
+                               throw new RuntimeException('Fatal Error: This module "' . $conf['name'] . '" is not enabled in TBE_MODULES', 1294586446);
                        }
                        return FALSE;
                }
 
                        // Workspaces check:
                        }
                        return FALSE;
                }
 
                        // Workspaces check:
-               if ($conf['workspaces'])        {
-                       if (($this->workspace===0 && t3lib_div::inList($conf['workspaces'],'online')) ||
-                               ($this->workspace===-1 && t3lib_div::inList($conf['workspaces'],'offline')) ||
-                               ($this->workspace>0 && t3lib_div::inList($conf['workspaces'],'custom')))        {
-                                       // ok, go on...
+               if (t3lib_extMgm::isLoaded('workspaces') && $conf['workspaces']) {
+                       if (($this->workspace === 0 && t3lib_div::inList($conf['workspaces'], 'online')) ||
+                               ($this->workspace === -1 && t3lib_div::inList($conf['workspaces'], 'offline')) ||
+                               ($this->workspace > 0 && t3lib_div::inList($conf['workspaces'], 'custom'))) {
+                               // ok, go on...
                        } else {
                        } else {
-                               if ($exitOnError)       {
-                                       t3lib_BEfunc::typo3PrintError ('Workspace Error','This module "'.$conf['name'].'" is not available under the current workspace',0);
-                                       exit;
+                               if ($exitOnError) {
+                                       throw new RuntimeException('Workspace Error: This module "' . $conf['name'] . '" is not available under the current workspace', 1294586447);
                                }
                                return FALSE;
                        }
                }
 
                                }
                                return FALSE;
                        }
                }
 
-                       // Returns true if conf[access] is not set at all or if the user is admin
-               if (!$conf['access']  ||  $this->isAdmin()) return TRUE;
+                       // Returns TRUE if conf[access] is not set at all or if the user is admin
+               if (!$conf['access'] || $this->isAdmin()) {
+                       return TRUE;
+               }
 
 
-                       // If $conf['access'] is set but not with 'admin' then we return true, if the module is found in the modList
-               if (!strstr($conf['access'],'admin') && $conf['name'])  {
-                       $acs = $this->check('modules',$conf['name']);
+                       // If $conf['access'] is set but not with 'admin' then we return TRUE, if the module is found in the modList
+               if (!strstr($conf['access'], 'admin') && $conf['name']) {
+                       $acs = $this->check('modules', $conf['name']);
+               }
+               if (!$acs && $exitOnError) {
+                       throw new RuntimeException('Access Error: You don\'t have access to this module.', 1294586448);
+               } else {
+                       return $acs;
                }
                }
-               if (!$acs && $exitOnError)      {
-                       t3lib_BEfunc::typo3PrintError ('Access Error','You don\'t have access to this module.',0);
-                       exit;
-               } else return $acs;
        }
 
        /**
         * Returns a WHERE-clause for the pages-table where user permissions according to input argument, $perms, is validated.
         * $perms is the "mask" used to select. Fx. if $perms is 1 then you'll get all pages that a user can actually see!
        }
 
        /**
         * Returns a WHERE-clause for the pages-table where user permissions according to input argument, $perms, is validated.
         * $perms is the "mask" used to select. Fx. if $perms is 1 then you'll get all pages that a user can actually see!
-        *              2^0 = show (1)
-        *              2^1 = edit (2)
-        *              2^2 = delete (4)
-        *              2^3 = new (8)
+        *                2^0 = show (1)
+        *               2^1 = edit (2)
+        *               2^2 = delete (4)
+        *               2^3 = new (8)
         * If the user is 'admin' " 1=1" is returned (no effect)
         * If the user is not set at all (->user is not an array), then " 1=0" is returned (will cause no selection results at all)
         * The 95% use of this function is "->getPagePermsClause(1)" which will return WHERE clauses for *selecting* pages in backend listings - in other words this will check read permissions.
         *
         * If the user is 'admin' " 1=1" is returned (no effect)
         * If the user is not set at all (->user is not an array), then " 1=0" is returned (will cause no selection results at all)
         * The 95% use of this function is "->getPagePermsClause(1)" which will return WHERE clauses for *selecting* pages in backend listings - in other words this will check read permissions.
         *
-        * @param       integer         Permission mask to use, see function description
-        * @return      string          Part of where clause. Prefix " AND " to this.
+        * @param integer $perms Permission mask to use, see function description
+        * @return string Part of where clause. Prefix " AND " to this.
         */
         */
-       function getPagePermsClause($perms)     {
-               global $TYPO3_CONF_VARS;
-               if (is_array($this->user))      {
-                       if ($this->isAdmin())   {
+       function getPagePermsClause($perms) {
+               if (is_array($this->user)) {
+                       if ($this->isAdmin()) {
                                return ' 1=1';
                        }
 
                                return ' 1=1';
                        }
 
-                       $perms = intval($perms);        // Make sure it's integer.
-                       $str= ' ('.
-                               '(pages.perms_everybody & '.$perms.' = '.$perms.')'.    // Everybody
-                               ' OR (pages.perms_userid = '.$this->user['uid'].' AND pages.perms_user & '.$perms.' = '.$perms.')';     // User
-                       if ($this->groupList)   {
-                               $str.= ' OR (pages.perms_groupid in ('.$this->groupList.') AND pages.perms_group & '.$perms.' = '.$perms.')';   // Group (if any is set)
+                       $perms = intval($perms); // Make sure it's integer.
+                       $str = ' (' .
+                               '(pages.perms_everybody & ' . $perms . ' = ' . $perms . ')' . // Everybody
+                               ' OR (pages.perms_userid = ' . $this->user['uid'] . ' AND pages.perms_user & ' . $perms . ' = ' . $perms . ')'; // User
+                       if ($this->groupList) {
+                                       // Group (if any is set)
+                               $str .= ' OR (pages.perms_groupid in (' . $this->groupList . ') AND pages.perms_group & ' . $perms . ' = ' . $perms . ')';
                        }
                        }
-                       $str.=')';
+                       $str .= ')';
 
 
-                       // ****************
-                       // getPagePermsClause-HOOK
-                       // ****************
-                       if (is_array($TYPO3_CONF_VARS['SC_OPTIONS']['t3lib/class.t3lib_userauthgroup.php']['getPagePermsClause'])) {
+                               // ****************
+                               // getPagePermsClause-HOOK
+                               // ****************
+                       if (is_array($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_userauthgroup.php']['getPagePermsClause'])) {
 
 
-                               foreach($TYPO3_CONF_VARS['SC_OPTIONS']['t3lib/class.t3lib_userauthgroup.php']['getPagePermsClause'] as $_funcRef) {
+                               foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_userauthgroup.php']['getPagePermsClause'] as $_funcRef) {
                                        $_params = array('currentClause' => $str, 'perms' => $perms);
                                        $str = t3lib_div::callUserFunction($_funcRef, $_params, $this);
                                }
                                        $_params = array('currentClause' => $str, 'perms' => $perms);
                                        $str = t3lib_div::callUserFunction($_funcRef, $_params, $this);
                                }
@@ -369,29 +305,32 @@ class t3lib_userAuthGroup extends t3lib_userAuth {
         * The perms for user, group and everybody is OR'ed together (provided that the page-owner is the user and for the groups that the user is a member of the group
         * If the user is admin, 31 is returned (full permissions for all five flags)
         *
         * The perms for user, group and everybody is OR'ed together (provided that the page-owner is the user and for the groups that the user is a member of the group
         * If the user is admin, 31 is returned (full permissions for all five flags)
         *
-        * @param       array           Input page row with all perms_* fields available.
-        * @return      integer         Bitwise representation of the users permissions in relation to input page row, $row
+        * @param array $row Input page row with all perms_* fields available.
+        * @return integer Bitwise representation of the users permissions in relation to input page row, $row
         */
         */
-       function calcPerms($row)        {
-               global $TYPO3_CONF_VARS;
-               if ($this->isAdmin()) {return 31;}              // Return 31 for admin users.
-
-               $out=0;
-               if (isset($row['perms_userid']) && isset($row['perms_user']) && isset($row['perms_groupid']) && isset($row['perms_group']) && isset($row['perms_everybody']) && isset($this->groupList))        {
-                       if ($this->user['uid']==$row['perms_userid'])   {
-                               $out|=$row['perms_user'];
+       function calcPerms($row) {
+                       // Return 31 for admin users.
+
+               if ($this->isAdmin()) {
+                       return 31;
+               }
+
+               $out = 0;
+               if (isset($row['perms_userid']) && isset($row['perms_user']) && isset($row['perms_groupid']) && isset($row['perms_group']) && isset($row['perms_everybody']) && isset($this->groupList)) {
+                       if ($this->user['uid'] == $row['perms_userid']) {
+                               $out |= $row['perms_user'];
                        }
                        }
-                       if ($this->isMemberOfGroup($row['perms_groupid']))      {
-                               $out|=$row['perms_group'];
+                       if ($this->isMemberOfGroup($row['perms_groupid'])) {
+                               $out |= $row['perms_group'];
                        }
                        }
-                       $out|=$row['perms_everybody'];
+                       $out |= $row['perms_everybody'];
                }
 
                }
 
-               // ****************
-               // CALCPERMS hook
-               // ****************
-               if (is_array($TYPO3_CONF_VARS['SC_OPTIONS']['t3lib/class.t3lib_userauthgroup.php']['calcPerms'])) {
-                       foreach($TYPO3_CONF_VARS['SC_OPTIONS']['t3lib/class.t3lib_userauthgroup.php']['calcPerms'] as $_funcRef) {
+                       // ****************
+                       // CALCPERMS hook
+                       // ****************
+               if (is_array($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_userauthgroup.php']['calcPerms'])) {
+                       foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_userauthgroup.php']['calcPerms'] as $_funcRef) {
                                $_params = array(
                                        'row' => $row,
                                        'outputPermissions' => $out
                                $_params = array(
                                        'row' => $row,
                                        'outputPermissions' => $out
@@ -404,30 +343,29 @@ class t3lib_userAuthGroup extends t3lib_userAuth {
        }
 
        /**
        }
 
        /**
-        * Returns true if the RTE (Rich Text Editor) can be enabled for the user
+        * Returns TRUE if the RTE (Rich Text Editor) can be enabled for the user
         * Strictly this is not permissions being checked but rather a series of settings like a loaded extension, browser/client type and a configuration option in ->uc[edit_RTE]
         * The reasons for a FALSE return can be found in $this->RTE_errors
         *
         * Strictly this is not permissions being checked but rather a series of settings like a loaded extension, browser/client type and a configuration option in ->uc[edit_RTE]
         * The reasons for a FALSE return can be found in $this->RTE_errors
         *
-        * @return      boolean
+        * @return boolean
         */
         */
-       function isRTE()        {
-               global $CLIENT;
-
+       function isRTE() {
                        // Start:
                $this->RTE_errors = array();
                        // Start:
                $this->RTE_errors = array();
-               if (!$this->uc['edit_RTE'])
+               if (!$this->uc['edit_RTE']) {
                        $this->RTE_errors[] = 'RTE is not enabled for user!';
                        $this->RTE_errors[] = 'RTE is not enabled for user!';
-               if (!$GLOBALS['TYPO3_CONF_VARS']['BE']['RTEenabled'])
+               }
+               if (!$GLOBALS['TYPO3_CONF_VARS']['BE']['RTEenabled']) {
                        $this->RTE_errors[] = 'RTE is not enabled in $TYPO3_CONF_VARS["BE"]["RTEenabled"]';
                        $this->RTE_errors[] = 'RTE is not enabled in $TYPO3_CONF_VARS["BE"]["RTEenabled"]';
-
+               }
 
                        // Acquire RTE object:
                $RTE = t3lib_BEfunc::RTEgetObj();
 
                        // Acquire RTE object:
                $RTE = t3lib_BEfunc::RTEgetObj();
-               if (!is_object($RTE))   {
+               if (!is_object($RTE)) {
                        $this->RTE_errors = array_merge($this->RTE_errors, $RTE);
                }
 
                        $this->RTE_errors = array_merge($this->RTE_errors, $RTE);
                }
 
-               if (!count($this->RTE_errors))  {
+               if (!count($this->RTE_errors)) {
                        return TRUE;
                } else {
                        return FALSE;
                        return TRUE;
                } else {
                        return FALSE;
@@ -435,82 +373,86 @@ class t3lib_userAuthGroup extends t3lib_userAuth {
        }
 
        /**
        }
 
        /**
-        * Returns true if the $value is found in the list in a $this->groupData[] index pointed to by $type (array key).
+        * Returns TRUE if the $value is found in the list in a $this->groupData[] index pointed to by $type (array key).
         * Can thus be users to check for modules, exclude-fields, select/modify permissions for tables etc.
         * Can thus be users to check for modules, exclude-fields, select/modify permissions for tables etc.
-        * If user is admin true is also returned
+        * If user is admin TRUE is also returned
         * Please see the document Inside TYPO3 for examples.
         *
         * Please see the document Inside TYPO3 for examples.
         *
-        * @param       string          The type value; "webmounts", "filemounts", "pagetypes_select", "tables_select", "tables_modify", "non_exclude_fields", "modules"
-        * @param       string          String to search for in the groupData-list
-        * @return      boolean         True if permission is granted (that is, the value was found in the groupData list - or the BE_USER is "admin")
+        * @param string $type The type value; "webmounts", "filemounts", "pagetypes_select", "tables_select", "tables_modify", "non_exclude_fields", "modules"
+        * @param string $value String to search for in the groupData-list
+        * @return boolean TRUE if permission is granted (that is, the value was found in the groupData list - or the BE_USER is "admin")
         */
         */
-       function check($type,$value)    {
-               if (isset($this->groupData[$type]))     {
-                       if ($this->isAdmin() || $this->inList($this->groupData[$type],$value)) {
-                               return 1;
+       function check($type, $value) {
+               if (isset($this->groupData[$type])) {
+                       if ($this->isAdmin() || t3lib_div::inList($this->groupData[$type], $value)) {
+                               return TRUE;
                        }
                }
                        }
                }
+               return FALSE;
        }
 
        /**
         * Checking the authMode of a select field with authMode set
         *
        }
 
        /**
         * Checking the authMode of a select field with authMode set
         *
-        * @param       string          Table name
-        * @param       string          Field name (must be configured in TCA and of type "select" with authMode set!)
-        * @param       string          Value to evaluation (single value, must not contain any of the chars ":,|")
-        * @param       string          Auth mode keyword (explicitAllow, explicitDeny, individual)
-        * @return      boolean         True or false whether access is granted or not.
+        * @param string $table Table name
+        * @param string $field Field name (must be configured in TCA and of type "select" with authMode set!)
+        * @param string $value Value to evaluation (single value, must not contain any of the chars ":,|")
+        * @param string $authMode Auth mode keyword (explicitAllow, explicitDeny, individual)
+        * @return boolean TRUE or FALSE whether access is granted or not.
         */
         */
-       function checkAuthMode($table,$field,$value,$authMode)  {
-               global $TCA;
+       function checkAuthMode($table, $field, $value, $authMode) {
 
                        // Admin users can do anything:
 
                        // Admin users can do anything:
-               if ($this->isAdmin())   return TRUE;
+               if ($this->isAdmin()) {
+                       return TRUE;
+               }
 
                        // Allow all blank values:
 
                        // Allow all blank values:
-               if (!strcmp($value,'')) return TRUE;
+               if (!strcmp($value, '')) {
+                       return TRUE;
+               }
 
                        // Certain characters are not allowed in the value
 
                        // Certain characters are not allowed in the value
-               if (preg_match('/[:|,]/',$value))       {
+               if (preg_match('/[:|,]/', $value)) {
                        return FALSE;
                }
 
                        // Initialize:
                        return FALSE;
                }
 
                        // Initialize:
-               $testValue = $table.':'.$field.':'.$value;
+               $testValue = $table . ':' . $field . ':' . $value;
                $out = TRUE;
 
                        // Checking value:
                $out = TRUE;
 
                        // Checking value:
-               switch((string)$authMode)       {
+               switch ((string) $authMode) {
                        case 'explicitAllow':
                        case 'explicitAllow':
-                               if (!$this->inList($this->groupData['explicit_allowdeny'],$testValue.':ALLOW')) {
+                               if (!t3lib_div::inList($this->groupData['explicit_allowdeny'], $testValue . ':ALLOW')) {
                                        $out = FALSE;
                                }
                        break;
                        case 'explicitDeny':
                                        $out = FALSE;
                                }
                        break;
                        case 'explicitDeny':
-                               if ($this->inList($this->groupData['explicit_allowdeny'],$testValue.':DENY'))   {
+                               if (t3lib_div::inList($this->groupData['explicit_allowdeny'], $testValue . ':DENY')) {
                                        $out = FALSE;
                                }
                        break;
                        case 'individual':
                                t3lib_div::loadTCA($table);
                                        $out = FALSE;
                                }
                        break;
                        case 'individual':
                                t3lib_div::loadTCA($table);
-                               if (is_array($TCA[$table]) && is_array($TCA[$table]['columns'][$field]))        {
-                                       $items = $TCA[$table]['columns'][$field]['config']['items'];
-                                       if (is_array($items))   {
-                                               foreach($items as $iCfg)        {
-                                                       if (!strcmp($iCfg[1],$value) && $iCfg[4])       {
-                                                               switch((string)$iCfg[4])        {
+                               if (is_array($GLOBALS['TCA'][$table]) && is_array($GLOBALS['TCA'][$table]['columns'][$field])) {
+                                       $items = $GLOBALS['TCA'][$table]['columns'][$field]['config']['items'];
+                                       if (is_array($items)) {
+                                               foreach ($items as $iCfg) {
+                                                       if (!strcmp($iCfg[1], $value) && $iCfg[4]) {
+                                                               switch ((string) $iCfg[4]) {
                                                                        case 'EXPL_ALLOW':
                                                                        case 'EXPL_ALLOW':
-                                                                               if (!$this->inList($this->groupData['explicit_allowdeny'],$testValue.':ALLOW')) {
+                                                                               if (!t3lib_div::inList($this->groupData['explicit_allowdeny'], $testValue . ':ALLOW')) {
                                                                                        $out = FALSE;
                                                                                }
                                                                        break;
                                                                        case 'EXPL_DENY':
                                                                                        $out = FALSE;
                                                                                }
                                                                        break;
                                                                        case 'EXPL_DENY':
-                                                                               if ($this->inList($this->groupData['explicit_allowdeny'],$testValue.':DENY'))   {
+                                                                               if (t3lib_div::inList($this->groupData['explicit_allowdeny'], $testValue . ':DENY')) {
                                                                                        $out = FALSE;
                                                                                }
                                                                        break;
                                                                }
                                                                                        $out = FALSE;
                                                                                }
                                                                        break;
                                                                }
-                                                               break;
+                                                       break;
                                                        }
                                                }
                                        }
                                                        }
                                                }
                                        }
@@ -524,13 +466,15 @@ class t3lib_userAuthGroup extends t3lib_userAuth {
        /**
         * Checking if a language value (-1, 0 and >0 for sys_language records) is allowed to be edited by the user.
         *
        /**
         * Checking if a language value (-1, 0 and >0 for sys_language records) is allowed to be edited by the user.
         *
-        * @param       integer         Language value to evaluate
-        * @return      boolean         Returns true if the language value is allowed, otherwise false.
+        * @param integer $langValue Language value to evaluate
+        * @return boolean Returns TRUE if the language value is allowed, otherwise FALSE.
         */
         */
-       function checkLanguageAccess($langValue)        {
-               if (strcmp(trim($this->groupData['allowed_languages']),''))     {       // The users language list must be non-blank - otherwise all languages are allowed.
+       function checkLanguageAccess($langValue) {
+                       // The users language list must be non-blank - otherwise all languages are allowed.
+               if (strcmp(trim($this->groupData['allowed_languages']), '')) {
                        $langValue = intval($langValue);
                        $langValue = intval($langValue);
-                       if ($langValue != -1 && !$this->check('allowed_languages',$langValue))  {       // Language must either be explicitly allowed OR the lang Value be "-1" (all languages)
+                               // Language must either be explicitly allowed OR the lang Value be "-1" (all languages)
+                       if ($langValue != -1 && !$this->check('allowed_languages', $langValue)) {
                                return FALSE;
                        }
                }
                                return FALSE;
                        }
                }
@@ -540,20 +484,33 @@ class t3lib_userAuthGroup extends t3lib_userAuth {
        /**
         * Check if user has access to all existing localizations for a certain record
         *
        /**
         * Check if user has access to all existing localizations for a certain record
         *
-        * @param string        the table
-        * @param array         the current record
+        * @param string $table The table
+        * @param array $record The current record
         * @return boolean
         */
        function checkFullLanguagesAccess($table, $record) {
                $recordLocalizationAccess = $this->checkLanguageAccess(0);
         * @return boolean
         */
        function checkFullLanguagesAccess($table, $record) {
                $recordLocalizationAccess = $this->checkLanguageAccess(0);
-               if ($recordLocalizationAccess && t3lib_BEfunc::isTableLocalizable($table)) {
-
-                       $pointerField = $GLOBALS['TCA'][$table]['ctrl']['transOrigPointerField'];
+               if ($recordLocalizationAccess
+                       && (
+                                               t3lib_BEfunc::isTableLocalizable($table)
+                                               || isset($GLOBALS['TCA'][$table]['ctrl']['transForeignTable'])
+                               )
+               ) {
+
+                       if (isset($GLOBALS['TCA'][$table]['ctrl']['transForeignTable'])) {
+                               $l10nTable = $GLOBALS['TCA'][$table]['ctrl']['transForeignTable'];
+                               $pointerField = $GLOBALS['TCA'][$l10nTable]['ctrl']['transOrigPointerField'];
+                               $pointerValue = $record['uid'];
+                       } else {
+                               $l10nTable = $table;
+                               $pointerField = $GLOBALS['TCA'][$l10nTable]['ctrl']['transOrigPointerField'];
+                               $pointerValue = $record[$pointerField] > 0 ? $record[$pointerField] : $record['uid'];
+                       }
 
                        $recordLocalizations = t3lib_BEfunc::getRecordsByField(
 
                        $recordLocalizations = t3lib_BEfunc::getRecordsByField(
-                               $table,
+                               $l10nTable,
                                $pointerField,
                                $pointerField,
-                               $record[$pointerField] > 0 ? $record[$pointerField] : $record['uid'],
+                               $pointerValue,
                                '',
                                '',
                                '',
                                '',
                                '',
                                '',
@@ -561,8 +518,9 @@ class t3lib_userAuthGroup extends t3lib_userAuth {
                        );
 
                        if (is_array($recordLocalizations)) {
                        );
 
                        if (is_array($recordLocalizations)) {
-                               foreach($recordLocalizations as $localization) {
-                                       $recordLocalizationAccess = $recordLocalizationAccess && $this->checkLanguageAccess($localization[$GLOBALS['TCA'][$table]['ctrl']['languageField']]);
+                               foreach ($recordLocalizations as $localization) {
+                                       $recordLocalizationAccess = $recordLocalizationAccess
+                                                                                               && $this->checkLanguageAccess($localization[$GLOBALS['TCA'][$l10nTable]['ctrl']['languageField']]);
                                        if (!$recordLocalizationAccess) {
                                                break;
                                        }
                                        if (!$recordLocalizationAccess) {
                                                break;
                                        }
@@ -574,64 +532,69 @@ class t3lib_userAuthGroup extends t3lib_userAuth {
        }
 
        /**
        }
 
        /**
-        * Checking if a user has editing access to a record from a $TCA table.
+        * Checking if a user has editing access to a record from a $GLOBALS['TCA'] table.
         * The checks does not take page permissions and other "environmental" things into account. It only deal with record internals; If any values in the record fields disallows it.
         * For instance languages settings, authMode selector boxes are evaluated (and maybe more in the future).
         * It will check for workspace dependent access.
         * The function takes an ID (integer) or row (array) as second argument.
         *
         * The checks does not take page permissions and other "environmental" things into account. It only deal with record internals; If any values in the record fields disallows it.
         * For instance languages settings, authMode selector boxes are evaluated (and maybe more in the future).
         * It will check for workspace dependent access.
         * The function takes an ID (integer) or row (array) as second argument.
         *
-        * @param       string          Table name
-        * @param       mixed           If integer, then this is the ID of the record. If Array this just represents fields in the record.
-        * @param       boolean         Set, if testing a new (non-existing) record array. Will disable certain checks that doesn't make much sense in that context.
-        * @param       boolean         Set, if testing a deleted record array.
-        * @param       boolean         Set, whenever access to all translations of the record is required
-        * @return      boolean         True if OK, otherwise false
+        * @param string $table Table name
+        * @param mixed $idOrRow If integer, then this is the ID of the record. If Array this just represents fields in the record.
+        * @param boolean $newRecord Set, if testing a new (non-existing) record array. Will disable certain checks that doesn't make much sense in that context.
+        * @param boolean $deletedRecord Set, if testing a deleted record array.
+        * @param boolean $checkFullLanguageAccess Set, whenever access to all translations of the record is required
+        * @return boolean TRUE if OK, otherwise FALSE
         */
        function recordEditAccessInternals($table, $idOrRow, $newRecord = FALSE, $deletedRecord = FALSE, $checkFullLanguageAccess = FALSE) {
         */
        function recordEditAccessInternals($table, $idOrRow, $newRecord = FALSE, $deletedRecord = FALSE, $checkFullLanguageAccess = FALSE) {
-               global $TCA;
-
-               if (isset($TCA[$table]))        {
+               if (isset($GLOBALS['TCA'][$table])) {
                        t3lib_div::loadTCA($table);
 
                        t3lib_div::loadTCA($table);
 
-                               // Always return true for Admin users.
-                       if ($this->isAdmin())   return TRUE;
+                               // Always return TRUE for Admin users.
+                       if ($this->isAdmin()) {
+                               return TRUE;
+                       }
 
                                // Fetching the record if the $idOrRow variable was not an array on input:
 
                                // Fetching the record if the $idOrRow variable was not an array on input:
-                       if (!is_array($idOrRow))        {
+                       if (!is_array($idOrRow)) {
                                if ($deletedRecord) {
                                        $idOrRow = t3lib_BEfunc::getRecord($table, $idOrRow, '*', '', FALSE);
                                } else {
                                        $idOrRow = t3lib_BEfunc::getRecord($table, $idOrRow);
                                }
                                if ($deletedRecord) {
                                        $idOrRow = t3lib_BEfunc::getRecord($table, $idOrRow, '*', '', FALSE);
                                } else {
                                        $idOrRow = t3lib_BEfunc::getRecord($table, $idOrRow);
                                }
-                               if (!is_array($idOrRow))        {
+                               if (!is_array($idOrRow)) {
                                        $this->errorMsg = 'ERROR: Record could not be fetched.';
                                        return FALSE;
                                }
                        }
 
                                // Checking languages:
                                        $this->errorMsg = 'ERROR: Record could not be fetched.';
                                        return FALSE;
                                }
                        }
 
                                // Checking languages:
-                       if ($TCA[$table]['ctrl']['languageField'])      {
-                               if (isset($idOrRow[$TCA[$table]['ctrl']['languageField']]))     {       // Language field must be found in input row - otherwise it does not make sense.
-                                       if (!$this->checkLanguageAccess($idOrRow[$TCA[$table]['ctrl']['languageField']]))       {
+                       if ($GLOBALS['TCA'][$table]['ctrl']['languageField']) {
+                                       // Language field must be found in input row - otherwise it does not make sense.
+                               if (isset($idOrRow[$GLOBALS['TCA'][$table]['ctrl']['languageField']])) {
+                                       if (!$this->checkLanguageAccess($idOrRow[$GLOBALS['TCA'][$table]['ctrl']['languageField']])) {
                                                $this->errorMsg = 'ERROR: Language was not allowed.';
                                                return FALSE;
                                                $this->errorMsg = 'ERROR: Language was not allowed.';
                                                return FALSE;
-                                       } elseif ($checkFullLanguageAccess && !$this->checkFullLanguagesAccess($table, $idOrRow)) {
+                                       } elseif ($checkFullLanguageAccess && $idOrRow[$GLOBALS['TCA'][$table]['ctrl']['languageField']] == 0 && !$this->checkFullLanguagesAccess($table, $idOrRow)) {
                                                $this->errorMsg = 'ERROR: Related/affected language was not allowed.';
                                                return FALSE;
                                        }
                                } else {
                                                $this->errorMsg = 'ERROR: Related/affected language was not allowed.';
                                                return FALSE;
                                        }
                                } else {
-                                       $this->errorMsg = 'ERROR: The "languageField" field named "'.$TCA[$table]['ctrl']['languageField'].'" was not found in testing record!';
+                                       $this->errorMsg = 'ERROR: The "languageField" field named "' .
+                                               $GLOBALS['TCA'][$table]['ctrl']['languageField'] .
+                                               '" was not found in testing record!';
                                        return FALSE;
                                }
                                        return FALSE;
                                }
+                       } elseif (isset($GLOBALS['TCA'][$table]['ctrl']['transForeignTable']) && $checkFullLanguageAccess && !$this->checkFullLanguagesAccess($table, $idOrRow)) {
+                               return FALSE;
                        }
 
                                // Checking authMode fields:
                        }
 
                                // Checking authMode fields:
-                       if (is_array($TCA[$table]['columns']))  {
-                               foreach($TCA[$table]['columns'] as $fN => $fV)  {
-                                       if (isset($idOrRow[$fN]))       {       //
-                                               if ($fV['config']['type']=='select' && $fV['config']['authMode'] && !strcmp($fV['config']['authMode_enforce'],'strict')) {
-                                                       if (!$this->checkAuthMode($table,$fN,$idOrRow[$fN],$fV['config']['authMode']))  {
-                                                               $this->errorMsg = 'ERROR: authMode "'.$fV['config']['authMode'].'" failed for field "'.$fN.'" with value "'.$idOrRow[$fN].'" evaluated';
+                       if (is_array($GLOBALS['TCA'][$table]['columns'])) {
+                               foreach ($GLOBALS['TCA'][$table]['columns'] as $fieldName => $fieldValue) {
+                                       if (isset($idOrRow[$fieldName])) {
+                                               if ($fieldValue['config']['type'] == 'select' && $fieldValue['config']['authMode'] && !strcmp($fieldValue['config']['authMode_enforce'], 'strict')) {
+                                                       if (!$this->checkAuthMode($table, $fieldName, $idOrRow[$fieldName], $fieldValue['config']['authMode'])) {
+                                                               $this->errorMsg = 'ERROR: authMode "' . $fieldValue['config']['authMode'] . '" failed for field "' . $fieldName . '" with value "' . $idOrRow[$fieldName] . '" evaluated';
                                                                return FALSE;
                                                        }
                                                }
                                                                return FALSE;
                                                        }
                                                }
@@ -640,24 +603,26 @@ class t3lib_userAuthGroup extends t3lib_userAuth {
                        }
 
                                // Checking "editlock" feature (doesn't apply to new records)
                        }
 
                                // Checking "editlock" feature (doesn't apply to new records)
-                       if (!$newRecord && $TCA[$table]['ctrl']['editlock'])    {
-                               if (isset($idOrRow[$TCA[$table]['ctrl']['editlock']]))  {
-                                       if ($idOrRow[$TCA[$table]['ctrl']['editlock']]) {
+                       if (!$newRecord && $GLOBALS['TCA'][$table]['ctrl']['editlock']) {
+                               if (isset($idOrRow[$GLOBALS['TCA'][$table]['ctrl']['editlock']])) {
+                                       if ($idOrRow[$GLOBALS['TCA'][$table]['ctrl']['editlock']]) {
                                                $this->errorMsg = 'ERROR: Record was locked for editing. Only admin users can change this state.';
                                                return FALSE;
                                        }
                                } else {
                                                $this->errorMsg = 'ERROR: Record was locked for editing. Only admin users can change this state.';
                                                return FALSE;
                                        }
                                } else {
-                                       $this->errorMsg = 'ERROR: The "editLock" field named "'.$TCA[$table]['ctrl']['editlock'].'" was not found in testing record!';
+                                       $this->errorMsg = 'ERROR: The "editLock" field named "' .
+                                               $GLOBALS['TCA'][$table]['ctrl']['editlock'] .
+                                               '" was not found in testing record!';
                                        return FALSE;
                                }
                        }
 
                                // Checking record permissions
                                        return FALSE;
                                }
                        }
 
                                // Checking record permissions
-                       // THIS is where we can include a check for "perms_" fields for other records than pages...
+                               // THIS is where we can include a check for "perms_" fields for other records than pages...
 
                                // Process any hooks
 
                                // Process any hooks
-                       if (is_array($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_userauthgroup.php']['recordEditAccessInternals']))    {
-                               foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_userauthgroup.php']['recordEditAccessInternals'] as $funcRef)     {
+                       if (is_array($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_userauthgroup.php']['recordEditAccessInternals'])) {
+                               foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_userauthgroup.php']['recordEditAccessInternals'] as $funcRef) {
                                        $params = array(
                                                'table' => $table,
                                                'idOrRow' => $idOrRow,
                                        $params = array(
                                                'table' => $table,
                                                'idOrRow' => $idOrRow,
@@ -669,114 +634,133 @@ class t3lib_userAuthGroup extends t3lib_userAuth {
                                }
                        }
 
                                }
                        }
 
-                               // Finally, return true if all is well.
+                               // Finally, return TRUE if all is well.
                        return TRUE;
                }
        }
 
        /**
                        return TRUE;
                }
        }
 
        /**
-        * Will check a type of permission against the compiled permission integer, $lCP, and in relation to table, $table
+        * Checks a type of permission against the compiled permission integer, $compiledPermissions, and in relation to table, $tableName
         *
         *
-        * @param       integer         $lCP could typically be the "compiled permissions" integer returned by ->calcPerms
-        * @param       string          $table is the tablename to check: If "pages" table then edit,new,delete and editcontent permissions can be checked. Other tables will be checked for "editcontent" only (and $type will be ignored)
-        * @param       string          For $table='pages' this can be 'edit' (2), 'new' (8 or 16), 'delete' (4), 'editcontent' (16). For all other tables this is ignored. (16 is used)
-        * @return      boolean
-        * @access private
+        * @param integer $compiledPermissions Could typically be the "compiled permissions" integer returned by ->calcPerms
+        * @param string $tableName Is the tablename to check: If "pages" table then edit,new,delete and editcontent permissions can be checked. Other tables will be checked for "editcontent" only (and $type will be ignored)
+        * @param string $actionType For $tableName='pages' this can be 'edit' (2), 'new' (8 or 16), 'delete' (4), 'editcontent' (16). For all other tables this is ignored. (16 is used)
+        * @return boolean
+        * @access public (used by typo3/alt_clickmenu.php)
         */
         */
-       function isPSet($lCP,$table,$type='')   {
-               if ($this->isAdmin())   return true;
-               if ($table=='pages')    {
-                       if ($type=='edit')      return $lCP & 2;
-                       if ($type=='new')       return ($lCP & 8) || ($lCP & 16);       // Create new page OR pagecontent
-                       if ($type=='delete')    return $lCP & 4;
-                       if ($type=='editcontent')       return $lCP & 16;
+       public function isPSet($compiledPermissions, $tableName, $actionType = '') {
+               if ($this->isAdmin()) {
+                       $result = TRUE;
+               }
+               elseif ($tableName == 'pages') {
+                       switch ($actionType) {
+                               case 'edit':
+                                       $result = ($compiledPermissions & 2) !== 0;
+                               break;
+                               case 'new':
+                                               // Create new page OR page content
+                                       $result = ($compiledPermissions & (8 + 16)) !== 0;
+                               break;
+                               case 'delete':
+                                       $result = ($compiledPermissions & 4) !== 0;
+                               break;
+                               case 'editcontent':
+                                       $result = ($compiledPermissions & 16) !== 0;
+                               break;
+                               default:
+                                       $result = FALSE;
+                       }
                } else {
                } else {
-                       return $lCP & 16;
+                       $result = ($compiledPermissions & 16) !== 0;
                }
                }
+               return $result;
        }
 
        /**
        }
 
        /**
-        * Returns true if the BE_USER is allowed to *create* shortcuts in the backend modules
+        * Returns TRUE if the BE_USER is allowed to *create* shortcuts in the backend modules
         *
         *
-        * @return      boolean
+        * @return boolean
         */
         */
-       function mayMakeShortcut()      {
-                       // If the old BE is used (maybe with some parameters),
-                       // check for options.enableShortcuts and options.shortcutFrame being set.
-               if (substr($this->getTSConfigVal('auth.BE.redirectToURL'), 0, 12) == 'alt_main.php') {
-                       return $this->getTSConfigVal('options.enableShortcuts') &&
-                               $this->getTSConfigVal('options.shortcutFrame') &&
-                               !$this->getTSConfigVal('options.mayNotCreateEditShortcuts');
-               }
-                       // If the new BE is used, don't check options.shortcutFrame,
-                       // because this is not used there anymore.
-               else {
-                       return $this->getTSConfigVal('options.enableShortcuts') &&
-                               !$this->getTSConfigVal('options.mayNotCreateEditShortcuts');
-               }
+       function mayMakeShortcut() {
+               return $this->getTSConfigVal('options.enableBookmarks') && !$this->getTSConfigVal('options.mayNotCreateEditBookmarks');
        }
 
        /**
         * Checking if editing of an existing record is allowed in current workspace if that is offline.
         * Rules for editing in offline mode:
        }
 
        /**
         * Checking if editing of an existing record is allowed in current workspace if that is offline.
         * Rules for editing in offline mode:
-        *              - record supports versioning and is an offline version from workspace and has the corrent stage
-        *              - or record (any) is in a branch where there is a page which is a version from the workspace and where the stage is not preventing records
+        *               - record supports versioning and is an offline version from workspace and has the corrent stage
+        *               - or record (any) is in a branch where there is a page which is a version from the workspace and where the stage is not preventing records
         *
         *
-        * @param       string          Table of record
-        * @param       array           Integer (record uid) or array where fields are at least: pid, t3ver_wsid, t3ver_stage (if versioningWS is set)
-        * @return      string          String error code, telling the failure state. FALSE=All ok
+        * @param string $table Table of record
+        * @param array $recData Integer (record uid) or array where fields are at least: pid, t3ver_wsid, t3ver_stage (if versioningWS is set)
+        * @return string String error code, telling the failure state. FALSE=All ok
         */
         */
-       function workspaceCannotEditRecord($table,$recData)     {
-
-               if ($this->workspace!==0)       {       // Only test offline spaces:
+       function workspaceCannotEditRecord($table, $recData) {
+                       // Only test offline spaces:
+               if ($this->workspace !== 0) {
 
 
-                       if (!is_array($recData))        {
-                               $recData = t3lib_BEfunc::getRecord($table,$recData,'pid'.($GLOBALS['TCA'][$table]['ctrl']['versioningWS']?',t3ver_wsid,t3ver_stage':''));
+                       if (!is_array($recData)) {
+                               $recData = t3lib_BEfunc::getRecord($table, $recData, 'pid' . ($GLOBALS['TCA'][$table]['ctrl']['versioningWS'] ? ',t3ver_wsid,t3ver_stage' : ''));
                        }
 
                        }
 
-                       if (is_array($recData)) {
-                               if ((int)$recData['pid']===-1)  {       // We are testing a "version" (identified by a pid of -1): it can be edited provided that workspace matches and versioning is enabled for the table.
-                                       if (!$GLOBALS['TCA'][$table]['ctrl']['versioningWS'])   {       // No versioning, basic error, inconsistency even! Such records should not have a pid of -1!
+                       if (is_array($recData)) {
+                                       // We are testing a "version" (identified by a pid of -1): it can be edited provided that workspace matches and versioning is enabled for the table.
+                               if ((int) $recData['pid'] === -1) {
+                                               // No versioning, basic error, inconsistency even! Such records should not have a pid of -1!
+                                       if (!$GLOBALS['TCA'][$table]['ctrl']['versioningWS']) {
                                                return 'Versioning disabled for table';
                                                return 'Versioning disabled for table';
-                                       } elseif ((int)$recData['t3ver_wsid']!==$this->workspace)       {       // So does workspace match?
+                                       } elseif ((int) $recData['t3ver_wsid'] !== $this->workspace) { // So does workspace match?
                                                return 'Workspace ID of record didn\'t match current workspace';
                                                return 'Workspace ID of record didn\'t match current workspace';
-                                       } else {        // So what about the stage of the version, does that allow editing for this user?
-                                               return $this->workspaceCheckStageForCurrent($recData['t3ver_stage']) ? FALSE : 'Record stage "'.$recData['t3ver_stage'].'" and users access level did not allow for editing';
+                                       } else {
+                                                       // So is the user allowed to "use" the edit stage within the workspace?
+                                               return $this->workspaceCheckStageForCurrent(0) ? FALSE : 'User\'s access level did not allow for editing';
                                        }
                                        }
-                               } else {        // We are testing a "live" record:
-                                       if ($res = $this->workspaceAllowLiveRecordsInPID($recData['pid'], $table)) {    // For "Live" records, check that PID for table allows editing
+                               } else { // We are testing a "live" record:
+                                               // For "Live" records, check that PID for table allows editing
+                                       if ($res = $this->workspaceAllowLiveRecordsInPID($recData['pid'], $table)) {
                                                        // Live records are OK in this branch, but what about the stage of branch point, if any:
                                                        // Live records are OK in this branch, but what about the stage of branch point, if any:
-                                               return $res>0 ? FALSE : 'Stage for versioning root point and users access level did not allow for editing';     // OK
-                                       } else {        // If not offline and not in versionized branch, output error:
+                                                       // OK
+                                               return $res > 0 ? FALSE : 'Stage for versioning root point and users access level did not allow for editing';
+                                       } else {
+                                                       // If not offline and not in versionized branch, output error:
                                                return 'Online record was not in versionized branch!';
                                        }
                                }
                                                return 'Online record was not in versionized branch!';
                                        }
                                }
-                       } else return 'No record';
+                       } else {
+                               return 'No record';
+                       }
                } else {
                } else {
-                       return FALSE;   // OK because workspace is 0
+                               // OK because workspace is 0
+                       return FALSE;
                }
        }
 
        /**
         * Evaluates if a user is allowed to edit the offline version
         *
                }
        }
 
        /**
         * Evaluates if a user is allowed to edit the offline version
         *
-        * @param       string          Table of record
-        * @param       array           Integer (record uid) or array where fields are at least: pid, t3ver_wsid, t3ver_stage (if versioningWS is set)
-        * @return      string          String error code, telling the failure state. FALSE=All ok
+        * @param string $table Table of record
+        * @param array $recData Integer (record uid) or array where fields are at least: pid, t3ver_wsid, t3ver_stage (if versioningWS is set)
+        * @return string String error code, telling the failure state. FALSE=All ok
         * @see workspaceCannotEditRecord()
         */
         * @see workspaceCannotEditRecord()
         */
-       function workspaceCannotEditOfflineVersion($table,$recData)     {
-               if ($GLOBALS['TCA'][$table]['ctrl']['versioningWS'])    {
+       function workspaceCannotEditOfflineVersion($table, $recData) {
+               if ($GLOBALS['TCA'][$table]['ctrl']['versioningWS']) {
 
 
-                       if (!is_array($recData))        {
-                               $recData = t3lib_BEfunc::getRecord($table,$recData,'uid,pid,t3ver_wsid,t3ver_stage');
+                       if (!is_array($recData)) {
+                               $recData = t3lib_BEfunc::getRecord($table, $recData, 'uid,pid,t3ver_wsid,t3ver_stage');
                        }
                        }
-                       if (is_array($recData)) {
-                               if ((int)$recData['pid']===-1)  {
-                                       return $this->workspaceCannotEditRecord($table,$recData);
-                               } else return 'Not an offline version';
-                       } else return 'No record';
-               } else return 'Table does not support versioning.';
+                       if (is_array($recData)) {
+                               if ((int) $recData['pid'] === -1) {
+                                       return $this->workspaceCannotEditRecord($table, $recData);
+                               } else {
+                                       return 'Not an offline version';
+                               }
+                       } else {
+                               return 'No record';
+                       }
+               } else {
+                       return 'Table does not support versioning.';
+               }
        }
 
        /**
        }
 
        /**
@@ -784,37 +768,38 @@ class t3lib_userAuthGroup extends t3lib_userAuth {
         * If the answer is FALSE it means the only valid way to create or edit records in the PID is by versioning
         * If the answer is 1 or 2 it means it is OK to create a record, if -1 it means that it is OK in terms of versioning because the element was within a versionized branch but NOT ok in terms of the state the root point had!
         *
         * If the answer is FALSE it means the only valid way to create or edit records in the PID is by versioning
         * If the answer is 1 or 2 it means it is OK to create a record, if -1 it means that it is OK in terms of versioning because the element was within a versionized branch but NOT ok in terms of the state the root point had!
         *
-        * @param       integer         PID value to check for.
-        * @param       string          Table name
-        * @return      mixed           Returns FALSE if a live record cannot be created and must be versionized in order to do so. 2 means a) Workspace is "Live" or workspace allows "live edit" of records from non-versionized tables (and the $table is not versionizable). 1 and -1 means the pid is inside a versionized branch where -1 means that the branch-point did NOT allow a new record according to its state.
+        * @param integer $pid PID value to check for.
+        * @param string $table Table name
+        * @return mixed Returns FALSE if a live record cannot be created and must be versionized in order to do so. 2 means a) Workspace is "Live" or workspace allows "live edit" of records from non-versionized tables (and the $table is not versionizable). 1 and -1 means the pid is inside a versionized branch where -1 means that the branch-point did NOT allow a new record according to its state.
         */
         */
-       function workspaceAllowLiveRecordsInPID($pid, $table)   {
+       function workspaceAllowLiveRecordsInPID($pid, $table) {
 
                        // Always for Live workspace AND if live-edit is enabled and tables are completely without versioning it is ok as well.
 
                        // Always for Live workspace AND if live-edit is enabled and tables are completely without versioning it is ok as well.
-               if ($this->workspace===0 || ($this->workspaceRec['live_edit'] && !$GLOBALS['TCA'][$table]['ctrl']['versioningWS']) || $GLOBALS['TCA'][$table]['ctrl']['versioningWS_alwaysAllowLiveEdit'])      {
-                       return 2;       // OK to create for this table.
-               } elseif (t3lib_BEfunc::isPidInVersionizedBranch($pid, $table)) {       // Check if records from $table can be created with this PID: Either if inside "branch" versioning type or a "versioning_followPages" table on a "page" versioning type.
-                               // Now, check what the stage of that "page" or "branch" version type is:
-                       $stage = t3lib_BEfunc::isPidInVersionizedBranch($pid, $table, TRUE);
-                       return $this->workspaceCheckStageForCurrent($stage) ? 1 : -1;
+               if ($this->workspace === 0 || ($this->workspaceRec['live_edit'] && !$GLOBALS['TCA'][$table]['ctrl']['versioningWS']) || $GLOBALS['TCA'][$table]['ctrl']['versioningWS_alwaysAllowLiveEdit']) {
+                               // OK to create for this table.
+                       return 2;
                } else {
                } else {
-                       return FALSE;   // If the answer is FALSE it means the only valid way to create or edit records in the PID is by versioning
+                               // If the answer is FALSE it means the only valid way to create or edit records in the PID is by versioning
+                       return FALSE;
                }
        }
 
        /**
         * Evaluates if a record from $table can be created in $pid
         *
                }
        }
 
        /**
         * Evaluates if a record from $table can be created in $pid
         *
-        * @param       integer         Page id. This value must be the _ORIG_uid if available: So when you have pages versionized as "page" or "element" you must supply the id of the page version in the workspace!
-        * @param       string          Table name
-        * @return      boolean         TRUE if OK.
+        * @param integer $pid Page id. This value must be the _ORIG_uid if available: So when you have pages versionized as "page" or "element" you must supply the id of the page version in the workspace!
+        * @param string $table Table name
+        * @return boolean TRUE if OK.
         */
         */
-       function workspaceCreateNewRecord($pid, $table) {
-               if ($res = $this->workspaceAllowLiveRecordsInPID($pid,$table))  {       // If LIVE records cannot be created in the current PID due to workspace restrictions, prepare creation of placeholder-record
-                       if ($res<0)     {
-                               return FALSE;   // Stage for versioning root point and users access level did not allow for editing
+       function workspaceCreateNewRecord($pid, $table) {
+               if ($res = $this->workspaceAllowLiveRecordsInPID($pid, $table)) {
+                               // If LIVE records cannot be created in the current PID due to workspace restrictions, prepare creation of placeholder-record
+                       if ($res < 0) {
+                                       // Stage for versioning root point and users access level did not allow for editing
+                               return FALSE;
                        }
                        }
-               } elseif (!$GLOBALS['TCA'][$table]['ctrl']['versioningWS'])     {       // So, if no live records were allowed, we have to create a new version of this record:
+               } elseif (!$GLOBALS['TCA'][$table]['ctrl']['versioningWS']) {
+                               // So, if no live records were allowed, we have to create a new version of this record:
                        return FALSE;
                }
                return TRUE;
                        return FALSE;
                }
                return TRUE;
@@ -823,73 +808,113 @@ class t3lib_userAuthGroup extends t3lib_userAuth {
        /**
         * Evaluates if auto creation of a version of a record is allowed.
         *
        /**
         * Evaluates if auto creation of a version of a record is allowed.
         *
-        * @param       string          Table of the record
-        * @param       integer         UID of record
-        * @param       integer         PID of record
-        * @return      boolean         TRUE if ok.
+        * @param string $table Table of the record
+        * @param integer $id UID of record
+        * @param integer $recpid PID of record
+        * @return boolean TRUE if ok.
         */
         */
-       function workspaceAllowAutoCreation($table,$id,$recpid) {
-                       // Auto-creation of version: In offline workspace, test if versioning is enabled and look for workspace version of input record. If there is no versionized record found we will create one and save to that.
-               if ($this->workspace!==0        // Only in draft workspaces
-                       && !$this->workspaceRec['disable_autocreate']   // Auto-creation must not be disabled.
-                       && $GLOBALS['TCA'][$table]['ctrl']['versioningWS']      // Table must be versionizable
-                       && $recpid >= 0 // The PID of the record must NOT be -1 or less (would indicate that it already was a version!)
-                       && !t3lib_BEfunc::getWorkspaceVersionOfRecord($this->workspace, $table, $id, 'uid')     // There must be no existing version of this record in workspace.
-                       && !t3lib_BEfunc::isPidInVersionizedBranch($recpid, $table))    {       // PID must NOT be in a versionized branch either
-                               return TRUE;
+       function workspaceAllowAutoCreation($table, $id, $recpid) {
+                       // Auto-creation of version: In offline workspace, test if versioning is
+                       // enabled and look for workspace version of input record.
+                       // If there is no versionized record found we will create one and save to that.
+               if ($this->workspace !== 0 // Only in draft workspaces
+                       && !$this->workspaceRec['disable_autocreate'] // Auto-creation must not be disabled.
+                       && $GLOBALS['TCA'][$table]['ctrl']['versioningWS'] // Table must be versionizable
+                       && $recpid >= 0 // The PID of the record must NOT be -1 or less (would indicate that it already was a version!)
+                       && !t3lib_BEfunc::getWorkspaceVersionOfRecord($this->workspace, $table, $id, 'uid')) { // There must be no existing version of this record in workspace.
+                       return TRUE;
+               } elseif ($this->workspaceRec['disable_autocreate']) {
+                       t3lib_div::deprecationLog('Usage of disable_autocreate feature is deprecated since 4.5.');
                }
        }
 
        /**
         * Checks if an element stage allows access for the user in the current workspace
                }
        }
 
        /**
         * Checks if an element stage allows access for the user in the current workspace
-        * In workspaces 0 (Live) and -1 (Default draft) access is always granted for any stage.
+        * In live workspace (= 0) access is always granted for any stage.
         * Admins are always allowed.
         * An option for custom workspaces allows members to also edit when the stage is "Review"
         *
         * Admins are always allowed.
         * An option for custom workspaces allows members to also edit when the stage is "Review"
         *
-        * @param       integer         Stage id from an element: -1,0 = editing, 1 = reviewer, >1 = owner
-        * @return      boolean         TRUE if user is allowed access
+        * @param integer $stage Stage id from an element: -1,0 = editing, 1 = reviewer, >1 = owner
+        * @return boolean TRUE if user is allowed access
         */
         */
-       function workspaceCheckStageForCurrent($stage)  {
-               if ($this->isAdmin())   return TRUE;
+       function workspaceCheckStageForCurrent($stage) {
+                       // Always allow for admins
+               if ($this->isAdmin()) {
+                       return TRUE;
+               }
 
 
-               if ($this->workspace>0) {
+               if ($this->workspace !== 0 && t3lib_extMgm::isLoaded('workspaces')) {
+                       $stage = intval($stage);
                        $stat = $this->checkWorkspaceCurrent();
                        $stat = $this->checkWorkspaceCurrent();
-                       $memberStageLimit = $this->workspaceRec['review_stage_edit'] ? 1 : 0;
-                       if (($stage<=$memberStageLimit && $stat['_ACCESS']==='member') ||
-                               ($stage<=1 && $stat['_ACCESS']==='reviewer') ||
-                               ($stat['_ACCESS']==='owner')) {
-                                       return TRUE;    // OK for these criteria
+
+                               // Check if custom staging is activated
+                       $workspaceRec = t3lib_BEfunc::getRecord('sys_workspace', $stat['uid']);
+                       if ($workspaceRec['custom_stages'] > 0 && $stage !== 0 && $stage !== -10) {
+
+                                       // Get custom stage record
+                               $workspaceStageRec = t3lib_BEfunc::getRecord('sys_workspace_stage', $stage);
+                                       // Check if the user is responsible for the current stage
+                               if ((t3lib_div::inList($workspaceStageRec['responsible_persons'], 'be_users_' . $this->user['uid'])
+                                       && $stat['_ACCESS'] === 'member')
+                                       || $stat['_ACCESS'] === 'owner') {
+                                       return TRUE;
+                               }
+
+                                       // Check if the user is in a group which is responsible for the current stage
+                               foreach ($this->userGroupsUID as $groupUid) {
+                                       if ((t3lib_div::inList($workspaceStageRec['responsible_persons'], 'be_groups_' . $groupUid)
+                                               && $stat['_ACCESS'] === 'member')
+                                               || $stat['_ACCESS'] === 'owner') {
+                                               return TRUE;
+                                       }
+                               }
+                               // Only owner is allowed to change records which are "ready to publish"
+                       } elseif ($stage == -10 || $stage == -20) {
+                               if ($stat['_ACCESS'] === 'owner') {
+                                       return TRUE;
+                               } else {
+                                       return FALSE;
+                               }
+                       } else {
+                               $memberStageLimit = $this->workspaceRec['review_stage_edit'] ? 1 : 0;
+                               if (($stage <= $memberStageLimit && $stat['_ACCESS'] === 'member')
+                                       || ($stage <= 1 && $stat['_ACCESS'] === 'reviewer')
+                                       || $stat['_ACCESS'] === 'owner') {
+                                       return TRUE;
+                               }
                        }
                        }
-               } else return TRUE;     // Always OK for live and draft workspaces.
+               } else {
+                               // Always OK for live workspace.
+                       return TRUE;
+               }
        }
 
        /**
         * Returns TRUE if the user has access to publish content from the workspace ID given.
         * Admin-users are always granted access to do this
         * If the workspace ID is 0 (live) all users have access also
        }
 
        /**
         * Returns TRUE if the user has access to publish content from the workspace ID given.
         * Admin-users are always granted access to do this
         * If the workspace ID is 0 (live) all users have access also
-        * If -1 (draft workspace) TRUE is returned if the user has access to the Live workspace
         * For custom workspaces it depends on whether the user is owner OR like with draft workspace if the user has access to Live workspace.
         *
         * For custom workspaces it depends on whether the user is owner OR like with draft workspace if the user has access to Live workspace.
         *
-        * @param       integer         Workspace UID; -1,0,1+
-        * @return      boolean         Returns TRUE if the user has access to publish content from the workspace ID given.
+        * @param integer $wsid Workspace UID; 0,1+
+        * @return boolean Returns TRUE if the user has access to publish content from the workspace ID given.
         */
         */
-       function workspacePublishAccess($wsid)  {
-               if ($this->isAdmin())   return TRUE;
+       function workspacePublishAccess($wsid) {
+               if ($this->isAdmin()) {
+                       return TRUE;
+               }
 
                        // If no access to workspace, of course you cannot publish!
                $retVal = FALSE;
 
                $wsAccess = $this->checkWorkspace($wsid);
 
                        // If no access to workspace, of course you cannot publish!
                $retVal = FALSE;
 
                $wsAccess = $this->checkWorkspace($wsid);
-               if ($wsAccess)  {
-                       switch($wsAccess['uid'])        {
-                               case 0:         // Live workspace
-                                       $retVal =  TRUE;        // If access to Live workspace, no problem.
+               if ($wsAccess) {
+                       switch ($wsAccess['uid']) {
+                               case 0: // Live workspace
+                                               // If access to Live workspace, no problem.
+                                       $retVal = TRUE;
                                break;
                                break;
-                               case -1:        // Default draft workspace
-                                       $retVal =  $this->checkWorkspace(0) ? TRUE : FALSE;     // If access to Live workspace, no problem.
-                               break;
-                               default:        // Custom workspace
-                                       $retVal =  $wsAccess['_ACCESS'] === 'owner' || ($this->checkWorkspace(0) && !($wsAccess['publish_access']&2));  // Either be an adminuser OR have access to online workspace which is OK as well as long as publishing access is not limited by workspace option.
+                               default: // Custom workspace
+                                       $retVal = $wsAccess['_ACCESS'] === 'owner' || ($this->checkWorkspace(0) && !($wsAccess['publish_access'] & 2)); // Either be an adminuser OR have access to online workspace which is OK as well as long as publishing access is not limited by workspace option.
                                break;
                        }
                }
                                break;
                        }
                }
@@ -899,62 +924,52 @@ class t3lib_userAuthGroup extends t3lib_userAuth {
        /**
         * Workspace swap-mode access?
         *
        /**
         * Workspace swap-mode access?
         *
-        * @return      boolean         Returns TRUE if records can be swapped in the current workspace, otherwise false
+        * @return boolean Returns TRUE if records can be swapped in the current workspace, otherwise FALSE
         */
         */
-       function workspaceSwapAccess()  {
-               if ($this->workspace>0 && (int)$this->workspaceRec['swap_modes']===2)   {
+       function workspaceSwapAccess() {
+               if ($this->workspace > 0 && (int) $this->workspaceRec['swap_modes'] === 2) {
                        return FALSE;
                        return FALSE;
-               } else return TRUE;
+               } else {
+                       return TRUE;
+               }
        }
 
        /**
        }
 
        /**
-        * Workspace Versioning type access?
+        * Workspace Versioning type access. Check wether the requsted type of versioning (element/page/branch) is allowd in current workspace
+        *   (element/pages/branches type of versioning can/could be set on custom workspaces on filed "vtype")
         *
         *
-        * @param       integer         Versioning type to evaluation: -1, 0, >1
-        * @return      boolean         TRUE if OK
+        * @todo workspacecleanup: this seems mostly obsolete and should be removed
+        * @param integer $type Versioning type to evaluation: -1, 0, >1
+        *                                              0 = page (deprecated)
+        *                                              -1 = element
+        *                                              >1 = branch (deprecated), indicating the "nesting" level
+        * @return boolean TRUE if OK
+        * @deprecated since TYPO3 4.4, will be removed in TYPO3 6.0 as only element versioning is supported now
         */
         */
-       function workspaceVersioningTypeAccess($type)   {
-               $retVal = FALSE;
-
-               $type = t3lib_div::intInRange($type,-1);
+       function workspaceVersioningTypeAccess($type) {
+               t3lib_div::logDeprecatedFunction();
 
 
-                       // Check if only element versioning is allowed:
-               if ($GLOBALS['TYPO3_CONF_VARS']['BE']['elementVersioningOnly'] && $type!=-1)    {
-                       return FALSE;
-               }
-
-               if ($this->workspace>0 && !$this->isAdmin())    {
-                       $stat = $this->checkWorkspaceCurrent();
-                       if ($stat['_ACCESS']!=='owner') {
-
-                               switch((int)$type)      {
-                                       case -1:
-                                               $retVal = $this->workspaceRec['vtypes']&1 ? FALSE : TRUE;
-                                       break;
-                                       case 0:
-                                               $retVal = $this->workspaceRec['vtypes']&2 ? FALSE : TRUE;
-                                       break;
-                                       default:
-                                               $retVal = $this->workspaceRec['vtypes']&4 ? FALSE : TRUE;
-                                       break;
-                               }
-                       } else $retVal = TRUE;
-               } else $retVal = TRUE;
+               $type = t3lib_utility_Math::forceIntegerInRange($type, -1);
 
 
-               return $retVal;
+                       // only element versioning is allowed now
+               return $type == -1;
        }
 
        /**
         * Finding "closest" versioning type, used for creation of new records.
         *
        }
 
        /**
         * Finding "closest" versioning type, used for creation of new records.
         *
-        * @param       integer         Versioning type to evaluation: -1, 0, >1
-        * @return      integer         Returning versioning type
+        * @see workspaceVersioningTypeAccess() for hints on $type
+        * @param integer $type Versioning type to evaluation: -1, 0, >1
+        * @return integer Returning versioning type
+        * @deprecated since TYPO3 4.4, will be removed in TYPO3 6.0 as only element versioning is supported now
         */
         */
-       function workspaceVersioningTypeGetClosest($type)       {
-               $type = t3lib_div::intInRange($type,-1);
+       function workspaceVersioningTypeGetClosest($type) {
+               t3lib_div::logDeprecatedFunction();
+
+               $type = t3lib_utility_Math::forceIntegerInRange($type, -1);
 
 
-               if ($this->workspace>0) {
-                       switch((int)$type)      {
+               if ($this->workspace > 0) {
+                       switch ((int) $type) {
                                case -1:
                                        $type = -1;
                                break;
                                case -1:
                                        $type = -1;
                                break;
@@ -969,15 +984,6 @@ class t3lib_userAuthGroup extends t3lib_userAuth {
                return $type;
        }
 
                return $type;
        }
 
-
-
-
-
-
-
-
-
-
        /*************************************
         *
         * Miscellaneous functions
        /*************************************
         *
         * Miscellaneous functions
@@ -988,25 +994,27 @@ class t3lib_userAuthGroup extends t3lib_userAuth {
         * Returns the value/properties of a TS-object as given by $objectString, eg. 'options.dontMountAdminMounts'
         * Nice (general!) function for returning a part of a TypoScript array!
         *
         * Returns the value/properties of a TS-object as given by $objectString, eg. 'options.dontMountAdminMounts'
         * Nice (general!) function for returning a part of a TypoScript array!
         *
-        * @param       string          Pointer to an "object" in the TypoScript array, fx. 'options.dontMountAdminMounts'
-        * @param       array           Optional TSconfig array: If array, then this is used and not $this->userTS. If not array, $this->userTS is used.
-        * @return      array           An array with two keys, "value" and "properties" where "value" is a string with the value of the objectsting and "properties" is an array with the properties of the objectstring.
-        * @params      array   An array with the TypoScript where the $objectString is located. If this argument is not an array, then internal ->userTS (User TSconfig for the current BE_USER) will be used instead.
+        * @param string $objectString Pointer to an "object" in the TypoScript array, fx. 'options.dontMountAdminMounts'
+        * @param array $config Optional TSconfig array: If array, then this is used and not $this->userTS. If not array, $this->userTS is used.
+        * @return array An array with two keys, "value" and "properties" where "value" is a string with the value of the objectsting and "properties" is an array with the properties of the objectstring.
         */
         */
-       function getTSConfig($objectString,$config='')  {
-               if (!is_array($config)) {
-                       $config=$this->userTS;  // Getting Root-ts if not sent
+       function getTSConfig($objectString, $config = '') {
+               if (!is_array($config)) {
+                               // Getting Root-ts if not sent
+                       $config = $this->userTS;
                }
                }
-               $TSConf=array();
-               $parts = explode('.',$objectString,2);
+               $TSConf = array();
+               $parts = explode('.', $objectString, 2);
                $key = $parts[0];
                $key = $parts[0];
-               if (trim($key)) {
-                       if (count($parts)>1 && trim($parts[1])) {
-                               // Go on, get the next level
-                               if (is_array($config[$key.'.']))        $TSConf = $this->getTSConfig($parts[1],$config[$key.'.']);
+               if (trim($key)) {
+                       if (count($parts) > 1 && trim($parts[1])) {
+                                       // Go on, get the next level
+                               if (is_array($config[$key . '.'])) {
+                                       $TSConf = $this->getTSConfig($parts[1], $config[$key . '.']);
+                               }
                        } else {
                        } else {
-                               $TSConf['value']=$config[$key];
-                               $TSConf['properties']=$config[$key.'.'];
+                               $TSConf['value'] = $config[$key];
+                               $TSConf['properties'] = $config[$key . '.'];
                        }
                }
                return $TSConf;
                        }
                }
                return $TSConf;
@@ -1015,11 +1023,11 @@ class t3lib_userAuthGroup extends t3lib_userAuth {
        /**
         * Returns the "value" of the $objectString from the BE_USERS "User TSconfig" array
         *
        /**
         * Returns the "value" of the $objectString from the BE_USERS "User TSconfig" array
         *
-        * @param       string          Object string, eg. "somestring.someproperty.somesubproperty"
-        * @return      string          The value for that object string (object path)
+        * @param string $objectString Object string, eg. "somestring.someproperty.somesubproperty"
+        * @return string The value for that object string (object path)
         * @see getTSConfig()
         */
         * @see getTSConfig()
         */
-       function getTSConfigVal($objectString)  {
+       function getTSConfigVal($objectString) {
                $TSConf = $this->getTSConfig($objectString);
                return $TSConf['value'];
        }
                $TSConf = $this->getTSConfig($objectString);
                return $TSConf['value'];
        }
@@ -1027,24 +1035,26 @@ class t3lib_userAuthGroup extends t3lib_userAuth {
        /**
         * Returns the "properties" of the $objectString from the BE_USERS "User TSconfig" array
         *
        /**
         * Returns the "properties" of the $objectString from the BE_USERS "User TSconfig" array
         *
-        * @param       string          Object string, eg. "somestring.someproperty.somesubproperty"
-        * @return      array           The properties for that object string (object path) - if any
+        * @param string $objectString Object string, eg. "somestring.someproperty.somesubproperty"
+        * @return array The properties for that object string (object path) - if any
         * @see getTSConfig()
         */
         * @see getTSConfig()
         */
-       function getTSConfigProp($objectString) {
+       function getTSConfigProp($objectString) {
                $TSConf = $this->getTSConfig($objectString);
                return $TSConf['properties'];
        }
 
        /**
                $TSConf = $this->getTSConfig($objectString);
                return $TSConf['properties'];
        }
 
        /**
-        * Returns true if $item is in $in_list
+        * Returns TRUE if $item is in $in_list
         *
         *
-        * @param       string          Comma list with items, no spaces between items!
-        * @param       string          The string to find in the list of items
-        * @return      string          Boolean
+        * @param string $in_list Comma list with items, no spaces between items!
+        * @param string $item The string to find in the list of items
+        * @return string Boolean
+        * @deprecated since TYPO3 4.7, should be removed in TYPO3 6.1, use equivalent function t3lib_div::inList()
         */
         */
-       function inList($in_list,$item) {
-               return strstr(','.$in_list.',', ','.$item.',');
+       function inList($in_list, $item) {
+               t3lib_div::logDeprecatedFunction();
+               return t3lib_div::inList($in_list, $item);
        }
 
        /**
        }
 
        /**
@@ -1052,155 +1062,108 @@ class t3lib_userAuthGroup extends t3lib_userAuth {
         * If no webmounts, and empty array is returned.
         * NOTICE: Deleted pages WILL NOT be filtered out! So if a mounted page has been deleted it is STILL coming out as a webmount. This is not checked due to performance.
         *
         * If no webmounts, and empty array is returned.
         * NOTICE: Deleted pages WILL NOT be filtered out! So if a mounted page has been deleted it is STILL coming out as a webmount. This is not checked due to performance.
         *
-        * @return      array
+        * @return array
         */
         */
-       function returnWebmounts()      {
-               return (string)($this->groupData['webmounts'])!='' ? explode(',',$this->groupData['webmounts']) : Array();
+       function returnWebmounts() {
+               return (string) ($this->groupData['webmounts']) != '' ? explode(',', $this->groupData['webmounts']) : array();
        }
 
        }
 
-       /**
-        * Returns an array with the filemounts for the user. Each filemount is represented with an array of a "name", "path" and "type".
-        * If no filemounts an empty array is returned.
-        *
-        * @return      array
-        */
-       function returnFilemounts()     {
-               return $this->groupData['filemounts'];
-       }
 
        /**
 
        /**
-        * Returns an integer bitmask that represents the permissions for file operations.
-        * Permissions of the user and groups the user is a member of were combined by a logical OR.
+        * Returns TRUE or FALSE, depending if an alert popup (a javascript confirmation) should be shown
+        * call like $GLOBALS['BE_USER']->jsConfirmation($BITMASK)
         *
         *
-        * Meaning of each bit:
-        *      1 - Files: Upload,Copy,Move,Delete,Rename
-        *      2 - Files: Unzip
-        *      4 - Directory: Move,Delete,Rename,New
-        *      8 - Directory: Copy
-        *      16 - Directory: Delete recursively (rm -Rf)
+        *      1 - typeChange
+        *      2 - copy/move/paste
+        *      4 - delete
+        *      8 - frontend editing
+        *      128 - other (not used yet)
         *
         *
-        * @return      integer         File operation permission bitmask
+        * @param integer $bitmask Bitmask
+        * @return boolean TRUE if the confirmation should be shown
         */
         */
-       public function getFileoperationPermissions() {
-               if ($this->isAdmin()) {
-                       return 31;
+       function jsConfirmation($bitmask) {
+               $alertPopup = $GLOBALS['BE_USER']->getTSConfig('options.alertPopups');
+               if (empty($alertPopup['value'])) {
+                               // Default: show all warnings
+                       $alertPopup = 255;
                } else {
                } else {
-                       return $this->groupData['fileoper_perms'];
+                       $alertPopup = (int) $alertPopup['value'];
+               }
+                       // Show confirmation
+               if (($alertPopup & $bitmask) == $bitmask) {
+                       return 1;
+               } else { // don't show confirmation
+                       return 0;
                }
        }
 
                }
        }
 
-       /**
-        * Returns true or false, depending if an alert popup (a javascript confirmation) should be shown
-        * call like $GLOBALS['BE_USER']->jsConfirmation($BITMASK)
-        *
-        *    1 - typeChange
-        *    2 - copy/move/paste
-        *    4 - delete
-        *    8 - frontend editing
-        *    128 - other (not used yet)
-        *
-        * @param       integer   Bitmask
-        * @return      boolean         true if the confirmation should be shown
-        */
-        function jsConfirmation($bitmask)      {
-                $alertPopup = $GLOBALS['BE_USER']->getTSConfig('options.alertPopups');
-                if (empty($alertPopup['value']))       {
-                        $alertPopup = 255;     // default: show all warnings
-                } else {
-                        $alertPopup = (int)$alertPopup['value'];
-                }
-                if(($alertPopup&$bitmask) == $bitmask) { // show confirmation
-                        return 1;
-                } else { // don't show confirmation
-                        return 0;
-                }
-        }
-
-
-
-
-
-
-
-
-
        /*************************************
         *
         * Authentication methods
         *
         *************************************/
 
        /*************************************
         *
         * Authentication methods
         *
         *************************************/
 
-
        /**
         * Initializes a lot of stuff like the access-lists, database-mountpoints and filemountpoints
         * This method is called by ->backendCheckLogin() (from extending class t3lib_beuserauth) if the backend user login has verified OK.
         * Generally this is required initialization of a backend user.
         *
        /**
         * Initializes a lot of stuff like the access-lists, database-mountpoints and filemountpoints
         * This method is called by ->backendCheckLogin() (from extending class t3lib_beuserauth) if the backend user login has verified OK.
         * Generally this is required initialization of a backend user.
         *
-        * @return      void
+        * @return void
         * @access private
         * @see t3lib_TSparser
         */
         * @access private
         * @see t3lib_TSparser
         */
-       function fetchGroupData()       {
-               if ($this->user['uid']) {
+       function fetchGroupData() {
+               if ($this->user['uid']) {
 
                                // Get lists for the be_user record and set them as default/primary values.
 
                                // Get lists for the be_user record and set them as default/primary values.
-                       $this->dataLists['modList'] = $this->user['userMods'];                                  // Enabled Backend Modules
-                       $this->dataLists['allowed_languages'] = $this->user['allowed_languages'];                                       // Add Allowed Languages
-                       $this->dataLists['workspace_perms'] = $this->user['workspace_perms'];                                   // Set user value for workspace permissions.
-                       $this->dataLists['webmount_list'] = $this->user['db_mountpoints'];              // Database mountpoints
-                       $this->dataLists['filemount_list'] = $this->user['file_mountpoints'];   // File mountpoints
-                       $this->dataLists['fileoper_perms'] = (int)$this->user['fileoper_perms'];        // Fileoperation permissions
+                               // Enabled Backend Modules
+                       $this->dataLists['modList'] = $this->user['userMods'];
+                               // Add Allowed Languages
+                       $this->dataLists['allowed_languages'] = $this->user['allowed_languages'];
+                               // Set user value for workspace permissions.
+                       $this->dataLists['workspace_perms'] = $this->user['workspace_perms'];
+                               // Database mountpoints
+                       $this->dataLists['webmount_list'] = $this->user['db_mountpoints'];
+                               // File mountpoints
+                       $this->dataLists['filemount_list'] = $this->user['file_mountpoints'];
+                               // Fileoperation permissions
+                       $this->dataLists['fileoper_perms'] = (int) $this->user['fileoper_perms'];
 
                                // Setting default User TSconfig:
 
                                // Setting default User TSconfig:
-                       $this->TSdataArray[]=$this->addTScomment('From $GLOBALS["TYPO3_CONF_VARS"]["BE"]["defaultUserTSconfig"]:').
-                                                                       $GLOBALS['TYPO3_CONF_VARS']['BE']['defaultUserTSconfig'];
+                       $this->TSdataArray[] = $this->addTScomment('From $GLOBALS["TYPO3_CONF_VARS"]["BE"]["defaultUserTSconfig"]:') .
+                                                               $GLOBALS['TYPO3_CONF_VARS']['BE']['defaultUserTSconfig'];
 
                                // Default TSconfig for admin-users
 
                                // Default TSconfig for admin-users
-                       if ($this->isAdmin())   {
-                               $this->TSdataArray[]=$this->addTScomment('"admin" user presets:').'
+                       if ($this->isAdmin()) {
+                               $this->TSdataArray[] = $this->addTScomment('"admin" user presets:') . '
                                        admPanel.enable.all = 1
                                        admPanel.enable.all = 1
-                                       options.shortcutFrame = 1
                                ';
                                ';
-                               if (t3lib_extMgm::isLoaded('sys_note')) {
-                                       $this->TSdataArray[]='
-                                               // Setting defaults for sys_note author / email...
-                                               TCAdefaults.sys_note.author = '.$this->user['realName'].'
-                                               TCAdefaults.sys_note.email = '.$this->user['email'].'
+                               if (t3lib_extMgm::isLoaded('sys_note')) {
+                                       $this->TSdataArray[] = '
+                                                       // Setting defaults for sys_note author / email...
+                                               TCAdefaults.sys_note.author = ' . $this->user['realName'] . '
+                                               TCAdefaults.sys_note.email = ' . $this->user['email'] . '
                                        ';
                                }
                        }
 
                                        ';
                                }
                        }
 
-                               // FILE MOUNTS:
-                               // Admin users has the base fileadmin dir mounted
-                       if ($this->isAdmin() && $GLOBALS['TYPO3_CONF_VARS']['BE']['fileadminDir'])      {
-                               $this->addFileMount($GLOBALS['TYPO3_CONF_VARS']['BE']['fileadminDir'], '', PATH_site.$GLOBALS['TYPO3_CONF_VARS']['BE']['fileadminDir'], 0, '');
-                       }
-
-                               // If userHomePath is set, we attempt to mount it
-                       if ($GLOBALS['TYPO3_CONF_VARS']['BE']['userHomePath'])  {
-                                       // First try and mount with [uid]_[username]
-                               $didMount=$this->addFileMount($this->user['username'], '',$GLOBALS['TYPO3_CONF_VARS']['BE']['userHomePath'].$this->user['uid'].'_'.$this->user['username'].$GLOBALS['TYPO3_CONF_VARS']['BE']['userUploadDir'], 0, 'user');
-                               if (!$didMount) {
-                                               // If that failed, try and mount with only [uid]
-                                       $this->addFileMount($this->user['username'], '', $GLOBALS['TYPO3_CONF_VARS']['BE']['userHomePath'].$this->user['uid'].$GLOBALS['TYPO3_CONF_VARS']['BE']['userUploadDir'], 0, 'user');
-                               }
-                       }
-
                                // BE_GROUPS:
                                // Get the groups...
                                // BE_GROUPS:
                                // Get the groups...
-#                      $grList = t3lib_BEfunc::getSQLselectableList($this->user[$this->usergroup_column],$this->usergroup_table,$this->usergroup_table);
-                       $grList = $GLOBALS['TYPO3_DB']->cleanIntList($this->user[$this->usergroup_column]);     // 240203: Since the group-field never contains any references to groups with a prepended table name we think it's safe to just intExplode and re-implode - which should be much faster than the other function call.
-                       if ($grList)    {
+                               // 240203: Since the group-field never contains any references to groups with a prepended table name
+                               // we think it's safe to just intExplode and re-implode - which should be much faster than the other function call.
+                       $grList = $GLOBALS['TYPO3_DB']->cleanIntList($this->user[$this->usergroup_column]);
+                       if ($grList) {
                                        // Fetch groups will add a lot of information to the internal arrays: modules, accesslists, TSconfig etc. Refer to fetchGroups() function.
                                $this->fetchGroups($grList);
                        }
 
                                // Add the TSconfig for this specific user:
                                        // Fetch groups will add a lot of information to the internal arrays: modules, accesslists, TSconfig etc. Refer to fetchGroups() function.
                                $this->fetchGroups($grList);
                        }
 
                                // Add the TSconfig for this specific user:
-                       $this->TSdataArray[] = $this->addTScomment('USER TSconfig field').$this->user['TSconfig'];
+                       $this->TSdataArray[] = $this->addTScomment('USER TSconfig field') . $this->user['TSconfig'];
                                // Check include lines.
                        $this->TSdataArray = t3lib_TSparser::checkIncludeLines_array($this->TSdataArray);
                                // Check include lines.
                        $this->TSdataArray = t3lib_TSparser::checkIncludeLines_array($this->TSdataArray);
-
-                       $this->userTS_text = implode(chr(10).'[GLOBAL]'.chr(10),$this->TSdataArray);    // Imploding with "[global]" will make sure that non-ended confinements with braces are ignored.
+                               // Imploding with "[global]" will make sure that non-ended confinements with braces are ignored.
+                       $this->userTS_text = implode(LF . '[GLOBAL]' . LF, $this->TSdataArray);
 
                        if ($GLOBALS['TYPO3_CONF_VARS']['BE']['TSconfigConditions'] && !$this->userTS_dontGetCached) {
                                        // Perform TS-Config parsing with condition matching
 
                        if ($GLOBALS['TYPO3_CONF_VARS']['BE']['TSconfigConditions'] && !$this->userTS_dontGetCached) {
                                        // Perform TS-Config parsing with condition matching
@@ -1222,28 +1185,20 @@ class t3lib_userAuthGroup extends t3lib_userAuth {
                                        $this->userTS = $parseObj->setup;
                                        t3lib_BEfunc::storeHash($hash, serialize($this->userTS), 'BE_USER_TSconfig');
                                                // Update UC:
                                        $this->userTS = $parseObj->setup;
                                        t3lib_BEfunc::storeHash($hash, serialize($this->userTS), 'BE_USER_TSconfig');
                                                // Update UC:
-                                       $this->userTSUpdated=1;
+                                       $this->userTSUpdated = 1;
                                }
                        }
 
                                // Processing webmounts
                                }
                        }
 
                                // Processing webmounts
-                       if ($this->isAdmin() && !$this->getTSConfigVal('options.dontMountAdminMounts')) {       // Admin's always have the root mounted
-                               $this->dataLists['webmount_list']='0,'.$this->dataLists['webmount_list'];
-                       }
-
-                               // Processing filemounts
-                       $this->dataLists['filemount_list'] = t3lib_div::uniqueList($this->dataLists['filemount_list']);
-                       if ($this->dataLists['filemount_list']) {
-                               $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery('*', 'sys_filemounts', 'deleted=0 AND hidden=0 AND pid=0 AND uid IN ('.$this->dataLists['filemount_list'].')');
-                               while ($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res))      {
-                                       $this->addFileMount($row['title'], $row['path'], $row['path'], $row['base']?1:0, '');
-                               }
+                               // Admin's always have the root mounted
+                       if ($this->isAdmin() && !$this->getTSConfigVal('options.dontMountAdminMounts')) {
+                               $this->dataLists['webmount_list'] = '0,' . $this->dataLists['webmount_list'];
                        }
 
                                // The lists are cleaned for duplicates
                        $this->groupData['webmounts'] = t3lib_div::uniqueList($this->dataLists['webmount_list']);
                        $this->groupData['pagetypes_select'] = t3lib_div::uniqueList($this->dataLists['pagetypes_select']);
                        }
 
                                // The lists are cleaned for duplicates
                        $this->groupData['webmounts'] = t3lib_div::uniqueList($this->dataLists['webmount_list']);
                        $this->groupData['pagetypes_select'] = t3lib_div::uniqueList($this->dataLists['pagetypes_select']);
-                       $this->groupData['tables_select'] = t3lib_div::uniqueList($this->dataLists['tables_modify'].','.$this->dataLists['tables_select']);
+                       $this->groupData['tables_select'] = t3lib_div::uniqueList($this->dataLists['tables_modify'] . ',' . $this->dataLists['tables_select']);
                        $this->groupData['tables_modify'] = t3lib_div::uniqueList($this->dataLists['tables_modify']);
                        $this->groupData['non_exclude_fields'] = t3lib_div::uniqueList($this->dataLists['non_exclude_fields']);
                        $this->groupData['explicit_allowdeny'] = t3lib_div::uniqueList($this->dataLists['explicit_allowdeny']);
                        $this->groupData['tables_modify'] = t3lib_div::uniqueList($this->dataLists['tables_modify']);
                        $this->groupData['non_exclude_fields'] = t3lib_div::uniqueList($this->dataLists['non_exclude_fields']);
                        $this->groupData['explicit_allowdeny'] = t3lib_div::uniqueList($this->dataLists['explicit_allowdeny']);
@@ -1253,23 +1208,26 @@ class t3lib_userAuthGroup extends t3lib_userAuth {
                        $this->groupData['fileoper_perms'] = $this->dataLists['fileoper_perms'];
                        $this->groupData['workspace_perms'] = $this->dataLists['workspace_perms'];
 
                        $this->groupData['fileoper_perms'] = $this->dataLists['fileoper_perms'];
                        $this->groupData['workspace_perms'] = $this->dataLists['workspace_perms'];
 
-                               // populating the $this->userGroupsUID -array with the groups in the order in which they were LAST included.!!
+                               // Populating the $this->userGroupsUID -array with the groups in the order in which they were LAST included.!!
                        $this->userGroupsUID = array_reverse(array_unique(array_reverse($this->includeGroupArray)));
 
                                // Finally this is the list of group_uid's in the order they are parsed (including subgroups!) and without duplicates (duplicates are presented with their last entrance in the list, which thus reflects the order of the TypoScript in TSconfig)
                        $this->userGroupsUID = array_reverse(array_unique(array_reverse($this->includeGroupArray)));
 
                                // Finally this is the list of group_uid's in the order they are parsed (including subgroups!) and without duplicates (duplicates are presented with their last entrance in the list, which thus reflects the order of the TypoScript in TSconfig)
-                       $this->groupList = implode(',',$this->userGroupsUID);
+                       $this->groupList = implode(',', $this->userGroupsUID);
                        $this->setCachedList($this->groupList);
 
                                // Checking read access to webmounts:
                        $this->setCachedList($this->groupList);
 
                                // Checking read access to webmounts:
-                       if (trim($this->groupData['webmounts'])!=='')   {
-                               $webmounts = explode(',',$this->groupData['webmounts']);        // Explode mounts
-                               $MProws = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows('uid', 'pages', 'deleted=0 AND uid IN ('.$this->groupData['webmounts'].') AND '.$this->getPagePermsClause(1),'','','','uid');        // Selecting all webmounts with permission clause for reading
-                               foreach($webmounts as $idx => $mountPointUid)   {
-                                       if ($mountPointUid>0 && !isset($MProws[$mountPointUid]))        {       // If the mount ID is NOT found among selected pages, unset it:
+                       if (trim($this->groupData['webmounts']) !== '') {
+                               $webmounts = explode(',', $this->groupData['webmounts']); // Explode mounts
+                                       // Selecting all webmounts with permission clause for reading
+                               $MProws = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows('uid', 'pages', 'deleted=0 AND uid IN (' . $this->groupData['webmounts'] . ') AND ' . $this->getPagePermsClause(1), '', '', '', 'uid');
+                               foreach ($webmounts as $idx => $mountPointUid) {
+                                               // If the mount ID is NOT found among selected pages, unset it:
+                                       if ($mountPointUid > 0 && !isset($MProws[$mountPointUid])) {
                                                unset($webmounts[$idx]);
                                        }
                                }
                                                unset($webmounts[$idx]);
                                        }
                                }
-                               $this->groupData['webmounts'] = implode(',',$webmounts);        // Implode mounts in the end.
+                                       // Implode mounts in the end.
+                               $this->groupData['webmounts'] = implode(',', $webmounts);
                        }
 
                                // Setting up workspace situation (after webmounts are processed!):
                        }
 
                                // Setting up workspace situation (after webmounts are processed!):
@@ -1281,98 +1239,96 @@ class t3lib_userAuthGroup extends t3lib_userAuth {
         * Fetches the group records, subgroups and fills internal arrays.
         * Function is called recursively to fetch subgroups
         *
         * Fetches the group records, subgroups and fills internal arrays.
         * Function is called recursively to fetch subgroups
         *
-        * @param       string          Commalist of be_groups uid numbers
-        * @param       string          List of already processed be_groups-uids so the function will not fall into a eternal recursion.
-        * @return      void
+        * @param string $grList Commalist of be_groups uid numbers
+        * @param string $idList List of already processed be_groups-uids so the function will not fall into a eternal recursion.
+        * @return void
         * @access private
         */
         * @access private
         */
-       function fetchGroups($grList,$idList='')        {
-               global $TYPO3_CONF_VARS;
-
+       function fetchGroups($grList, $idList = '') {
                        // Fetching records of the groups in $grList (which are not blocked by lockedToDomain either):
                        // Fetching records of the groups in $grList (which are not blocked by lockedToDomain either):
-               $lockToDomain_SQL = ' AND (lockToDomain=\'\' OR lockToDomain IS NULL OR lockToDomain=\''.t3lib_div::getIndpEnv('HTTP_HOST').'\')';
-               $whereSQL = 'deleted=0 AND hidden=0 AND pid=0 AND uid IN ('.$grList.')'.$lockToDomain_SQL;
+               $lockToDomain_SQL = ' AND (lockToDomain=\'\' OR lockToDomain IS NULL OR lockToDomain=\'' . t3lib_div::getIndpEnv('HTTP_HOST') . '\')';
+               $whereSQL = 'deleted=0 AND hidden=0 AND pid=0 AND uid IN (' . $grList . ')' . $lockToDomain_SQL;
 
                        // Hook for manipulation of the WHERE sql sentence which controls which BE-groups are included
 
                        // Hook for manipulation of the WHERE sql sentence which controls which BE-groups are included
-               if (is_array ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_userauthgroup.php']['fetchGroupQuery'])) {
+               if (is_array($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_userauthgroup.php']['fetchGroupQuery'])) {
                        foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_userauthgroup.php']['fetchGroupQuery'] as $classRef) {
                        foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_userauthgroup.php']['fetchGroupQuery'] as $classRef) {
-                       $hookObj = t3lib_div::getUserObj($classRef);
-                       if(method_exists($hookObj,'fetchGroupQuery_processQuery')){
-                               $whereSQL = $hookObj->fetchGroupQuery_processQuery($this, $grList, $idList, $whereSQL);
-                       }
+                               $hookObj = t3lib_div::getUserObj($classRef);
+                               if (method_exists($hookObj, 'fetchGroupQuery_processQuery')) {
+                                       $whereSQL = $hookObj->fetchGroupQuery_processQuery($this, $grList, $idList, $whereSQL);
+                               }
                        }
                }
 
                $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery('*', $this->usergroup_table, $whereSQL);
 
                        // The userGroups array is filled
                        }
                }
 
                $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery('*', $this->usergroup_table, $whereSQL);
 
                        // The userGroups array is filled
-               while ($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res))      {
+               while ($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res)) {
                        $this->userGroups[$row['uid']] = $row;
                }
                        $this->userGroups[$row['uid']] = $row;
                }
+               $GLOBALS['TYPO3_DB']->sql_free_result($res);
 
                        // Traversing records in the correct order
 
                        // Traversing records in the correct order
-               $include_staticArr = t3lib_div::intExplode(',',$grList);
-               reset($include_staticArr);
-               while(list(,$uid)=each($include_staticArr))     {       // traversing list
+               $include_staticArr = t3lib_div::intExplode(',', $grList);
+                       // Traversing list
+               foreach ($include_staticArr as $key => $uid) {
 
                                // Get row:
 
                                // Get row:
-                       $row=$this->userGroups[$uid];
-                       if (is_array($row) && !t3lib_div::inList($idList,$uid)) {       // Must be an array and $uid should not be in the idList, because then it is somewhere previously in the grouplist
+                       $row = $this->userGroups[$uid];
+                               // Must be an array and $uid should not be in the idList, because then it is somewhere previously in the grouplist
+                       if (is_array($row) && !t3lib_div::inList($idList, $uid)) {
 
                                        // Include sub groups
 
                                        // Include sub groups
-                               if (trim($row['subgroup']))     {
-                                       $theList = implode(',',t3lib_div::intExplode(',',$row['subgroup']));    // Make integer list
-                                       $this->fetchGroups($theList, $idList.','.$uid);         // Call recursively, pass along list of already processed groups so they are not recursed again.
+                               if (trim($row['subgroup'])) {
+                                               // Make integer list
+                                       $theList = implode(',', t3lib_div::intExplode(',', $row['subgroup']));
+                                               // Call recursively, pass along list of already processed groups so they are not recursed again.
+                                       $this->fetchGroups($theList, $idList . ',' . $uid);
                                }
                                        // Add the group uid, current list, TSconfig to the internal arrays.
                                }
                                        // Add the group uid, current list, TSconfig to the internal arrays.
-                               $this->includeGroupArray[]=$uid;
-                               $this->includeHierarchy[]=$idList;
-                               $this->TSdataArray[] = $this->addTScomment('Group "'.$row['title'].'" ['.$row['uid'].'] TSconfig field:').$row['TSconfig'];
+                               $this->includeGroupArray[] = $uid;
+                               $this->includeHierarchy[] = $idList;
+                               $this->TSdataArray[] = $this->addTScomment('Group "' . $row['title'] . '" [' . $row['uid'] . '] TSconfig field:') . $row['TSconfig'];
 
                                        // Mount group database-mounts
 
                                        // Mount group database-mounts
-                               if (($this->user['options']&1) == 1)    {       $this->dataLists['webmount_list'].= ','.$row['db_mountpoints']; }
+                               if (($this->user['options'] & 1) == 1) {
+                                       $this->dataLists['webmount_list'] .= ',' . $row['db_mountpoints'];
+                               }
 
                                        // Mount group file-mounts
 
                                        // Mount group file-mounts
-                               if (($this->user['options']&2) == 2)    {       $this->dataLists['filemount_list'].= ','.$row['file_mountpoints'];      }
-
-                                       // Mount group home-dirs
-                               if (($this->user['options']&2) == 2)    {
-                                               // If groupHomePath is set, we attempt to mount it
-                                       if ($GLOBALS['TYPO3_CONF_VARS']['BE']['groupHomePath']) {
-                                               $this->addFileMount($row['title'], '', $GLOBALS['TYPO3_CONF_VARS']['BE']['groupHomePath'].$row['uid'], 0, 'group');
-                                       }
+                               if (($this->user['options'] & 2) == 2) {
+                                       $this->dataLists['filemount_list'] .= ',' . $row['file_mountpoints'];
                                }
 
                                        // The lists are made: groupMods, tables_select, tables_modify, pagetypes_select, non_exclude_fields, explicit_allowdeny, allowed_languages, custom_options
                                }
 
                                        // The lists are made: groupMods, tables_select, tables_modify, pagetypes_select, non_exclude_fields, explicit_allowdeny, allowed_languages, custom_options
-                               if ($row['inc_access_lists']==1)        {
-                                       $this->dataLists['modList'].= ','.$row['groupMods'];
-                                       $this->dataLists['tables_select'].= ','.$row['tables_select'];
-                                       $this->dataLists['tables_modify'].= ','.$row['tables_modify'];
-                                       $this->dataLists['pagetypes_select'].= ','.$row['pagetypes_select'];
-                                       $this->dataLists['non_exclude_fields'].= ','.$row['non_exclude_fields'];
-                                       $this->dataLists['explicit_allowdeny'].= ','.$row['explicit_allowdeny'];
-                                       $this->dataLists['allowed_languages'].= ','.$row['allowed_languages'];
-                                       $this->dataLists['custom_options'].= ','.$row['custom_options'];
+                               if ($row['inc_access_lists'] == 1) {
+                                       $this->dataLists['modList'] .= ',' . $row['groupMods'];
+                                       $this->dataLists['tables_select'] .= ',' . $row['tables_select'];
+                                       $this->dataLists['tables_modify'] .= ',' . $row['tables_modify'];
+                                       $this->dataLists['pagetypes_select'] .= ',' . $row['pagetypes_select'];
+                                       $this->dataLists['non_exclude_fields'] .= ',' . $row['non_exclude_fields'];
+                                       $this->dataLists['explicit_allowdeny'] .= ',' . $row['explicit_allowdeny'];
+                                       $this->dataLists['allowed_languages'] .= ',' . $row['allowed_languages'];
+                                       $this->dataLists['custom_options'] .= ',' . $row['custom_options'];
                                }
 
                                }
 
-                               // Setting fileoperation permissions
-                               $this->dataLists['fileoper_perms'] |= (int)$row['fileoper_perms'];
+                                       // Setting fileoperation permissions
+                               $this->dataLists['fileoper_perms'] |= (int) $row['fileoper_perms'];
 
                                        // Setting workspace permissions:
                                $this->dataLists['workspace_perms'] |= $row['workspace_perms'];
 
                                        // If this function is processing the users OWN group-list (not subgroups) AND if the ->firstMainGroup is not set, then the ->firstMainGroup will be set.
 
                                        // Setting workspace permissions:
                                $this->dataLists['workspace_perms'] |= $row['workspace_perms'];
 
                                        // If this function is processing the users OWN group-list (not subgroups) AND if the ->firstMainGroup is not set, then the ->firstMainGroup will be set.
-                               if (!strcmp($idList,'') && !$this->firstMainGroup)      {
-                                       $this->firstMainGroup=$uid;
+                               if (!strcmp($idList, '') && !$this->firstMainGroup) {
+                                       $this->firstMainGroup = $uid;
                                }
                        }
                }
 
                                }
                        }
                }
 
-               // ****************
-               // HOOK: fetchGroups_postProcessing
-               // ****************
-               if (is_array($TYPO3_CONF_VARS['SC_OPTIONS']['t3lib/class.t3lib_userauthgroup.php']['fetchGroups_postProcessing'])) {
-                       foreach($TYPO3_CONF_VARS['SC_OPTIONS']['t3lib/class.t3lib_userauthgroup.php']['fetchGroups_postProcessing'] as $_funcRef) {
+                       // ****************
+                       // HOOK: fetchGroups_postProcessing
+                       // ****************
+               if (is_array($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_userauthgroup.php']['fetchGroups_postProcessing'])) {
+                       foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_userauthgroup.php']['fetchGroups_postProcessing'] as $_funcRef) {
                                $_params = array();
                                t3lib_div::callUserFunction($_funcRef, $_params, $this);
                        }
                                $_params = array();
                                t3lib_div::callUserFunction($_funcRef, $_params, $this);
                        }
@@ -1383,99 +1339,413 @@ class t3lib_userAuthGroup extends t3lib_userAuth {
         * Updates the field be_users.usergroup_cached_list if the groupList of the user has changed/is different from the current list.
         * The field "usergroup_cached_list" contains the list of groups which the user is a member of. After authentication (where these functions are called...) one can depend on this list being a representation of the exact groups/subgroups which the BE_USER has membership with.
         *
         * Updates the field be_users.usergroup_cached_list if the groupList of the user has changed/is different from the current list.
         * The field "usergroup_cached_list" contains the list of groups which the user is a member of. After authentication (where these functions are called...) one can depend on this list being a representation of the exact groups/subgroups which the BE_USER has membership with.
         *
-        * @param       string          The newly compiled group-list which must be compared with the current list in the user record and possibly stored if a difference is detected.
-        * @return      void
+        * @param string $cList The newly compiled group-list which must be compared with the current list in the user record and possibly stored if a difference is detected.
+        * @return void
         * @access private
         */
         * @access private
         */
-       function setCachedList($cList)  {
-               if ((string)$cList != (string)$this->user['usergroup_cached_list'])     {
-                       $GLOBALS['TYPO3_DB']->exec_UPDATEquery('be_users', 'uid='.intval($this->user['uid']), array('usergroup_cached_list' => $cList));
+       function setCachedList($cList) {
+               if ((string) $cList != (string) $this->user['usergroup_cached_list']) {
+                       $GLOBALS['TYPO3_DB']->exec_UPDATEquery('be_users', 'uid=' . intval($this->user['uid']), array('usergroup_cached_list' => $cList));
+               }
+       }
+
+       /***********************
+        * FILE MOUNT FUNCTIONS
+        **********************/
+
+       /**
+        * Sets up all file storages for a user.
+        * Needs to be called AFTER the groups have been loaded.
+        *
+        * @return void
+        */
+       protected function initializeFileStorages() {
+               $this->fileStorages = array();
+               /** @var $storageRepository t3lib_file_Repository_StorageRepository */
+               $storageRepository = t3lib_div::makeInstance('t3lib_file_Repository_StorageRepository');
+
+                       // Admin users have all file storages visible, without any filters
+               if ($this->isAdmin()) {
+                       $storageObjects = $storageRepository->findAll();
+                       foreach ($storageObjects as $storageObject) {
+                               $this->fileStorages[$storageObject->getUid()] = $storageObject;
+                       }
+               } else {
+                               // If userHomePath is set, we attempt to mount it
+                       if ($GLOBALS['TYPO3_CONF_VARS']['BE']['userHomePath']) {
+                               list($userHomeStorageUid, $userHomeFilter) = explode(':', $GLOBALS['TYPO3_CONF_VARS']['BE']['userHomePath'], 2);
+                               $userHomeStorageUid = intval($userHomeStorageUid);
+                               if ($userHomeStorageUid > 0) {
+                                       $storageObject = $storageRepository->findByUid($userHomeStorageUid);
+                                               // First try and mount with [uid]_[username]
+                                       $userHomeFilterIdentifier = $userHomeFilter . $this->user['uid'] . '_' . $this->user['username'] . $GLOBALS['TYPO3_CONF_VARS']['BE']['userUploadDir'];
+                                       $didMount = $storageObject->injectFileMount($userHomeFilterIdentifier);
+                                               // If that failed, try and mount with only [uid]
+                                       if (!$didMount) {
+                                               $userHomeFilterIdentifier = $userHomeFilter . $this->user['uid'] . '_' . $this->user['username'] . $GLOBALS['TYPO3_CONF_VARS']['BE']['userUploadDir'];
+                                               $storageObject->injectFileMount($userHomeFilterIdentifier);
+                                       }
+                                       $this->fileStorages[$storageObject->getUid()] = $storageObject;
+                               }
+                       }
+
+                               // Mount group home-dirs
+                       if (($this->user['options'] & 2) == 2 && $GLOBALS['TYPO3_CONF_VARS']['BE']['groupHomePath'] != '') {
+                                               // If groupHomePath is set, we attempt to mount it
+                               list($groupHomeStorageUid, $groupHomeFilter) = explode(':', $GLOBALS['TYPO3_CONF_VARS']['BE']['groupHomePath'], 2);
+                               $groupHomeStorageUid = intval($groupHomeStorageUid);
+                               if ($groupHomeStorageUid > 0) {
+                                       $storageObject = $storageRepository->findByUid($groupHomeStorageUid);
+                                       foreach ($this->userGroups as $groupUid => $groupData) {
+                                               $groupHomeFilterIdentifier = $groupHomeFilter . $groupData['uid'];
+                                               $storageObject->injectFileMount($groupHomeFilterIdentifier);
+                                       }
+                                       $this->fileStorages[$storageObject->getUid()] = $storageObject;
+                               }
+                       }
+
+                               // Processing filemounts (both from the user and the groups)
+                       $this->dataLists['filemount_list'] = t3lib_div::uniqueList($this->dataLists['filemount_list']);
+                       if ($this->dataLists['filemount_list']) {
+                               $orderBy = $GLOBALS['TCA']['sys_filemounts']['ctrl']['default_sortby'] ? $GLOBALS['TYPO3_DB']->stripOrderBy($GLOBALS['TCA']['sys_filemounts']['ctrl']['default_sortby']) : 'sorting';
+                               $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+                                       '*',
+                                       'sys_filemounts',
+                                       'deleted=0 AND hidden=0 AND pid=0 AND uid IN (' . $this->dataLists['filemount_list'] . ')',
+                                       '',
+                                       $orderBy
+                               );
+
+                               while ($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res)) {
+                                       $storageObject = $storageRepository->findByUid($row['base']);
+                                       $storageObject->injectFileMount($row['path'], $row);
+                                       $this->fileStorages[$storageObject->getUid()] = $storageObject;
+                               }
+                               $GLOBALS['TYPO3_DB']->sql_free_result($res);
+                       }
+               }
+
+                       // Injects the users' permissions to each storage
+               foreach ($this->fileStorages as $storageObject) {
+                       $storagePermissions = $this->getFilePermissionsForStorage($storageObject);
+                       $storageObject->injectUserPermissions($storagePermissions);
+               }
+
+                       // more narrowing down through the workspace
+               $this->initializeFileStoragesForWorkspace();
+
+                       // this has to be called always in order to set certain filters
+                       // @todo Should be in BE_USER object then
+               $GLOBALS['BE_USER']->evaluateUserSpecificFileFilterSettings();
+       }
+
+       /**
+        * Returns an array with the filemounts for the user.
+        * Each filemount is represented with an array of a "name", "path" and "type".
+        * If no filemounts an empty array is returned.
+        *
+        * @api
+        * @return t3lib_file_Storage[]
+        */
+       public function getFileStorages() {
+                       // Initializing file mounts after the groups are fetched
+               if ($this->fileStorages === NULL) {
+                       $this->initializeFileStorages();
+               }
+
+               return $this->fileStorages;
+       }
+
+       /**
+        * Adds filters based on what the user has set
+        * this should be done in this place, and called whenever needed,
+        * but only when needed
+        *
+        * @return void
+        * @todo Should be in BE_USER object then
+        */
+       public function evaluateUserSpecificFileFilterSettings() {
+                       // Add the option for also displaying the non-hidden files
+               if ($this->uc['showHiddenFilesAndFolders']) {
+                       t3lib_file_Utility_FilenameFilters::setShowHiddenFilesAndFolders(TRUE);
+               }
+       }
+
+       /**
+        * Returns the information about file permissions
+        * previously, this was stored in the DB fields (fileoper_perms)
+        * but is now handled via userTSconfig
+        *
+        * permissions.file.default {
+        *              addFile = 1
+        *              readFile = 1
+        *              editFile = 1
+        *              writeFile = 1
+        *              uploadFile = 1
+        *              copyFile = 1
+        *              moveFile = 1
+        *              renameFile = 1
+        *              unzipFile = 1
+        *              removeFile = 1
+        *
+        *              addFolder = 1
+        *              browseFolder = 1
+        *              moveFolder = 1
+        *              writeFolder = 1
+        *              renameFolder = 1
+        *              removeFolder = 1
+        *              removeSubfolders = 1
+        * }
+        *
+        * # overwrite settings for a specific storageObject
+        * permissions.file.storage.StorageUid {
+        *              readFile = 0
+        *              removeSubfolders = 1
+        * }
+        *
+        * Please note that these permissions only apply, if the storage has the
+        * capabilities (browseable, writable), and if the driver allows for writing etc
+        *
+        * @api
+        * @return array
+        */
+       public function getFilePermissions() {
+               if (!isset($this->filePermissions)) {
+                       $defaultOptions = array(
+                               'addFile'  => TRUE,     // new option
+                               'readFile' => TRUE,     // new option, generic check of the user rights
+                               'editFile' => TRUE,     // new option
+                               'writeFile' => TRUE,    // new option, generic check of the user rights
+                               'uploadFile' => TRUE,
+                               'copyFile' => TRUE,
+                               'moveFile' => TRUE,
+                               'renameFile' => TRUE,
+                               'unzipFile' => TRUE,
+                               'removeFile' => TRUE,
+                               'addFolder' => TRUE,
+                               'browseFolder' => TRUE, // new option,, generic check of the user rights
+                               'moveFolder' => TRUE,
+                               'renameFolder' => TRUE,
+                               'writeFolder' => TRUE,  // new option, generic check of the user rights
+                               'removeFolder' => TRUE,
+                               'removeSubfolders' => TRUE      // was "delete recursively" previously
+                       );
+
+                       if (!$this->isAdmin()) {
+                               $this->filePermissions = $this->getTSConfig('permissions.file.default');
+                               if (!is_array($this->filePermissions)) {
+                                       $oldFileOperationPermissions = $this->getFileoperationPermissions();
+
+                                               // Lower permissions if the old file operation permissions are not set
+                                       if ($oldFileOperationPermissions ^ 1) {
+                                               $defaultOptions['addFile'] = FALSE;
+                                               $defaultOptions['uploadFile'] = FALSE;
+                                               $defaultOptions['copyFile'] = FALSE;
+                                               $defaultOptions['moveFile'] = FALSE;
+                                               $defaultOptions['renameFile'] = FALSE;
+                                               $defaultOptions['removeFile'] = FALSE;
+                                       }
+                                       if ($oldFileOperationPermissions ^ 2) {
+                                               $defaultOptions['unzipFile'] = FALSE;
+                                       }
+                                       if ($oldFileOperationPermissions ^ 4) {
+                                               $defaultOptions['addFolder'] = FALSE;
+                                               $defaultOptions['moveFolder'] = FALSE;
+                                               $defaultOptions['renameFolder'] = FALSE;
+                                               $defaultOptions['removeFolder'] = FALSE;
+                                       }
+                                       if ($oldFileOperationPermissions ^ 8) {
+                                               $defaultOptions['copyFolder'] = FALSE;
+                                       }
+                                       if ($oldFileOperationPermissions ^ 16) {
+                                               $defaultOptions['removeSubfolders'] = FALSE;
+                                       }
+                               }
+                       }
+
+                       $this->filePermissions = $defaultOptions;
+               }
+
+               return $this->filePermissions;
+       }
+
+       /**
+        * Gets the file permissions for a storage
+        * by merging any storage-specific permissions for a
+        * storage with the default settings
+        *
+        * @api
+        * @param t3lib_file_Storage $storageObject
+        * @return array
+        */
+       public function getFilePermissionsForStorage(t3lib_file_Storage $storageObject) {
+               $defaultFilePermissions = $this->getFilePermissions();
+               $storageFilePermissions = $this->getTSConfig('permissions.file.storage.' . $storageObject->getUid());
+
+               if (is_array($storageFilePermissions) && count($storageFilePermissions)) {
+                       return array_merge($storageFilePermissions, $defaultFilePermissions);
+               } else {
+                       return $defaultFilePermissions;
+               }
+       }
+
+       /**
+        * Returns a t3lib_file_Folder object that is used for uploading
+        * files by default.
+        * This is used for RTE and its magic images, as well as uploads
+        * in the TCEforms fields, unless otherwise configured (will be added in the future)
+        *
+        * the default upload folder for a user is the defaultFolder on the first
+        * filestorage/filemount that the user can access
+        * however, you can set the users' upload folder like this:
+        *
+        *     options.defaultUploadFolder = 3:myfolder/yourfolder/
+        *
+        * @return t3lib_file_Folder|boolean The default upload folder for this user
+        */
+       public function getDefaultUploadFolder() {
+               $uploadFolder = $this->getTSConfigVal('options.defaultUploadFolder');
+               if ($uploadFolder) {
+                       $uploadFolder = t3lib_file_Factory::getInstance()->getFolderObjectFromCombinedIdentifier($uploadFolder);
+               } else {
+                       $storages = $this->getFileStorages();
+                       if (count($storages) > 0) {
+                               /** @var $firstStorage t3lib_file_Storage */
+                               $firstStorage = reset($storages);
+                               $uploadFolder = $firstStorage->getDefaultFolder();
+                       }
+               }
+
+               if ($uploadFolder instanceof t3lib_file_Folder) {
+                       return $uploadFolder;
+               } else {
+                       return FALSE;
+               }
+       }
+
+       /**
+        * Returns an integer bitmask that represents the permissions for file operations.
+        * Permissions of the user and groups the user is a member of were combined by a logical OR.
+        *
+        * Meaning of each bit:
+        *       1 - Files: Upload,Copy,Move,Delete,Rename
+        *       2 - Files: Unzip
+        *       4 - Directory: Move,Delete,Rename,New
+        *       8 - Directory: Copy
+        *       16 - Directory: Delete recursively (rm -Rf)
+        *
+        * @return integer File operation permission bitmask
+        * @deprecated since TYPO3 6.0, use the TSconfig settings instead
+        */
+       public function getFileoperationPermissions() {
+               t3lib_div::logDeprecatedFunction();
+
+               if ($this->isAdmin()) {
+                       return 31;
+               } else {
+                       return $this->groupData['fileoper_perms'];
                }
        }
 
        /**
         * Adds a filemount to the users array of filemounts, $this->groupData['filemounts'][hash_key] = Array ('name'=>$name, 'path'=>$path, 'type'=>$type);
         * Is a part of the authentication proces of the user.
                }
        }
 
        /**
         * Adds a filemount to the users array of filemounts, $this->groupData['filemounts'][hash_key] = Array ('name'=>$name, 'path'=>$path, 'type'=>$type);
         * Is a part of the authentication proces of the user.
-        * A final requirement for a path being mounted is that a) it MUST return true on is_dir(), b) must contain either PATH_site+'fileadminDir' OR 'lockRootPath' - if lockRootPath is set - as first part of string!
+        * A final requirement for a path being mounted is that a) it MUST return TRUE on is_dir(), b) must contain either PATH_site+'fileadminDir' OR 'lockRootPath' - if lockRootPath is set - as first part of string!
         * Paths in the mounted information will always be absolute and have a trailing slash.
         *
         * Paths in the mounted information will always be absolute and have a trailing slash.
         *
-        * @param       string          $title will be the (root)name of the filemount in the folder tree
-        * @param       string          $altTitle will be the (root)name of the filemount IF $title is not true (blank or zero)
-        * @param       string          $path is the path which should be mounted. Will accept backslash in paths on windows servers (will substituted with forward slash). The path should be 1) relative to TYPO3_CONF_VARS[BE][fileadminDir] if $webspace is set, otherwise absolute.
-        * @param       boolean         If $webspace is set, the $path is relative to 'fileadminDir' in TYPO3_CONF_VARS, otherwise $path is absolute. 'fileadminDir' must be set to allow mounting of relative paths.
-        * @param       string          Type of filemount; Can be blank (regular) or "user" / "group" (for user and group filemounts presumably). Probably sets the icon first and foremost.
-        * @return      boolean         Returns "1" if the requested filemount was mounted, otherwise no return value.
+        * @param string $title Will be the (root)name of the filemount in the folder tree
+        * @param string $altTitle Will be the (root)name of the filemount IF $title is not TRUE (blank or zero)
+        * @param string $path Is the path which should be mounted. Will accept backslash in paths on windows servers (will substituted with forward slash). The path should be 1) relative to TYPO3_CONF_VARS[BE][fileadminDir] if $webspace is set, otherwise absolute.
+        * @param boolean $webspace If $webspace is set, the $path is relative to 'fileadminDir' in TYPO3_CONF_VARS, otherwise $path is absolute. 'fileadminDir' must be set to allow mounting of relative paths.
+        * @param string $type Type of filemount; Can be blank (regular) or "user" / "group" (for user and group filemounts presumably). Probably sets the icon first and foremost.
+        * @return boolean Returns "1" if the requested filemount was mounted, otherwise no return value.
+        * @deprecated since TYPO3 6.0, will be removed in TYPO3 6.1, all data is stored in $this->fileStorages now, see initializeFileStorages()
         * @access private
         */
         * @access private
         */
-       function addFileMount($title, $altTitle, $path, $webspace, $type)       {
-                       // Return false if fileadminDir is not set and we try to mount a relative path
-               if ($webspace && !$GLOBALS['TYPO3_CONF_VARS']['BE']['fileadminDir'])    return false;
+       function addFileMount($title, $altTitle, $path, $webspace, $type) {
+               t3lib_div::logDeprecatedFunction();
+
+                       // Return FALSE if fileadminDir is not set and we try to mount a relative path
+               if ($webspace && !$GLOBALS['TYPO3_CONF_VARS']['BE']['fileadminDir']) {
+                       return FALSE;
+               }
 
                        // Trimming and pre-processing
 
                        // Trimming and pre-processing
-               $path=trim($path);
-               if ($this->OS=='WIN')   {               // with WINDOWS convert backslash to slash!!
-                       $path=str_replace('\\','/',$path);
+               $path = trim($path);
+                       // with WINDOWS convert backslash to slash!!
+               if ($this->OS == 'WIN') {
+                       $path = str_replace('\\', '/', $path);
                }
                }
-                       // If the path is true and validates as a valid path string:
-               if ($path && t3lib_div::validPathStr($path))    {
+                       // If the path is TRUE and validates as a valid path string:
+               if ($path && t3lib_div::validPathStr($path)) {
                                // normalize path: remove leading '/' and './', and trailing '/' and '/.'
                                // normalize path: remove leading '/' and './', and trailing '/' and '/.'
-                       $path=trim($path);
-                       $path=preg_replace('#^\.?/|/\.?$#','',$path);
-
-                       if ($path)      {       // there must be some chars in the path
-                               $fdir=PATH_site.$GLOBALS['TYPO3_CONF_VARS']['BE']['fileadminDir'];      // fileadmin dir, absolute
-                               if ($webspace)  {
-                                       $path=$fdir.$path;      // PATH_site + fileadmin dir is prepended
+                       $path = trim($path);
+                       $path = preg_replace('#^\.?/|/\.?$#', '', $path);
+
+                               // There must be some chars in the path
+                       if ($path) {
+                                       // Fileadmin dir, absolute
+                               $fdir = PATH_site . $GLOBALS['TYPO3_CONF_VARS']['BE']['fileadminDir'];
+                               if ($webspace) {
+                                       $path = $fdir . $path; // PATH_site + fileadmin dir is prepended
                                } else {
                                } else {
-                                       if ($this->OS!='WIN')   {               // with WINDOWS no prepending!!
-                                               $path='/'.$path;        // root-level is the start...
+                                               // With WINDOWS no prepending!!
+                                       if ($this->OS != 'WIN') {
+                                                       // With WINDOWS no prepending!!
+                                               $path = '/' . $path;
                                        }
                                }
                                        }
                                }
-                               $path.='/';
+                               $path .= '/';
 
                                        // We now have a path with slash after and slash before (if unix)
                                if (@is_dir($path) &&
 
                                        // We now have a path with slash after and slash before (if unix)
                                if (@is_dir($path) &&
-                                       (($GLOBALS['TYPO3_CONF_VARS']['BE']['lockRootPath'] && t3lib_div::isFirstPartOfStr($path,$GLOBALS['TYPO3_CONF_VARS']['BE']['lockRootPath'])) || t3lib_div::isFirstPartOfStr($path,$fdir)))      {
-                                                       // Alternative title?
-                                               $name = $title ? $title : $altTitle;
-                                                       // Adds the filemount. The same filemount with same name, type and path cannot be set up twice because of the hash string used as key.
-                                               $this->groupData['filemounts'][md5($name.'|'.$path.'|'.$type)] = Array('name'=>$name, 'path'=>$path, 'type'=>$type);
-                                                       // Return true - went well, success!
-                                               return 1;
+                                       (($GLOBALS['TYPO3_CONF_VARS']['BE']['lockRootPath'] && t3lib_div::isFirstPartOfStr($path, $GLOBALS['TYPO3_CONF_VARS']['BE']['lockRootPath'])) || t3lib_div::isFirstPartOfStr($path, $fdir))) {
+                                               // Alternative title?
+                                       $name = $title ? $title : $altTitle;
+                                               // Adds the filemount. The same filemount with same name, type and path cannot be set up twice because of the hash string used as key.
+                                       $this->groupData['filemounts'][md5($name . '|' . $path . '|' . $type)] = array('name' => $name, 'path' => $path, 'type' => $type);
+                                               // Return TRUE - went well, success!
+                                       return 1;
                                }
                        }
                }
        }
 
                                }
                        }
                }
        }
 
+
+       /**
+        * Returns an array with the filemounts for the user. Each filemount is represented with an array of a "name", "path" and "type".
+        * If no filemounts an empty array is returned.
+        *
+        * @return array
+        * @deprecated since TYPO3 6.0, will be removed in TYPO3 6.1 as getFileStorages() should be the one to be used
+        */
+       function returnFilemounts() {
+               t3lib_div::logDeprecatedFunction();
+
+                       // initialize the file storages in order to set some default settings in any time
+               $this->getFileStorages();
+
+               return $this->groupData['filemounts'];
+       }
+
        /**
         * Creates a TypoScript comment with the string text inside.
         *
        /**
         * Creates a TypoScript comment with the string text inside.
         *
-        * @param       string          The text to wrap in comment prefixes and delimiters.
-        * @return      string          TypoScript comment with the string text inside.
+        * @param string $str The text to wrap in comment prefixes and delimiters.
+        * @return string TypoScript comment with the string text inside.
         */
         */
-       function addTScomment($str)     {
+       function addTScomment($str) {
                $delimiter = '# ***********************************************';
 
                $delimiter = '# ***********************************************';
 
-               $out = $delimiter.chr(10);
-               $lines = t3lib_div::trimExplode(chr(10),$str);
-               foreach($lines as $v)   {
-                       $out.= '# '.$v.chr(10);
+               $out = $delimiter . LF;
+               $lines = t3lib_div::trimExplode(LF, $str);
+               foreach ($lines as $v) {
+                       $out .= '# ' . $v . LF;
                }
                }
-               $out.= $delimiter.chr(10);
+               $out .= $delimiter . LF;
                return $out;
        }
 
                return $out;
        }
 
-
-
-
-
-
-
-
-
-
-
-
        /************************************
         *
         * Workspaces
        /************************************
         *
         * Workspaces
@@ -1486,115 +1756,165 @@ class t3lib_userAuthGroup extends t3lib_userAuth {
         * Initializing workspace.
         * Called from within this function, see fetchGroupData()
         *
         * Initializing workspace.
         * Called from within this function, see fetchGroupData()
         *
-        * @return      void
+        * @return void
         * @see fetchGroupData()
         */
         * @see fetchGroupData()
         */
-       function workspaceInit()        {
+       function workspaceInit() {
 
                        // Initializing workspace by evaluating and setting the workspace, possibly updating it in the user record!
                $this->setWorkspace($this->user['workspace_id']);
 
 
                        // Initializing workspace by evaluating and setting the workspace, possibly updating it in the user record!
                $this->setWorkspace($this->user['workspace_id']);
 
-                       // Setting up the db mount points of the (custom) workspace, if any:
-               if ($this->workspace>0 && trim($this->workspaceRec['db_mountpoints'])!=='')     {
+                       // Limiting the DB mountpoints if there any selected in the workspace record
+               $this->initializeDbMountpointsInWorkspace();
+
+               if ($allowed_languages = $this->getTSConfigVal('options.workspaces.allowed_languages.' . $this->workspace)) {
+                       $this->groupData['allowed_languages'] = $allowed_languages;
+                       $this->groupData['allowed_languages'] = t3lib_div::uniqueList($this->groupData['allowed_languages']);
+               }
+       }
 
 
-                               // Initialize:
-                       $newMounts = array();
-                       $readPerms = '1=1'; // Notice: We cannot call $this->getPagePermsClause(1); as usual because the group-list is not available at this point. But bypassing is fine because all we want here is check if the workspace mounts are inside the current webmounts rootline. The actual permission checking on page level is done elsewhere as usual anyway before the page tree is rendered.
+       /**
+        * Limiting the DB mountpoints if there any selected in the workspace record
+        *
+        * @return void
+        */
+       protected function initializeDbMountpointsInWorkspace() {
+               $dbMountpoints = trim($this->workspaceRec['db_mountpoints']);
+               if ($this->workspace > 0 && $dbMountpoints != '') {
+                       $filteredDbMountpoints = array();
+                               // Notice: We cannot call $this->getPagePermsClause(1); as usual because the group-list is not available at this point. But bypassing is fine because all we want here is check if the workspace mounts are inside the current webmounts rootline.
+                               // The actual permission checking on page level is done elsewhere as usual anyway before the page tree is rendered.
+                       $readPerms = '1=1';
 
                                // Traverse mount points of the
 
                                // Traverse mount points of the
-                       $mountPoints = t3lib_div::intExplode(',',$this->workspaceRec['db_mountpoints']);
-                       foreach($mountPoints as $mpId)  {
-                               if ($this->isInWebMount($mpId,$readPerms))      {
-                                       $newMounts[] = $mpId;
+                       $dbMountpoints = t3lib_div::intExplode(',', $dbMountpoints);
+                       foreach ($dbMountpoints as $mpId) {
+                               if ($this->isInWebMount($mpId, $readPerms)) {
+                                       $filteredDbMountpoints[] = $mpId;
                                }
                        }
 
                                // Re-insert webmounts:
                                }
                        }
 
                                // Re-insert webmounts:
-                       $this->groupData['webmounts'] = implode(',',array_unique($newMounts));
+                       $filteredDbMountpoints = array_unique($filteredDbMountpoints);
+                       $this->groupData['webmounts'] = implode(',', $filteredDbMountpoints);
                }
                }
+       }
 
 
-                       // Setting up the file mount points of the (custom) workspace, if any:
-               if ($this->workspace!==0)       $this->groupData['filemounts'] = array();
-               if ($this->workspace>0 && trim($this->workspaceRec['file_mountpoints'])!=='')   {
+       /**
+        * Adds more limitations for users who are no admins
+        * this was previously in workspaceInit but has now been moved to "
+        *
+        * @return void
+        */
+       protected function initializeFileStoragesForWorkspace() {
+                       // Filtering the file mountpoints
+                       // if there some selected in the workspace record
+               if ($this->workspace > 0) {
+                       $storageFiltersInWorkspace = trim($this->workspaceRec['file_mountpoints']);
+
+                               // no custom filemounts that should serve as filter or user is admin
+                               // so all user mountpoints are re-applied
+                       if (!$this->isAdmin() && $storageFiltersInWorkspace !== '') {
+                                       // empty the fileStorages (will be re-applied later)
+                               $existingFileStoragesOfUser = $this->fileStorages;
+                               $this->fileStorages = array();
+
+                               $storageRepository = t3lib_div::makeInstance('t3lib_file_Repository_StorageRepository');
+
+                                       // Fetching all filemounts from the workspace
+                               $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
+                                       '*',
+                                       'sys_filemounts',
+                                       'deleted = 0 AND hidden = 0 AND pid = 0 AND uid IN (' . $GLOBALS['TYPO3_DB']->cleanIntList($storageFiltersInWorkspace) . ')'
+                               );
 
 
-                               // Processing filemounts
-                       $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery('*', 'sys_filemounts', 'deleted=0 AND hidden=0 AND pid=0 AND uid IN ('.$GLOBALS['TYPO3_DB']->cleanIntList($this->workspaceRec['file_mountpoints']).')');
-                       while ($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res))      {
-                               $this->addFileMount($row['title'], $row['path'], $row['path'], $row['base']?1:0, '');
+                                       // add every filemount of this workspace record
+                               while ($row = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res)) {
+                                               // get the added entry, and check if it was in the users' original filemounts
+                                               // if not, remove it from the new filemount list again
+                                               // see self::addFileMount
+
+                                               // TODO: check if the filter is narrowing down the existing user
+                                       $storageObject = $storageRepository->findByUid($row['base']);
+                                       if (isset($existingFileStoragesOfUser[$storageObject->getUid()])) {
+                                               $storageObject->injectFileMount($row['path']);
+                                               $this->fileStorages[$storageObject->getUid()] = $storageObject;
+                                       }
+                               }
+                               $GLOBALS['TYPO3_DB']->sql_free_result($res);
                        }
                }
                        }
                }
-
-               if ($allowed_languages = $this->getTSConfigVal('options.workspaces.allowed_languages.'.$this->workspace))       {
-                       $this->groupData['allowed_languages'] = $allowed_languages;
-                       $this->groupData['allowed_languages'] = t3lib_div::uniqueList($this->groupData['allowed_languages']);
-               }
        }
 
        /**
         * Checking if a workspace is allowed for backend user
         *
        }
 
        /**
         * Checking if a workspace is allowed for backend user
         *
-        * @param       mixed           If integer, workspace record is looked up, if array it is seen as a Workspace record with at least uid, title, members and adminusers columns. Can be faked for workspaces uid 0 and -1 (online and offline)
-        * @param       string          List of fields to select. Default fields are: uid,title,adminusers,members,reviewers,publish_access,stagechg_notification
-        * @return      array           TRUE if access. Output will also show how access was granted. Admin users will have a true output regardless of input.
+        * @param mixed $wsRec If integer, workspace record is looked up, if array it is seen as a Workspace record with at least uid, title, members and adminusers columns. Can be faked for workspaces uid 0 and -1 (online and offline)
+        * @param string $fields List of fields to select. Default fields are: uid,title,adminusers,members,reviewers,publish_access,stagechg_notification
+        * @return array TRUE if access. Output will also show how access was granted. Admin users will have a true output regardless of input.
         */
         */
-       function checkWorkspace($wsRec,$fields='uid,title,adminusers,members,reviewers,publish_access,stagechg_notification')   {
+       function checkWorkspace($wsRec, $fields = 'uid,title,adminusers,members,reviewers,publish_access,stagechg_notification') {
                $retVal = FALSE;
 
                        // If not array, look up workspace record:
                $retVal = FALSE;
 
                        // If not array, look up workspace record:
-               if (!is_array($wsRec))  {
-                       switch((string)$wsRec)  {
+               if (!is_array($wsRec)) {
+                       switch ((string) $wsRec) {
                                case '0':
                                case '0':
-                               case '-1':
                                        $wsRec = array('uid' => $wsRec);
                                break;
                                default:
                                        $wsRec = array('uid' => $wsRec);
                                break;
                                default:
-                                       list($wsRec) = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows(
-                                               $fields,
-                                               'sys_workspace',
-                                               'pid=0 AND uid='.intval($wsRec).
+                                       if (t3lib_extMgm::isLoaded('workspaces')) {
+                                               $wsRec = $GLOBALS['TYPO3_DB']->exec_SELECTgetSingleRow(
+                                                       $fields,
+                                                       'sys_workspace',
+                                                       'pid=0 AND uid=' . intval($wsRec) .
                                                        t3lib_BEfunc::deleteClause('sys_workspace'),
                                                        t3lib_BEfunc::deleteClause('sys_workspace'),
-                                               '',
-                                               'title'
-                                       );
+                                                       '',
+                                                       'title'
+                                               );
+                                       }
                                break;
                        }
                }
 
                        // If wsRec is set to an array, evaluate it:
                                break;
                        }
                }
 
                        // If wsRec is set to an array, evaluate it:
-               if (is_array($wsRec))   {
-                       if ($this->isAdmin())   {
-                               return array_merge($wsRec,array('_ACCESS' => 'admin'));
+               if (is_array($wsRec)) {
+                       if ($this->isAdmin()) {
+                               return array_merge($wsRec, array('_ACCESS' => 'admin'));
                        } else {
 
                        } else {
 
-                               switch((string)$wsRec['uid'])   {
+                               switch ((string) $wsRec['uid']) {
                                        case '0':
                                        case '0':
-                                               $retVal = ($this->groupData['workspace_perms']&1) ? array_merge($wsRec,array('_ACCESS' => 'online')) : FALSE;
-                                       break;
-                                       case '-1':
-                                               $retVal = ($this->groupData['workspace_perms']&2) ? array_merge($wsRec,array('_ACCESS' => 'offline')) : FALSE;
+                                               $retVal = ($this->groupData['workspace_perms'] & 1) ? array_merge($wsRec, array('_ACCESS' => 'online')) : FALSE;
                                        break;
                                        default:
                                                        // Checking if the guy is admin:
                                        break;
                                        default:
                                                        // Checking if the guy is admin:
-                                               if (t3lib_div::inList($wsRec['adminusers'],$this->user['uid'])) {
+                                               if (t3lib_div::inList($wsRec['adminusers'], 'be_users_' . $this->user['uid'])) {
                                                        return array_merge($wsRec, array('_ACCESS' => 'owner'));
                                                }
                                                        return array_merge($wsRec, array('_ACCESS' => 'owner'));
                                                }
+                                                       // Checking if he is owner through a user group of his:
+                                               foreach ($this->userGroupsUID as $groupUid) {
+                                                       if (t3lib_div::inList($wsRec['adminusers'], 'be_groups_' . $groupUid)) {
+                                                               return array_merge($wsRec, array('_ACCESS' => 'owner'));
+                                                       }
+                                               }
                                                        // Checking if he is reviewer user:
                                                        // Checking if he is reviewer user:
-                                               if (t3lib_div::inList($wsRec['reviewers'],'be_users_'.$this->user['uid']))      {
+                                               if (t3lib_div::inList($wsRec['reviewers'], 'be_users_' . $this->user['uid'])) {
                                                        return array_merge($wsRec, array('_ACCESS' => 'reviewer'));
                                                }
                                                        // Checking if he is reviewer through a user group of his:
                                                        return array_merge($wsRec, array('_ACCESS' => 'reviewer'));
                                                }
                                                        // Checking if he is reviewer through a user group of his:
-                                               foreach($this->userGroupsUID as $groupUid)      {
-                                                       if (t3lib_div::inList($wsRec['reviewers'],'be_groups_'.$groupUid))      {
+                                               foreach ($this->userGroupsUID as $groupUid) {
+                                                       if (t3lib_div::inList($wsRec['reviewers'], 'be_groups_' . $groupUid)) {
                                                                return array_merge($wsRec, array('_ACCESS' => 'reviewer'));
                                                        }
                                                }
                                                        // Checking if he is member as user:
                                                                return array_merge($wsRec, array('_ACCESS' => 'reviewer'));
                                                        }
                                                }
                                                        // Checking if he is member as user:
-                                               if (t3lib_div::inList($wsRec['members'],'be_users_'.$this->user['uid']))        {
+                                               if (t3lib_div::inList($wsRec['members'], 'be_users_' . $this->user['uid'])) {
                                                        return array_merge($wsRec, array('_ACCESS' => 'member'));
                                                }
                                                        // Checking if he is member through a user group of his:
                                                        return array_merge($wsRec, array('_ACCESS' => 'member'));
                                                }
                                                        // Checking if he is member through a user group of his:
-                                               foreach($this->userGroupsUID as $groupUid)      {
-                                                       if (t3lib_div::inList($wsRec['members'],'be_groups_'.$groupUid))        {
+                                               foreach ($this->userGroupsUID as $groupUid) {
+                                                       if (t3lib_div::inList($wsRec['members'], 'be_groups_' . $groupUid)) {
                                                                return array_merge($wsRec, array('_ACCESS' => 'member'));
                                                        }
                                                }
                                                                return array_merge($wsRec, array('_ACCESS' => 'member'));
                                                        }
                                                }
@@ -1609,11 +1929,11 @@ class t3lib_userAuthGroup extends t3lib_userAuth {
        /**
         * Uses checkWorkspace() to check if current workspace is available for user. This function caches the result and so can be called many times with no performance loss.
         *
        /**
         * Uses checkWorkspace() to check if current workspace is available for user. This function caches the result and so can be called many times with no performance loss.
         *
-        * @return      array           See checkWorkspace()
+        * @return array See checkWorkspace()
         * @see checkWorkspace()
         */
         * @see checkWorkspace()
         */
-       function checkWorkspaceCurrent()        {
-               if (!isset($this->checkWorkspaceCurrent_cache)) {
+       function checkWorkspaceCurrent() {
+               if (!isset($this->checkWorkspaceCurrent_cache)) {
                        $this->checkWorkspaceCurrent_cache = $this->checkWorkspace($this->workspace);
                }
                return $this->checkWorkspaceCurrent_cache;
                        $this->checkWorkspaceCurrent_cache = $this->checkWorkspace($this->workspace);
                }
                return $this->checkWorkspaceCurrent_cache;
@@ -1622,74 +1942,69 @@ class t3lib_userAuthGroup extends t3lib_userAuth {
        /**
         * Setting workspace ID
         *
        /**
         * Setting workspace ID
         *
-        * @param       integer         ID of workspace to set for backend user. If not valid the default workspace for BE user is found and set.
-        * @return      void
+        * @param integer $workspaceId ID of workspace to set for backend user. If not valid the default workspace for BE user is found and set.
+        * @return void
         */
         */
-       function setWorkspace($workspaceId)     {
+       function setWorkspace($workspaceId) {
 
                        // Check workspace validity and if not found, revert to default workspace.
 
                        // Check workspace validity and if not found, revert to default workspace.
-               if ($this->workspaceRec = $this->checkWorkspace($workspaceId,'*'))      {
+               if ($this->workspaceRec = $this->checkWorkspace($workspaceId, '*')) {
                                // Set workspace ID internally
                                // Set workspace ID internally
-                       $this->workspace = (int)$workspaceId;
+                       $this->workspace = (int) $workspaceId;
                } else {
                } else {
-                       $this->workspace = (int)$this->getDefaultWorkspace();
-                       $this->workspaceRec = $this->checkWorkspace($this->workspace,'*');
+                       $this->workspace = (int) $this->getDefaultWorkspace();
+                       $this->workspaceRec = $this->checkWorkspace($this->workspace, '*');
                }
 
                        // Unset access cache:
                unset($this->checkWorkspaceCurrent_cache);
 
                        // If ID is different from the stored one, change it:
                }
 
                        // Unset access cache:
                unset($this->checkWorkspaceCurrent_cache);
 
                        // If ID is different from the stored one, change it:
-               if (strcmp($this->workspace, $this->user['workspace_id']))      {
+               if (strcmp($this->workspace, $this->user['workspace_id'])) {
                        $this->user['workspace_id'] = $this->workspace;
                        $this->user['workspace_id'] = $this->workspace;
-                       $GLOBALS['TYPO3_DB']->exec_UPDATEquery('be_users','uid='.intval($this->user['uid']),array('workspace_id' => $this->user['workspace_id']));
-                       $this->simplelog('User changed workspace to "'.$this->workspace.'"');
+                       $GLOBALS['TYPO3_DB']->exec_UPDATEquery('be_users', 'uid=' . intval($this->user['uid']), array('workspace_id' => $this->user['workspace_id']));
+                       $this->simplelog('User changed workspace to "' . $this->workspace . '"');
                }
        }
 
        /**
         * Setting workspace preview state for user:
         *
                }
        }
 
        /**
         * Setting workspace preview state for user:
         *
-        * @param       boolean         State of user preview.
-        * @return      void
+        * @param boolean $previewState State of user preview.
+        * @return void
         */
         */
-       function setWorkspacePreview($previewState)     {
+       function setWorkspacePreview($previewState) {
                $this->user['workspace_preview'] = $previewState;
                $this->user['workspace_preview'] = $previewState;
-               $GLOBALS['TYPO3_DB']->exec_UPDATEquery('be_users','uid='.intval($this->user['uid']),array('workspace_preview' => $this->user['workspace_preview']));
+               $GLOBALS['TYPO3_DB']->exec_UPDATEquery('be_users', 'uid=' . intval($this->user['uid']), array('workspace_preview' => $this->user['workspace_preview']));
        }
 
        /**
        }
 
        /**
-        * Return default workspace ID for user
+        * Return default workspace ID for user,
+        * If EXT:workspaces is not installed the user will be pushed the the
+        * Live workspace
         *
         *
-        * @return      integer         Default workspace id. If no workspace is available it will be "-99"
+        * @return integer Default workspace id. If no workspace is available it will be "-99"
         */
         */
-       function getDefaultWorkspace()  {
-
-               if ($this->checkWorkspace(0))   {       // Check online
-                       return 0;
-               } elseif ($this->checkWorkspace(-1))    {       // Check offline
-                       return -1;
-               } else {        // Traverse custom workspaces:
-                       $workspaces = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows('uid,title,adminusers,members,reviewers','sys_workspace','pid=0'.t3lib_BEfunc::deleteClause('sys_workspace'),'','title');
-                       foreach($workspaces as $rec)    {
-                               if ($this->checkWorkspace($rec))        {
-                                       return $rec['uid'];
+       function getDefaultWorkspace() {
+
+               $defaultWorkspace = -99;
+
+               if (!t3lib_extMgm::isLoaded('workspaces') || $this->checkWorkspace(0)) { // Check online
+                       $defaultWorkspace = 0;
+               } elseif ($this->checkWorkspace(-1)) { // Check offline
+                       $defaultWorkspace = -1;
+               } elseif (t3lib_extMgm::isLoaded('workspaces')) { // Traverse custom workspaces:
+                       $workspaces = $GLOBALS['TYPO3_DB']->exec_SELECTgetRows('uid,title,adminusers,members,reviewers', 'sys_workspace', 'pid=0' . t3lib_BEfunc::deleteClause('sys_workspace'), '', 'title');
+                       foreach ($workspaces as $rec) {
+                               if ($this->checkWorkspace($rec)) {
+                                       $defaultWorkspace = $rec['uid'];
+                                       break;
                                }
                        }
                }
                                }
                        }
                }
-               return -99;
+               return $defaultWorkspace;
        }
 
        }
 
-
-
-
-
-
-
-
-
-
-
        /************************************
         *
         * Logging
        /************************************
         *
         * Logging
@@ -1700,23 +2015,23 @@ class t3lib_userAuthGroup extends t3lib_userAuth {
         * Writes an entry in the logfile/table
         * Documentation in "TYPO3 Core API"
         *
         * Writes an entry in the logfile/table
         * Documentation in "TYPO3 Core API"
         *
-        * @param       integer         Denotes which module that has submitted the entry. See "TYPO3 Core API". Use "4" for extensions.
-        * @param       integer         Denotes which specific operation that wrote the entry. Use "0" when no sub-categorizing applies
-        * @param       integer         Flag. 0 = message, 1 = error (user problem), 2 = System Error (which should not happen), 3 = security notice (admin)
-        * @param       integer         The message number. Specific for each $type and $action. This will make it possible to translate errormessages to other languages
-        * @param       string          Default text that follows the message (in english!). Possibly translated by identification through type/action/details_nr
-        * @param       array           Data that follows the log. Might be used to carry special information. If an array the first 5 entries (0-4) will be sprintf'ed with the details-text
-        * @param       string          Table name. Special field used by tce_main.php.
-        * @param       integer         Record UID. Special field used by tce_main.php.
-        * @param       integer         Record PID. Special field used by tce_main.php. OBSOLETE
-        * @param       integer         The page_uid (pid) where the event occurred. Used to select log-content for specific pages.
-        * @param       string          Special field used by tce_main.php. NEWid string of newly created records.
-        * @param       integer         Alternative Backend User ID (used for logging login actions where this is not yet known).
-        * @return      integer         Log entry ID.
+        * @param integer $type Denotes which module that has submitted the entry. See "TYPO3 Core API". Use "4" for extensions.
+        * @param integer $action Denotes which specific operation that wrote the entry. Use "0" when no sub-categorizing applies
+        * @param integer $error Flag. 0 = message, 1 = error (user problem), 2 = System Error (which should not happen), 3 = security notice (admin)
+        * @param integer $details_nr The message number. Specific for each $type and $action. This will make it possible to translate errormessages to other languages
+        * @param string $details Default text that follows the message (in english!). Possibly translated by identification through type/action/details_nr
+        * @param array $data Data that follows the log. Might be used to carry special information. If an array the first 5 entries (0-4) will be sprintf'ed with the details-text
+        * @param string $tablename Table name. Special field used by tce_main.php.
+        * @param integer $recuid Record UID. Special field used by tce_main.php.
+        * @param integer $recpid Record PID. Special field used by tce_main.php. OBSOLETE
+        * @param integer $event_pid The page_uid (pid) where the event occurred. Used to select log-content for specific pages.
+        * @param string $NEWid Special field used by tce_main.php. NEWid string of newly created records.
+        * @param integer $userId Alternative Backend User ID (used for logging login actions where this is not yet known).
+        * @return integer Log entry ID.
         */
         */
-       function writelog($type,$action,$error,$details_nr,$details,$data,$tablename='',$recuid='',$recpid='',$event_pid=-1,$NEWid='',$userId=0) {
+       function writelog($type, $action, $error, $details_nr, $details, $data, $tablename = '', $recuid = '', $recpid = '', $event_pid = -1, $NEWid = '', $userId = 0) {
 
 
-               $fields_values = Array (
+               $fields_values = array(
                        'userid' => $userId ? $userId : intval($this->user['uid']),
                        'type' => intval($type),
                        'action' => intval($action),
                        'userid' => $userId ? $userId : intval($this->user['uid']),
                        'type' => intval($type),
                        'action' => intval($action),
@@ -1726,7 +2041,6 @@ class t3lib_userAuthGroup extends t3lib_userAuth {
                        'log_data' => serialize($data),
                        'tablename' => $tablename,
                        'recuid' => intval($recuid),
                        'log_data' => serialize($data),
                        'tablename' => $tablename,
                        'recuid' => intval($recuid),
-#                      'recpid' => intval($recpid),
                        'IP' => t3lib_div::getIndpEnv('REMOTE_ADDR'),
                        'tstamp' => $GLOBALS['EXEC_TIME'],
                        'event_pid' => intval($event_pid),
                        'IP' => t3lib_div::getIndpEnv('REMOTE_ADDR'),
                        'tstamp' => $GLOBALS['EXEC_TIME'],
                        'event_pid' => intval($event_pid),
@@ -1741,18 +2055,18 @@ class t3lib_userAuthGroup extends t3lib_userAuth {
        /**
         * Simple logging function
         *
        /**
         * Simple logging function
         *
-        * @param       string          Log message
-        * @param       string          Option extension key / module name
-        * @param       integer         Error level. 0 = message, 1 = error (user problem), 2 = System Error (which should not happen), 3 = security notice (admin)
-        * @return      integer         Log entry UID
+        * @param string $message Log message
+        * @param string $extKey Option extension key / module name
+        * @param integer $error Error level. 0 = message, 1 = error (user problem), 2 = System Error (which should not happen), 3 = security notice (admin)
+        * @return integer Log entry UID
         */
         */
-       function simplelog($message, $extKey='', $error=0)      {
+       function simplelog($message, $extKey = '', $error = 0) {
                return $this->writelog(
                        4,
                        0,
                        $error,
                        0,
                return $this->writelog(
                        4,
                        0,
                        $error,
                        0,
-                       ($extKey?'['.$extKey.'] ':'').$message,
+                       ($extKey ? '[' . $extKey . '] ' : '') . $message,
                        array()
                );
        }
                        array()
                );
        }
@@ -1761,68 +2075,68 @@ class t3lib_userAuthGroup extends t3lib_userAuth {
         * Sends a warning to $email if there has been a certain amount of failed logins during a period.
         * If a login fails, this function is called. It will look up the sys_log to see if there has been more than $max failed logins the last $secondsBack seconds (default 3600). If so, an email with a warning is sent to $email.
         *
         * Sends a warning to $email if there has been a certain amount of failed logins during a period.
         * If a login fails, this function is called. It will look up the sys_log to see if there has been more than $max failed logins the last $secondsBack seconds (default 3600). If so, an email with a warning is sent to $email.
         *
-        * @param       string          Email address
-        * @param       integer         Number of sections back in time to check. This is a kind of limit for how many failures an hour for instance.
-        * @param       integer         Max allowed failures before a warning mail is sent
-        * @return      void
+        * @param string $email Email address
+        * @param integer $secondsBack Number of sections back in time to check. This is a kind of limit for how many failures an hour for instance.
+        * @param integer $max Max allowed failures before a warning mail is sent
+        * @return void
         * @access private
         */
         * @access private
         */
-       function checkLogFailures($email, $secondsBack=3600, $max=3)    {
+       function checkLogFailures($email, $secondsBack = 3600, $max = 3) {
 
 
-               if ($email)     {
+               if ($email) {
 
 
-                               // get last flag set in the log for sending
+                               // Get last flag set in the log for sending
                        $theTimeBack = $GLOBALS['EXEC_TIME'] - $secondsBack;
                        $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
                        $theTimeBack = $GLOBALS['EXEC_TIME'] - $secondsBack;
                        $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-                                                       'tstamp',
-                                                       'sys_log',
-                                                       'type=255 AND action=4 AND tstamp>'.intval($theTimeBack),
-                                                       '',
-                                                       'tstamp DESC',
-                                                       '1'
-                                               );
-                       if ($testRow = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res))     {
+                               'tstamp',
+                               'sys_log',
+                               'type=255 AND action=4 AND tstamp>' . intval($theTimeBack),
+                               '',
+                               'tstamp DESC',
+                               '1'
+                       );
+                       if ($testRow = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res)) {
                                $theTimeBack = $testRow['tstamp'];
                        }
                                $theTimeBack = $testRow['tstamp'];
                        }
+                       $GLOBALS['TYPO3_DB']->sql_free_result($res);
 
                                // Check for more than $max number of error failures with the last period.
                        $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
 
                                // Check for more than $max number of error failures with the last period.
                        $res = $GLOBALS['TYPO3_DB']->exec_SELECTquery(
-                                                       '*',
-                                                       'sys_log',
-                                                       'type=255 AND action=3 AND error!=0 AND tstamp>'.intval($theTimeBack),
-                                                       '',
-                                                       'tstamp'
-                                               );
-                       if ($GLOBALS['TYPO3_DB']->sql_num_rows($res) > $max)    {
+                               '*',
+                               'sys_log',
+                               'type=255 AND action=3 AND error<>0 AND tstamp>' . intval($theTimeBack),
+                               '',
+                               'tstamp'
+                       );
+                       if ($GLOBALS['TYPO3_DB']->sql_num_rows($res) > $max) {
                                        // OK, so there were more than the max allowed number of login failures - so we will send an email then.
                                        // OK, so there were more than the max allowed number of login failures - so we will send an email then.
-                               $subject = 'TYPO3 Login Failure Warning (at '.$GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename'].')';
-                               $email_body = '
-There has been numerous attempts ('.$GLOBALS['TYPO3_DB']->sql_num_rows($res).') to login at the TYPO3
-site "'.$GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename'].'" ('.t3lib_div::getIndpEnv('HTTP_HOST').').
+                               $subject = 'TYPO3 Login Failure Warning (at ' . $GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename'] . ')';
+                               $email_body = 'There have been some attempts (' . $GLOBALS['TYPO3_DB']->sql_num_rows($res) . ') to login at the TYPO3
+site "' . $GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename'] . '" (' . t3lib_div::getIndpEnv('HTTP_HOST') . ').
 
 This is a dump of the failures:
 
 ';
 
 This is a dump of the failures:
 
 ';
-                               while($testRows = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res))  {
+                               while ($testRows = $GLOBALS['TYPO3_DB']->sql_fetch_assoc($res)) {
                                        $theData = unserialize($testRows['log_data']);
                                        $theData = unserialize($testRows['log_data']);
-                                       $email_body.= date($GLOBALS['TYPO3_CONF_VARS']['SYS']['ddmmyy'].' '.$GLOBALS['TYPO3_CONF_VARS']['SYS']['hhmm'],$testRows['tstamp']).':  '.@sprintf($testRows['details'],''.$theData[0],''.$theData[1],''.$theData[2]);
-                                       $email_body.= chr(10);
+                                       $email_body .= date($GLOBALS['TYPO3_CONF_VARS']['SYS']['ddmmyy'] . ' ' . $GLOBALS['TYPO3_CONF_VARS']['SYS']['hhmm'], $testRows['tstamp']) . ':  ' . @sprintf($testRows['details'], '' . $theData[0], '' . $theData[1], '' . $theData[2]);
+                                       $email_body .= LF;
                                }
                                }
-                               mail(   $email,
-                                       $subject,
-                                       $email_body,
-                                       'From: TYPO3 Login WARNING<>'
-                               );
-                               $this->writelog(255,4,0,3,'Failure warning (%s failures within %s seconds) sent by email to %s',Array($GLOBALS['TYPO3_DB']->sql_num_rows($res),$secondsBack,$email));   // Logout written to log
+                               $GLOBALS['TYPO3_DB']->sql_free_result($res);
+
+                               $from = t3lib_utility_Mail::getSystemFrom();
+                               /** @var $mail t3lib_mail_Message */
+                               $mail = t3lib_div::makeInstance('t3lib_mail_Message');
+                               $mail->setTo($email)
+                                               ->setFrom($from)
+                                               ->setSubject($subject)
+                                               ->setBody($email_body);
+                               $mail->send();
+                                       // Logout written to log
+                               $this->writelog(255, 4, 0, 3, 'Failure warning (%s failures within %s seconds) sent by email to %s', array($GLOBALS['TYPO3_DB']->sql_num_rows($res), $secondsBack, $email));
                        }
                }
        }
 }
 
                        }
                }
        }
 }
 
-
-
-if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_userauthgroup.php'])    {
-       include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['t3lib/class.t3lib_userauthgroup.php']);
-}
-
-?>
\ No newline at end of file
+?>