holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

enable sqlfs_stream_wrapper to run under setup

Browse Source
This commit is contained in:
Ralf Becker 2008-04-21 15:37:11 +00:00
parent cf4cd2aa3f
commit 1eb9acec27
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -579,7 +579,7 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
':fs_creator' => egw_vfs::$user,
))) && $operation == self::STORE2FS)
{
mkdir(self::_fs_path($path),0700,true); // we create all missing parent dirs, as eg. /home might not yet exist
$ok = mkdir($dir = self::_fs_path($path),0700,true); // we create all missing parent dirs, as eg. /home might not yet exist
}
return $ret;
}
@ -1329,6 +1329,20 @@ class sqlfs_stream_wrapper implements iface_stream_wrapper
*/
static private function _fs_path($path)
{
if (!isset($GLOBALS['egw_info']['server']['files_dir']) || $GLOBALS['egw_info']['server']['files_dir'])
{
if (is_object($GLOBALS['egw_setup']->db)) // if we run under setup, query the db for the files dir
{
$GLOBALS['egw_info']['server']['files_dir'] = $GLOBALS['egw_setup']->db->select('egw_config','config_value',array(
'config_name' => 'files_dir',
'config_app' => 'phpgwapi',
),__LINE__,__FILE__)->fetchSingle();
}
if (!$GLOBALS['egw_info']['server']['files_dir'])
{
throw new egw_exception_assertion_failed("\$GLOBALS['egw_info']['server']['files_dir'] not set!");
}
}
return $GLOBALS['egw_info']['server']['files_dir'].$path;
}