From 6bd46949b945a9eef2b01b824c29fd97be7b6dda Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Wed, 12 Nov 2014 08:42:00 +0000
Subject: [PATCH] fix fatal error and call vfs hooks to create user and group
 home directories

---
 setup/inc/class.setup.inc.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/setup/inc/class.setup.inc.php b/setup/inc/class.setup.inc.php
index 8ce4eca3c1..a50d8ddf91 100644
--- a/setup/inc/class.setup.inc.php
+++ b/setup/inc/class.setup.inc.php
@@ -1029,7 +1029,7 @@ class setup
 			$passwd = $anonpw = $this->anonpw;
 		}
 
-		if(!($accountid = $this->accounts->name2id($username)))
+		if(!($accountid = $this->accounts->name2id($username, 'account_lid', $primary_group ? 'u' : 'g')))
 		{
 			$account = array(
 				'account_type'      => $primary_group ? 'u' : 'g',
@@ -1072,11 +1072,17 @@ class setup
 		// --> setup_cmd_admin execs "admin/admin-cli.php --edit-user" to run them
 		if ($primary_group)
 		{
-			vfs_home_hooks::addAccount($account);
+			vfs_home_hooks::addAccount(array(
+				'account_id' => $accountid,
+				'account_lid' => $username,
+			));
 		}
 		else
 		{
-			vfs_home_hooks::addGroup($account+array('account_name' => $account['account_lid']));
+			vfs_home_hooks::addGroup(array(
+				'account_id' => $accountid,
+				'account_lid' => $username,
+			));
 		}
 		if ($primary_group)	// only for users, NOT groups
 		{