From 98d19f9843eb7df24ad3e1b5ad68710a9a855e25 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Fri, 6 May 2016 16:13:35 +0000 Subject: [PATCH] mv missing default_records to api --- .../setup/default_records.inc.php | 35 ++++++++++--------- 1 file changed, 18 insertions(+), 17 deletions(-) rename {phpgwapi => api}/setup/default_records.inc.php (85%) diff --git a/phpgwapi/setup/default_records.inc.php b/api/setup/default_records.inc.php similarity index 85% rename from phpgwapi/setup/default_records.inc.php rename to api/setup/default_records.inc.php index 394565b285..6449d3f4f8 100644 --- a/phpgwapi/setup/default_records.inc.php +++ b/api/setup/default_records.inc.php @@ -1,15 +1,16 @@ m_odb->Halt_On_Error = 'yes'; @@ -160,7 +161,7 @@ foreach(array( foreach(array( 'sessions_checkip' => 'True', 'asyncservice' => 'fallback', - 'install_id' => md5(microtime(true).common::randomstring(15)), + 'install_id' => md5(microtime(true).Api\Auth::randomstring(15)), ) as $name => $value) { $oProc->insert($GLOBALS['egw_setup']->config_table,array( @@ -209,8 +210,8 @@ $GLOBALS['egw_setup']->add_acl('addressbook',$defaultgroup,$defaultgroup,1|2|4|8 */ $admins = $GLOBALS['egw_setup']->add_account('Admins','Admin','Group',False,False); -egw_vfs::$is_root = true; -$prefs = new preferences(); +Vfs::$is_root = true; +$prefs = new Api\Preferences(); $prefs->read_repository(false); foreach(array('','addressbook', 'calendar', 'infolog', 'tracker', 'timesheet', 'projectmanager', 'filemanager') as $app) { @@ -218,9 +219,9 @@ foreach(array('','addressbook', 'calendar', 'infolog', 'tracker', 'timesheet', ' // create directory and set permissions: Admins writable and other readable $dir = '/templates'.($app ? '/'.$app : ''); - egw_vfs::mkdir($dir, 075, STREAM_MKDIR_RECURSIVE); - egw_vfs::chgrp($dir, abs($admins)); - egw_vfs::chmod($dir, 075); + Vfs::mkdir($dir, 075, STREAM_MKDIR_RECURSIVE); + Vfs::chgrp($dir, abs($admins)); + Vfs::chmod($dir, 075); if (!$app) continue; // set default preference for app (preserving a maybe already set document-directory) @@ -233,7 +234,7 @@ foreach(array('','addressbook', 'calendar', 'infolog', 'tracker', 'timesheet', ' $prefs->add($app, 'document_dir', $dir, 'default'); } $prefs->save_repository(false, 'default'); -egw_vfs::$is_root = false; +Vfs::$is_root = false; /** * Create anonymous user for sharing of files