diff --git a/lam/docs/devel/upgrade.htm b/lam/docs/devel/upgrade.htm
index 58d79540..3c6804dd 100644
--- a/lam/docs/devel/upgrade.htm
+++ b/lam/docs/devel/upgrade.htm
@@ -20,6 +20,7 @@
+
@@ -70,9 +71,11 @@ This is a list of API changes for all LAM releases.
getManagedAttributes()
getLDAPAliases()
- get_uploadColumns()
+ get_uploadColumns()
+ build_uploadAccounts()
+
baseType->doUploadPostActions(): new parameter $selectedModules
diff --git a/lam/lib/baseModule.inc b/lam/lib/baseModule.inc
index dad7c4f2..613513a7 100644
--- a/lam/lib/baseModule.inc
+++ b/lam/lib/baseModule.inc
@@ -894,9 +894,10 @@ abstract class baseModule {
* @param array $ids list of IDs for column position (e.g. "posixAccount_uid" => 5)
* @param array $partialAccounts list of hash arrays (name => value) which are later added to LDAP
* @param array $selectedModules list of selected account modules
+ * @param ConfiguredType $type account type
* @return array list of error messages if any
*/
- public function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules) {
+ public function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules, &$type) {
// must be implemented in sub modules
return array();
}
diff --git a/lam/lib/modules.inc b/lam/lib/modules.inc
index d48ee514..ec7591ff 100644
--- a/lam/lib/modules.inc
+++ b/lam/lib/modules.inc
@@ -465,20 +465,20 @@ function getUploadColumns(&$type, $selectedModules) {
*
* If there are problems status messages will be printed automatically.
*
-* @param string $scope account type
+* @param ConfiguredType $type account type
* @param array $data array containing one account in each element
* @param array $ids array( => )
* @param array $selectedModules selected account modules
* @return mixed array including accounts or false if there were errors
*/
-function buildUploadAccounts($scope, $data, $ids, $selectedModules) {
+function buildUploadAccounts($type, $data, $ids, $selectedModules) {
// build module order
$unOrdered = $selectedModules;
$ordered = array();
$predepends = array();
// get dependencies
for ($i = 0; $i < sizeof($unOrdered); $i++) {
- $mod = moduleCache::getModule($unOrdered[$i], $scope);
+ $mod = moduleCache::getModule($unOrdered[$i], $type->getScope());
$predepends[$unOrdered[$i]] = $mod->get_uploadPreDepends();
}
// first all modules without predepends can be ordered
@@ -523,8 +523,8 @@ function buildUploadAccounts($scope, $data, $ids, $selectedModules) {
$partialAccounts[$i]['objectClass'] = array();
}
for ($i = 0; $i < sizeof($ordered); $i++) {
- $module = new $ordered[$i]($scope);
- $errors = $module->build_uploadAccounts($data, $ids, $partialAccounts, $selectedModules);
+ $module = new $ordered[$i]($type->getScope());
+ $errors = $module->build_uploadAccounts($data, $ids, $partialAccounts, $selectedModules, $type);
if (sizeof($errors) > 0) {
array_unshift($errors, array("INFO", _("Displayed account numbers start at \"0\". Add 2 to get the row in your spreadsheet."), ""));
$errors[] = array("ERROR", _("Upload was stopped after errors in %s module!"), "", array($module->get_alias()));
diff --git a/lam/lib/modules/account.inc b/lam/lib/modules/account.inc
index 256f43d0..0ed1b988 100644
--- a/lam/lib/modules/account.inc
+++ b/lam/lib/modules/account.inc
@@ -265,15 +265,10 @@ class account extends baseModule {
}
/**
- * In this function the LDAP account is built up.
- *
- * @param array $rawAccounts list of hash arrays (name => value) from user input
- * @param array $ids list of IDs for column position (e.g. "posixAccount_uid" => 5)
- * @param array $partialAccounts list of hash arrays (name => value) which are later added to LDAP
- * @param array $selectedModules list of selected account modules
- * @return array list of error messages if any
- */
- function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules) {
+ * {@inheritDoc}
+ * @see baseModule::build_uploadAccounts()
+ */
+ function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules, &$type) {
$messages = array();
for ($i = 0; $i < sizeof($rawAccounts); $i++) {
// add object class
diff --git a/lam/lib/modules/asteriskAccount.inc b/lam/lib/modules/asteriskAccount.inc
index 0023f1c4..3191e139 100644
--- a/lam/lib/modules/asteriskAccount.inc
+++ b/lam/lib/modules/asteriskAccount.inc
@@ -1017,15 +1017,10 @@ class asteriskAccount extends baseModule implements passwordService {
}
/**
- * In this function the LDAP account is built up.
- *
- * @param array $rawAccounts list of hash arrays (name => value) from user input
- * @param array $ids list of IDs for column position (e.g. "posixAccount_uid" => 5)
- * @param array $partialAccounts list of hash arrays (name => value) which are later added to LDAP
- * @param array $selectedModules list of selected account modules
- * @return array list of error messages if any
+ * {@inheritDoc}
+ * @see baseModule::build_uploadAccounts()
*/
- function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules) {
+ function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules, &$type) {
$messages = array();
for ($i = 0; $i < sizeof($rawAccounts); $i++) {
// add object class
diff --git a/lam/lib/modules/asteriskExtension.inc b/lam/lib/modules/asteriskExtension.inc
index c10935e1..658246da 100644
--- a/lam/lib/modules/asteriskExtension.inc
+++ b/lam/lib/modules/asteriskExtension.inc
@@ -841,15 +841,10 @@ class asteriskExtension extends baseModule {
}
/**
- * In this function the LDAP account is built up.
- *
- * @param array $rawAccounts list of hash arrays (name => value) from user input
- * @param array $ids list of IDs for column position (e.g. "posixAccount_uid" => 5)
- * @param array $partialAccounts list of hash arrays (name => value) which are later added to LDAP
- * @param array $selectedModules list of selected account modules
- * @return array list of error messages if any
+ * {@inheritDoc}
+ * @see baseModule::build_uploadAccounts()
*/
- function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules) {
+ function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules, &$type) {
$messages = array();
//hash to strore extension_name => priority. For new extensoin priority will be 1
$extensionNamePriorityMap = array();
diff --git a/lam/lib/modules/asteriskVoicemail.inc b/lam/lib/modules/asteriskVoicemail.inc
index 6b6928ce..6bc23d1e 100644
--- a/lam/lib/modules/asteriskVoicemail.inc
+++ b/lam/lib/modules/asteriskVoicemail.inc
@@ -378,15 +378,10 @@ class asteriskVoicemail extends baseModule implements passwordService {
}
/**
- * In this function the LDAP account is built up.
- *
- * @param array $rawAccounts list of hash arrays (name => value) from user input
- * @param array $ids list of IDs for column position (e.g. "posixAccount_uid" => 5)
- * @param array $partialAccounts list of hash arrays (name => value) which are later added to LDAP
- * @param array $selectedModules list of selected account modules
- * @return array list of error messages if any
+ * {@inheritDoc}
+ * @see baseModule::build_uploadAccounts()
*/
- function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules) {
+ function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules, &$type) {
$messages = array();
for ($i = 0; $i < sizeof($rawAccounts); $i++) {
// add object class
diff --git a/lam/lib/modules/authorizedServiceObject.inc b/lam/lib/modules/authorizedServiceObject.inc
index 4f0e12f9..3dd8e52a 100644
--- a/lam/lib/modules/authorizedServiceObject.inc
+++ b/lam/lib/modules/authorizedServiceObject.inc
@@ -201,15 +201,10 @@ class authorizedServiceObject extends baseModule {
}
/**
- * In this function the LDAP account is built up.
- *
- * @param array $rawAccounts list of hash arrays (name => value) from user input
- * @param array $ids list of IDs for column position (e.g. "posixAccount_uid" => 5)
- * @param array $partialAccounts list of hash arrays (name => value) which are later added to LDAP
- * @param array $selectedModules list of selected account modules
- * @return array list of error messages if any
- */
- function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules) {
+ * {@inheritDoc}
+ * @see baseModule::build_uploadAccounts()
+ */
+ function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules, &$type) {
$messages = array();
for ($i = 0; $i < sizeof($rawAccounts); $i++) {
// add object class
diff --git a/lam/lib/modules/ddns.inc b/lam/lib/modules/ddns.inc
index fae8fd55..c3c5e90d 100644
--- a/lam/lib/modules/ddns.inc
+++ b/lam/lib/modules/ddns.inc
@@ -645,16 +645,11 @@ class ddns extends baseModule {
// load nothing, attributes are saved in "dhcp_settings" module
}
- /**
- * In this function the LDAP account is built up.
- *
- * @param array $rawAccounts list of hash arrays (name => value) from user input
- * @param array $ids list of IDs for column position (e.g. "posixAccount_uid" => 5)
- * @param array $partialAccounts list of hash arrays (name => value) which are later added to LDAP
- * @param array $selectedModules list of selected account modules
- * @return array list of error messages if any
- */
- function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules) {
+ /**
+ * {@inheritDoc}
+ * @see baseModule::build_uploadAccounts()
+ */
+ function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules, &$type) {
$messages = array();
if (!$this->check_if_ddns_is_enable()) {
return $messages;
diff --git a/lam/lib/modules/dhcp_settings.inc b/lam/lib/modules/dhcp_settings.inc
index 77b34d45..99ad3d61 100644
--- a/lam/lib/modules/dhcp_settings.inc
+++ b/lam/lib/modules/dhcp_settings.inc
@@ -846,15 +846,10 @@ By default, the nodes are configured as H-Nodes which fits for small networks. I
}
/**
- * In this function the LDAP account is built up.
- *
- * @param array $rawAccounts list of hash arrays (name => value) from user input
- * @param array $ids list of IDs for column position (e.g. "posixAccount_uid" => 5)
- * @param array $partialAccounts list of hash arrays (name => value) which are later added to LDAP
- * @param array $selectedModules list of selected account modules
- * @return array list of error messages if any
- */
- function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules) {
+ * {@inheritDoc}
+ * @see baseModule::build_uploadAccounts()
+ */
+ function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules, &$type) {
$messages = array();
for ($i = 0; $i < sizeof($rawAccounts); $i++) {
// add object class
diff --git a/lam/lib/modules/eduPerson.inc b/lam/lib/modules/eduPerson.inc
index b401b955..13045246 100644
--- a/lam/lib/modules/eduPerson.inc
+++ b/lam/lib/modules/eduPerson.inc
@@ -462,15 +462,10 @@ class eduPerson extends baseModule {
}
/**
- * In this function the LDAP account is built up.
- *
- * @param array $rawAccounts list of hash arrays (name => value) from user input
- * @param array $ids list of IDs for column position (e.g. "posixAccount_uid" => 5)
- * @param array $partialAccounts list of hash arrays (name => value) which are later added to LDAP
- * @param array $selectedModules list of selected account modules
- * @return array list of error messages if any
- */
- function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules) {
+ * {@inheritDoc}
+ * @see baseModule::build_uploadAccounts()
+ */
+ function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules, &$type) {
$messages = array();
for ($i = 0; $i < sizeof($rawAccounts); $i++) {
// add object class
diff --git a/lam/lib/modules/freeRadius.inc b/lam/lib/modules/freeRadius.inc
index a256bdc2..0ac6d38b 100644
--- a/lam/lib/modules/freeRadius.inc
+++ b/lam/lib/modules/freeRadius.inc
@@ -624,15 +624,10 @@ class freeRadius extends baseModule {
}
/**
- * In this function the LDAP account is built up.
- *
- * @param array $rawAccounts list of hash arrays (name => value) from user input
- * @param array $ids list of IDs for column position (e.g. "posixAccount_uid" => 5)
- * @param array $partialAccounts list of hash arrays (name => value) which are later added to LDAP
- * @param array $selectedModules list of selected account modules
- * @return array list of error messages if any
- */
- function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules) {
+ * {@inheritDoc}
+ * @see baseModule::build_uploadAccounts()
+ */
+ function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules, &$type) {
$errors = array();
for ($i = 0; $i < sizeof($rawAccounts); $i++) {
// add object class
diff --git a/lam/lib/modules/hostObject.inc b/lam/lib/modules/hostObject.inc
index 7830f21a..58d27cdb 100644
--- a/lam/lib/modules/hostObject.inc
+++ b/lam/lib/modules/hostObject.inc
@@ -175,15 +175,10 @@ class hostObject extends baseModule {
}
/**
- * In this function the LDAP account is built up.
- *
- * @param array $rawAccounts list of hash arrays (name => value) from user input
- * @param array $ids list of IDs for column position (e.g. "posixAccount_uid" => 5)
- * @param array $partialAccounts list of hash arrays (name => value) which are later added to LDAP
- * @param array $selectedModules list of selected account modules
- * @return array list of error messages if any
- */
- function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules) {
+ * {@inheritDoc}
+ * @see baseModule::build_uploadAccounts()
+ */
+ function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules, &$type) {
$messages = array();
for ($i = 0; $i < sizeof($rawAccounts); $i++) {
// add object class
diff --git a/lam/lib/modules/ieee802device.inc b/lam/lib/modules/ieee802device.inc
index be2cc46e..f447b77e 100644
--- a/lam/lib/modules/ieee802device.inc
+++ b/lam/lib/modules/ieee802device.inc
@@ -133,15 +133,10 @@ class ieee802device extends baseModule {
}
/**
- * In this function the LDAP account is built up.
- *
- * @param array $rawAccounts list of hash arrays (name => value) from user input
- * @param array $ids list of IDs for column position (e.g. "posixAccount_uid" => 5)
- * @param array $partialAccounts list of hash arrays (name => value) which are later added to LDAP
- * @param array $selectedModules list of selected account modules
- * @return array list of error messages if any
- */
- function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules) {
+ * {@inheritDoc}
+ * @see baseModule::build_uploadAccounts()
+ */
+ function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules, &$type) {
$messages = array();
for ($i = 0; $i < sizeof($rawAccounts); $i++) {
// add object class
diff --git a/lam/lib/modules/inetLocalMailRecipient.inc b/lam/lib/modules/inetLocalMailRecipient.inc
index 88f7195c..9b416d72 100644
--- a/lam/lib/modules/inetLocalMailRecipient.inc
+++ b/lam/lib/modules/inetLocalMailRecipient.inc
@@ -318,15 +318,10 @@ class inetLocalMailRecipient extends baseModule {
}
/**
- * In this function the LDAP account is built up.
- *
- * @param array $rawAccounts list of hash arrays (name => value) from user input
- * @param array $ids list of IDs for column position (e.g. "posixAccount_uid" => 5)
- * @param array $partialAccounts list of hash arrays (name => value) which are later added to LDAP
- * @param array $selectedModules list of selected account modules
- * @return array list of error messages if any
- */
- function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules) {
+ * {@inheritDoc}
+ * @see baseModule::build_uploadAccounts()
+ */
+ function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules, &$type) {
$messages = array();
for ($i = 0; $i < sizeof($rawAccounts); $i++) {
// add object class
diff --git a/lam/lib/modules/inetOrgPerson.inc b/lam/lib/modules/inetOrgPerson.inc
index 5c40b5d3..f16ea6ba 100644
--- a/lam/lib/modules/inetOrgPerson.inc
+++ b/lam/lib/modules/inetOrgPerson.inc
@@ -2168,15 +2168,10 @@ class inetOrgPerson extends baseModule implements passwordService {
}
/**
- * In this function the LDAP account is built up.
- *
- * @param array $rawAccounts list of hash arrays (name => value) from user input
- * @param array $ids list of IDs for column position (e.g. "posixAccount_uid" => 5)
- * @param array $partialAccounts list of hash arrays (name => value) which are later added to LDAP
- * @param array $selectedModules list of selected account modules
- * @return array list of error messages if any
- */
- function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules) {
+ * {@inheritDoc}
+ * @see baseModule::build_uploadAccounts()
+ */
+ function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules, &$type) {
$errors = array();
// get list of existing users
$existingUsers = searchLDAPByAttribute('uid', '*', 'inetOrgPerson', array('uid'), array('user'));
diff --git a/lam/lib/modules/kolabGroup.inc b/lam/lib/modules/kolabGroup.inc
index c63c8b7e..a3d1f550 100644
--- a/lam/lib/modules/kolabGroup.inc
+++ b/lam/lib/modules/kolabGroup.inc
@@ -347,15 +347,10 @@ class kolabGroup extends baseModule {
}
/**
- * In this function the LDAP account is built up.
- *
- * @param array $rawAccounts list of hash arrays (name => value) from user input
- * @param array $ids list of IDs for column position (e.g. "posixAccount_uid" => 5)
- * @param array $partialAccounts list of hash arrays (name => value) which are later added to LDAP
- * @param array $selectedModules list of selected account modules
- * @return array list of error messages if any
- */
- function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules) {
+ * {@inheritDoc}
+ * @see baseModule::build_uploadAccounts()
+ */
+ function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules, &$type) {
$messages = array();
for ($i = 0; $i < sizeof($rawAccounts); $i++) {
// check if extension should be added
diff --git a/lam/lib/modules/kolabSharedFolder.inc b/lam/lib/modules/kolabSharedFolder.inc
index b9a98219..0b491850 100644
--- a/lam/lib/modules/kolabSharedFolder.inc
+++ b/lam/lib/modules/kolabSharedFolder.inc
@@ -447,15 +447,10 @@ class kolabSharedFolder extends baseModule { // TODO folder type
}
/**
- * In this function the LDAP account is built up.
- *
- * @param array $rawAccounts list of hash arrays (name => value) from user input
- * @param array $ids list of IDs for column position (e.g. "posixAccount_uid" => 5)
- * @param array $partialAccounts list of hash arrays (name => value) which are later added to LDAP
- * @param array $selectedModules list of selected account modules
- * @return array list of error messages if any
- */
- function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules) {
+ * {@inheritDoc}
+ * @see baseModule::build_uploadAccounts()
+ */
+ function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules, &$type) {
$messages = array();
$delegates = searchLDAPByAttribute(null, null, 'inetOrgPerson', array('mail'), array('user'));
for ($d = 0; $d < sizeof($delegates); $d++) {
diff --git a/lam/lib/modules/kolabUser.inc b/lam/lib/modules/kolabUser.inc
index b8d6ef05..4c370215 100644
--- a/lam/lib/modules/kolabUser.inc
+++ b/lam/lib/modules/kolabUser.inc
@@ -595,15 +595,10 @@ class kolabUser extends baseModule {
}
/**
- * In this function the LDAP account is built up.
- *
- * @param array $rawAccounts list of hash arrays (name => value) from user input
- * @param array $ids list of IDs for column position (e.g. "posixAccount_uid" => 5)
- * @param array $partialAccounts list of hash arrays (name => value) which are later added to LDAP
- * @param array $selectedModules list of selected account modules
- * @return array list of error messages if any
- */
- function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules) {
+ * {@inheritDoc}
+ * @see baseModule::build_uploadAccounts()
+ */
+ function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules, &$type) {
$messages = array();
$delegates = searchLDAPByAttribute(null, null, 'inetOrgPerson', array('mail'), array('user'));
for ($d = 0; $d < sizeof($delegates); $d++) {
diff --git a/lam/lib/modules/ldapPublicKey.inc b/lam/lib/modules/ldapPublicKey.inc
index d35827aa..d82130ae 100644
--- a/lam/lib/modules/ldapPublicKey.inc
+++ b/lam/lib/modules/ldapPublicKey.inc
@@ -262,15 +262,10 @@ class ldapPublicKey extends baseModule {
}
/**
- * In this function the LDAP account is built up.
- *
- * @param array $rawAccounts list of hash arrays (name => value) from user input
- * @param array $ids list of IDs for column position (e.g. "posixAccount_uid" => 5)
- * @param array $partialAccounts list of hash arrays (name => value) which are later added to LDAP
- * @param array $selectedModules list of selected account modules
- * @return array list of error messages if any
- */
- function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules) {
+ * {@inheritDoc}
+ * @see baseModule::build_uploadAccounts()
+ */
+ function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules, &$type) {
$messages = array();
for ($i = 0; $i < sizeof($rawAccounts); $i++) {
// add object class
diff --git a/lam/lib/modules/nisMailAlias.inc b/lam/lib/modules/nisMailAlias.inc
index 3f815572..615c1fb2 100644
--- a/lam/lib/modules/nisMailAlias.inc
+++ b/lam/lib/modules/nisMailAlias.inc
@@ -429,15 +429,10 @@ class nisMailAlias extends baseModule {
}
/**
- * In this function the LDAP account is built up.
- *
- * @param array $rawAccounts list of hash arrays (name => value) from user input
- * @param array $ids list of IDs for column position (e.g. "posixAccount_uid" => 5)
- * @param array $partialAccounts list of hash arrays (name => value) which are later added to LDAP
- * @param array $selectedModules list of selected account modules
- * @return array list of error messages if any
- */
- function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules) {
+ * {@inheritDoc}
+ * @see baseModule::build_uploadAccounts()
+ */
+ function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules, &$type) {
$messages = array();
for ($i = 0; $i < sizeof($rawAccounts); $i++) {
// add object class
diff --git a/lam/lib/modules/nisNetGroupUser.inc b/lam/lib/modules/nisNetGroupUser.inc
index ae454cf0..9069460f 100644
--- a/lam/lib/modules/nisNetGroupUser.inc
+++ b/lam/lib/modules/nisNetGroupUser.inc
@@ -495,15 +495,10 @@ class nisNetGroupUser extends baseModule {
}
/**
- * In this function the LDAP account is built up.
- *
- * @param array $rawAccounts list of hash arrays (name => value) from user input
- * @param array $ids list of IDs for column position (e.g. "posixAccount_uid" => 5)
- * @param array $partialAccounts list of hash arrays (name => value) which are later added to LDAP
- * @param array $selectedModules list of selected account modules
- * @return array list of error messages if any
- */
- function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules) {
+ * {@inheritDoc}
+ * @see baseModule::build_uploadAccounts()
+ */
+ function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules, &$type) {
$errors = array();
// get list of existing group of names
$groups = $this->findGroups();
diff --git a/lam/lib/modules/nisnetgroup.inc b/lam/lib/modules/nisnetgroup.inc
index 55733637..58e2409e 100644
--- a/lam/lib/modules/nisnetgroup.inc
+++ b/lam/lib/modules/nisnetgroup.inc
@@ -518,15 +518,10 @@ class nisnetgroup extends baseModule {
}
/**
- * In this function the LDAP account is built up.
- *
- * @param array $rawAccounts list of hash arrays (name => value) from user input
- * @param array $ids list of IDs for column position (e.g. "posixAccount_uid" => 5)
- * @param array $partialAccounts list of hash arrays (name => value) which are later added to LDAP
- * @param array $selectedModules list of selected account modules
- * @return array list of error messages if any
- */
- function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules) {
+ * {@inheritDoc}
+ * @see baseModule::build_uploadAccounts()
+ */
+ function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules, &$type) {
$messages = array();
// get list of existing groups
$existingGroups = $this->getGroupList();
diff --git a/lam/lib/modules/posixAccount.inc b/lam/lib/modules/posixAccount.inc
index ab15570d..9cde9c85 100644
--- a/lam/lib/modules/posixAccount.inc
+++ b/lam/lib/modules/posixAccount.inc
@@ -2120,15 +2120,10 @@ class posixAccount extends baseModule implements passwordService {
}
/**
- * In this function the LDAP account is built up.
- *
- * @param array $rawAccounts list of hash arrays (name => value) from user input
- * @param array $ids list of IDs for column position (e.g. "posixAccount_uid" => 5)
- * @param array $partialAccounts list of hash arrays (name => value) which are later added to LDAP
- * @param array $selectedModules list of selected account modules
- * @return array list of error messages if any
- */
- function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules) {
+ * {@inheritDoc}
+ * @see baseModule::build_uploadAccounts()
+ */
+ function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules, &$type) {
$errors = array();
$pwdAttrName = $this->getPasswordAttrName($selectedModules);
$homedirAttrName = $this->getHomedirAttrName($selectedModules);
diff --git a/lam/lib/modules/posixGroup.inc b/lam/lib/modules/posixGroup.inc
index 3aea99f4..ce68a323 100644
--- a/lam/lib/modules/posixGroup.inc
+++ b/lam/lib/modules/posixGroup.inc
@@ -81,15 +81,10 @@ class posixGroup extends baseModule implements passwordService {
}
/**
- * In this function the LDAP account is built up.
- *
- * @param array $rawAccounts list of hash arrays (name => value) from user input
- * @param array $ids list of IDs for column position (e.g. "posixAccount_uid" => 5)
- * @param array $partialAccounts list of hash arrays (name => value) which are later added to LDAP
- * @param array $selectedModules list of selected account modules
- * @return array list of error messages if any
- */
- function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules) {
+ * {@inheritDoc}
+ * @see baseModule::build_uploadAccounts()
+ */
+ function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules, &$type) {
$error_messages = array();
$needAutoGID = array();
for ($i = 0; $i < sizeof($rawAccounts); $i++) {
diff --git a/lam/lib/modules/puppetClient.inc b/lam/lib/modules/puppetClient.inc
index 9dceecfd..becdff7b 100644
--- a/lam/lib/modules/puppetClient.inc
+++ b/lam/lib/modules/puppetClient.inc
@@ -351,15 +351,10 @@ class puppetClient extends baseModule {
}
/**
- * In this function the LDAP account is built up.
- *
- * @param array $rawAccounts list of hash arrays (name => value) from user input
- * @param array $ids list of IDs for column position (e.g. "posixAccount_uid" => 5)
- * @param array $partialAccounts list of hash arrays (name => value) which are later added to LDAP
- * @param array $selectedModules list of selected account modules
- * @return array list of error messages if any
- */
- function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules) {
+ * {@inheritDoc}
+ * @see baseModule::build_uploadAccounts()
+ */
+ function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules, &$type) {
$messages = array();
for ($i = 0; $i < sizeof($rawAccounts); $i++) {
// add object class
diff --git a/lam/lib/modules/pykotaBillingCode.inc b/lam/lib/modules/pykotaBillingCode.inc
index b961bf37..d37e0cdf 100644
--- a/lam/lib/modules/pykotaBillingCode.inc
+++ b/lam/lib/modules/pykotaBillingCode.inc
@@ -208,15 +208,10 @@ class pykotaBillingCode extends baseModule {
}
/**
- * In this function the LDAP account is built up.
- *
- * @param array $rawAccounts list of hash arrays (name => value) from user input
- * @param array $ids list of IDs for column position (e.g. "posixAccount_uid" => 5)
- * @param array $partialAccounts list of hash arrays (name => value) which are later added to LDAP
- * @param array $selectedModules list of selected account modules
- * @return array list of error messages if any
- */
- function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules) {
+ * {@inheritDoc}
+ * @see baseModule::build_uploadAccounts()
+ */
+ function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules, &$type) {
$messages = array();
$this->loadCodeCache();
for ($i = 0; $i < sizeof($rawAccounts); $i++) {
diff --git a/lam/lib/modules/pykotaGroup.inc b/lam/lib/modules/pykotaGroup.inc
index 6b15bcd7..8da87e50 100644
--- a/lam/lib/modules/pykotaGroup.inc
+++ b/lam/lib/modules/pykotaGroup.inc
@@ -400,15 +400,10 @@ class pykotaGroup extends baseModule {
}
/**
- * In this function the LDAP account is built up.
- *
- * @param array $rawAccounts list of hash arrays (name => value) from user input
- * @param array $ids list of IDs for column position (e.g. "posixAccount_uid" => 5)
- * @param array $partialAccounts list of hash arrays (name => value) which are later added to LDAP
- * @param array $selectedModules list of selected account modules
- * @return array list of error messages if any
- */
- function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules) {
+ * {@inheritDoc}
+ * @see baseModule::build_uploadAccounts()
+ */
+ function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules, &$type) {
$messages = array();
for ($i = 0; $i < sizeof($rawAccounts); $i++) {
// add object classes
diff --git a/lam/lib/modules/pykotaPrinter.inc b/lam/lib/modules/pykotaPrinter.inc
index 1ca73114..d0104a27 100644
--- a/lam/lib/modules/pykotaPrinter.inc
+++ b/lam/lib/modules/pykotaPrinter.inc
@@ -450,15 +450,10 @@ class pykotaPrinter extends baseModule {
}
/**
- * In this function the LDAP account is built up.
- *
- * @param array $rawAccounts list of hash arrays (name => value) from user input
- * @param array $ids list of IDs for column position (e.g. "posixAccount_uid" => 5)
- * @param array $partialAccounts list of hash arrays (name => value) which are later added to LDAP
- * @param array $selectedModules list of selected account modules
- * @return array list of error messages if any
- */
- function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules) {
+ * {@inheritDoc}
+ * @see baseModule::build_uploadAccounts()
+ */
+ function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules, &$type) {
$messages = array();
$this->loadPrinterNameCache();
for ($i = 0; $i < sizeof($rawAccounts); $i++) {
diff --git a/lam/lib/modules/pykotaUser.inc b/lam/lib/modules/pykotaUser.inc
index b70fdd30..00694a7d 100644
--- a/lam/lib/modules/pykotaUser.inc
+++ b/lam/lib/modules/pykotaUser.inc
@@ -765,15 +765,10 @@ class pykotaUser extends baseModule {
}
/**
- * In this function the LDAP account is built up.
- *
- * @param array $rawAccounts list of hash arrays (name => value) from user input
- * @param array $ids list of IDs for column position (e.g. "posixAccount_uid" => 5)
- * @param array $partialAccounts list of hash arrays (name => value) which are later added to LDAP
- * @param array $selectedModules list of selected account modules
- * @return array list of error messages if any
- */
- function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules) {
+ * {@inheritDoc}
+ * @see baseModule::build_uploadAccounts()
+ */
+ function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules, &$type) {
$messages = array();
for ($i = 0; $i < sizeof($rawAccounts); $i++) {
// add object classes
diff --git a/lam/lib/modules/sambaDomain.inc b/lam/lib/modules/sambaDomain.inc
index cee9a8a0..1ea0abe7 100644
--- a/lam/lib/modules/sambaDomain.inc
+++ b/lam/lib/modules/sambaDomain.inc
@@ -553,15 +553,10 @@ class sambaDomain extends baseModule {
}
/**
- * In this function the LDAP account is built up.
- *
- * @param array $rawAccounts list of hash arrays (name => value) from user input
- * @param array $ids list of IDs for column position (e.g. "posixAccount_uid" => 5)
- * @param array $partialAccounts list of hash arrays (name => value) which are later added to LDAP
- * @param array $selectedModules list of selected account modules
- * @return array list of error messages if any
- */
- function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules) {
+ * {@inheritDoc}
+ * @see baseModule::build_uploadAccounts()
+ */
+ function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules, &$type) {
$messages = array();
for ($i = 0; $i < sizeof($rawAccounts); $i++) {
// add object class
diff --git a/lam/lib/modules/sambaGroupMapping.inc b/lam/lib/modules/sambaGroupMapping.inc
index 22936fda..6cfbd801 100644
--- a/lam/lib/modules/sambaGroupMapping.inc
+++ b/lam/lib/modules/sambaGroupMapping.inc
@@ -233,15 +233,10 @@ class sambaGroupMapping extends baseModule {
}
/**
- * In this function the LDAP account is built up.
- *
- * @param array $rawAccounts list of hash arrays (name => value) from user input
- * @param array $ids list of IDs for column position (e.g. "posixAccount_uid" => 5)
- * @param array $partialAccounts list of hash arrays (name => value) which are later added to LDAP
- * @param array $selectedModules list of selected account modules
- * @return array list of error messages if any
- */
- function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules) {
+ * {@inheritDoc}
+ * @see baseModule::build_uploadAccounts()
+ */
+ function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules, &$type) {
// search existing Samba 3 domains
$domains = $this->getDomains();
$nameToSID = array();
diff --git a/lam/lib/modules/sambaSamAccount.inc b/lam/lib/modules/sambaSamAccount.inc
index 6f64c596..3664d4b2 100644
--- a/lam/lib/modules/sambaSamAccount.inc
+++ b/lam/lib/modules/sambaSamAccount.inc
@@ -1997,15 +1997,10 @@ class sambaSamAccount extends baseModule implements passwordService {
}
/**
- * In this function the LDAP account is built up.
- *
- * @param array $rawAccounts list of hash arrays (name => value) from user input
- * @param array $ids list of IDs for column position (e.g. "posixAccount_uid" => 5)
- * @param array $partialAccounts list of hash arrays (name => value) which are later added to LDAP
- * @param array $selectedModules list of selected account modules
- * @return array list of error messages if any
- */
- function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules) {
+ * {@inheritDoc}
+ * @see baseModule::build_uploadAccounts()
+ */
+ function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules, &$type) {
$errors = array();
// get list of Samba 3 domains
$domains = $this->getDomains();
diff --git a/lam/lib/modules/shadowAccount.inc b/lam/lib/modules/shadowAccount.inc
index 64e459d2..4e539546 100644
--- a/lam/lib/modules/shadowAccount.inc
+++ b/lam/lib/modules/shadowAccount.inc
@@ -573,15 +573,10 @@ class shadowAccount extends baseModule implements passwordService {
}
/**
- * In this function the LDAP account is built up.
- *
- * @param array $rawAccounts list of hash arrays (name => value) from user input
- * @param array $ids list of IDs for column position (e.g. "posixAccount_uid" => 5)
- * @param array $partialAccounts list of hash arrays (name => value) which are later added to LDAP
- * @param array $selectedModules list of selected account modules
- * @return array list of error messages if any
- */
- function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules) {
+ * {@inheritDoc}
+ * @see baseModule::build_uploadAccounts()
+ */
+ function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules, &$type) {
$messages = array();
for ($i = 0; $i < sizeof($rawAccounts); $i++) {
// add object class
diff --git a/lam/lib/modules/systemQuotas.inc b/lam/lib/modules/systemQuotas.inc
index 04765892..d62e21db 100644
--- a/lam/lib/modules/systemQuotas.inc
+++ b/lam/lib/modules/systemQuotas.inc
@@ -346,15 +346,10 @@ class systemQuotas extends baseModule {
}
/**
- * In this function the LDAP account is built up.
- *
- * @param array $rawAccounts list of hash arrays (name => value) from user input
- * @param array $ids list of IDs for column position (e.g. "posixAccount_uid" => 5)
- * @param array $partialAccounts list of hash arrays (name => value) which are later added to LDAP
- * @param array $selectedModules list of selected account modules
- * @return array list of error messages if any
- */
- public function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules) {
+ * {@inheritDoc}
+ * @see baseModule::build_uploadAccounts()
+ */
+ public function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules, &$type) {
$messages = array();
for ($i = 0; $i < sizeof($rawAccounts); $i++) {
// add object class
diff --git a/lam/lib/modules/windowsGroup.inc b/lam/lib/modules/windowsGroup.inc
index 8b9b26e4..91bd8a8b 100644
--- a/lam/lib/modules/windowsGroup.inc
+++ b/lam/lib/modules/windowsGroup.inc
@@ -811,15 +811,10 @@ class windowsGroup extends baseModule {
}
/**
- * In this function the LDAP account is built up.
- *
- * @param array $rawAccounts list of hash arrays (name => value) from user input
- * @param array $ids list of IDs for column position (e.g. "posixAccount_uid" => 5)
- * @param array $partialAccounts list of hash arrays (name => value) which are later added to LDAP
- * @param array $selectedModules list of selected account modules
- * @return array list of error messages if any
- */
- public function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules) {
+ * {@inheritDoc}
+ * @see baseModule::build_uploadAccounts()
+ */
+ public function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules, &$type) {
$errors = array();
for ($i = 0; $i < sizeof($rawAccounts); $i++) {
// add object class
diff --git a/lam/lib/modules/windowsHost.inc b/lam/lib/modules/windowsHost.inc
index 81500680..596addff 100644
--- a/lam/lib/modules/windowsHost.inc
+++ b/lam/lib/modules/windowsHost.inc
@@ -243,15 +243,10 @@ class windowsHost extends baseModule {
}
/**
- * In this function the LDAP account is built up.
- *
- * @param array $rawAccounts list of hash arrays (name => value) from user input
- * @param array $ids list of IDs for column position (e.g. "posixAccount_uid" => 5)
- * @param array $partialAccounts list of hash arrays (name => value) which are later added to LDAP
- * @param array $selectedModules list of selected account modules
- * @return array list of error messages if any
- */
- public function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules) {
+ * {@inheritDoc}
+ * @see baseModule::build_uploadAccounts()
+ */
+ public function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules, &$type) {
$errors = array();
for ($i = 0; $i < sizeof($rawAccounts); $i++) {
// add object class
diff --git a/lam/lib/modules/windowsUser.inc b/lam/lib/modules/windowsUser.inc
index ba49d6e2..49fa336a 100644
--- a/lam/lib/modules/windowsUser.inc
+++ b/lam/lib/modules/windowsUser.inc
@@ -1944,15 +1944,10 @@ class windowsUser extends baseModule implements passwordService {
}
/**
- * In this function the LDAP account is built up.
- *
- * @param array $rawAccounts list of hash arrays (name => value) from user input
- * @param array $ids list of IDs for column position (e.g. "posixAccount_uid" => 5)
- * @param array $partialAccounts list of hash arrays (name => value) which are later added to LDAP
- * @param array $selectedModules list of selected account modules
- * @return array list of error messages if any
- */
- public function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules) {
+ * {@inheritDoc}
+ * @see baseModule::build_uploadAccounts()
+ */
+ public function build_uploadAccounts($rawAccounts, $ids, &$partialAccounts, $selectedModules, &$type) {
$errors = array();
// get list of existing groups
$groupList = $this->findGroups();
diff --git a/lam/templates/upload/massBuildAccounts.php b/lam/templates/upload/massBuildAccounts.php
index f9758101..708b386f 100644
--- a/lam/templates/upload/massBuildAccounts.php
+++ b/lam/templates/upload/massBuildAccounts.php
@@ -200,7 +200,7 @@ if ($_FILES['inputfile'] && ($_FILES['inputfile']['size'] > 0)) {
// let modules build accounts
else {
- $accounts = buildUploadAccounts($type->getScope(), $data, $ids, $selectedModules);
+ $accounts = buildUploadAccounts($type, $data, $ids, $selectedModules);
if ($accounts != false) {
$rdnList = getRDNAttributes($type->getId(), $selectedModules);
$suffix = $type->getSuffix();