extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 06:30:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed errors in creating the home dirs of standard groups in sqlfs during setup

Browse Source
This commit is contained in:
Ralf Becker 2008-10-26 07:37:37 +00:00
parent 4694b6e917
commit 59b4f49e58
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
phpgwapi/inc/class.sqlfs_stream_wrapper.inc.php
View File

@ -596,6 +596,7 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
if (self::LOG_LEVEL) error_log(__METHOD__."('$url',$mode,$options) already exist!"); if (self::LOG_LEVEL) error_log(__METHOD__."('$url',$mode,$options) already exist!");
if (!($options & STREAM_URL_STAT_QUIET)) if (!($options & STREAM_URL_STAT_QUIET))
{ {
//throw new Exception(__METHOD__."('$url',$mode,$options) already exist!");
trigger_error(__METHOD__."('$url',$mode,$options) already exist!",E_USER_WARNING); trigger_error(__METHOD__."('$url',$mode,$options) already exist!",E_USER_WARNING);
} }
return false; return false;
@ -755,10 +756,11 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
trigger_error("Only root can do that!",E_USER_WARNING); trigger_error("Only root can do that!",E_USER_WARNING);
return false; return false;
} }
if ($owner < 0 || !$GLOBALS['egw']->accounts->id2name($owner)) // not a user if ($owner < 0 || $owner && !$GLOBALS['egw']->accounts->id2name($owner)) // not a user (0 == root)
{ {
if (self::LOG_LEVEL) error_log(__METHOD__."($url,$owner) unknown (numeric) user id!"); if (self::LOG_LEVEL) error_log(__METHOD__."($url,$owner) unknown (numeric) user id!");
trigger_error("Unknown (numeric) user id!",E_USER_WARNING); trigger_error(__METHOD__."($url,$owner) Unknown (numeric) user id!",E_USER_WARNING);
//throw new Exception(__METHOD__."($url,$owner) Unknown (numeric) user id!");
return false; return false;
} }
$stmt = self::$pdo->prepare('UPDATE '.self::TABLE.' SET fs_uid=:fs_uid WHERE fs_id=:fs_id'); $stmt = self::$pdo->prepare('UPDATE '.self::TABLE.' SET fs_uid=:fs_uid WHERE fs_id=:fs_id');

2
setup/inc/class.setup.inc.php
View File

@ -975,7 +975,7 @@ class setup
} }
else else
{ {
vfs_home_hooks::addGroup($account); vfs_home_hooks::addGroup($account+array('account_name' => $account['account_lid']));
} }
} }
if ($primary_group) // only for users, NOT groups if ($primary_group) // only for users, NOT groups