diff --git a/lam/lib/baseModule.inc b/lam/lib/baseModule.inc
index 5fb2b22f..b2d2487d 100644
--- a/lam/lib/baseModule.inc
+++ b/lam/lib/baseModule.inc
@@ -961,7 +961,7 @@ abstract class baseModule {
* @param array $errors list of error messages if any
* @param String $regexSplit multiple values are separated and can be split with this preg_split expression (e.g. "/;[ ]?/")
*/
- protected function mapSimpleUploadField(&$rawAccounts, &$ids, &$partialAccounts, $position, $colName, $attrName, $regex = null, &$message = array(), &$errors = array(), $regexSplit = null) {
+ protected function mapSimpleUploadField(&$rawAccounts, &$ids, &$partialAccounts, $position, $colName, $attrName, $regex = null, $message = array(), &$errors = array(), $regexSplit = null) {
if (!isset($ids[$colName])) {
return;
}
diff --git a/lam/lib/modules/eduPerson.inc b/lam/lib/modules/eduPerson.inc
index fecf5316..f2e1610c 100644
--- a/lam/lib/modules/eduPerson.inc
+++ b/lam/lib/modules/eduPerson.inc
@@ -33,7 +33,7 @@ $Id$
* @package modules
*/
class eduPerson extends baseModule {
-
+
/** possible affiliation types */
private $affiliationTypes = array('faculty', 'student', 'staff', 'alum',
'member', 'affiliate', 'employee', 'library-walk-in');
@@ -50,7 +50,7 @@ class eduPerson extends baseModule {
/**
* Returns true if this module can manage accounts of the current type, otherwise false.
- *
+ *
* @return boolean true if module fits
*/
public function can_manage() {
@@ -61,7 +61,7 @@ class eduPerson extends baseModule {
* Returns meta data that is interpreted by parent class
*
* @return array array with meta data
- *
+ *
* @see baseModule::get_metaData()
*/
function get_metaData() {
@@ -267,7 +267,7 @@ class eduPerson extends baseModule {
/**
* Returns the HTML meta data for the main account page.
- *
+ *
* @return htmlElement HTML meta data
*/
function display_html_attributes() {
@@ -530,15 +530,9 @@ class eduPerson extends baseModule {
}
}
// nick names
- if ($rawAccounts[$i][$ids['eduPerson_nickname']] != "") {
- $parts = explode(', ', $rawAccounts[$i][$ids['eduPerson_nickname']]);
- $partialAccounts[$i]['eduPersonNickname'] = $parts;
- }
+ $this->mapSimpleUploadField($rawAccounts, $ids, $partialAccounts, $i, 'eduPerson_nickname', 'eduPersonNickname', null, array(), $messages, '/,[ ]*/');
// entitlements
- if ($rawAccounts[$i][$ids['eduPerson_entitlement']] != "") {
- $parts = explode(', ', $rawAccounts[$i][$ids['eduPerson_entitlement']]);
- $partialAccounts[$i]['eduPersonEntitlement'] = $parts;
- }
+ $this->mapSimpleUploadField($rawAccounts, $ids, $partialAccounts, $i, 'eduPerson_entitlement', 'eduPersonEntitlement', null, array(), $messages, '/,[ ]*/');
// organisation
$this->mapSimpleUploadField($rawAccounts, $ids, $partialAccounts, $i, 'eduPerson_orgDN', 'eduPersonOrgDN',
'dn', $this->messages['eduPersonOrgDN'][1], $messages);
@@ -546,27 +540,9 @@ class eduPerson extends baseModule {
$this->mapSimpleUploadField($rawAccounts, $ids, $partialAccounts, $i, 'eduPerson_primaryOrgUnitDN', 'eduPersonPrimaryOrgUnitDN',
'dn', $this->messages['eduPersonPrimaryOrgUnitDN'][1], $messages);
// OUs
- if ($rawAccounts[$i][$ids['eduPerson_orgUnitDN']] != "") {
- $parts = explode(', ', $rawAccounts[$i][$ids['eduPerson_orgUnitDN']]);
- $valid = true;
- for ($a = 0; $a < sizeof($parts); $a++) {
- if (!get_preg($parts[$a], 'dn')) {
- $valid = false;
- $error = $this->messages['eduPersonOrgUnitDN'][1];
- array_push($error, $i);
- $messages[] = $error;
- break;
- }
- }
- if ($valid) {
- $partialAccounts[$i]['eduPersonOrgUnitDN'] = $parts;
- }
- }
+ $this->mapSimpleUploadField($rawAccounts, $ids, $partialAccounts, $i, 'eduPerson_orgUnitDN', 'eduPersonOrgUnitDN', 'dn', $this->messages['eduPersonOrgUnitDN'][1], $messages, '/;[ ]*/');
// assurance profiles
- if ($rawAccounts[$i][$ids['eduPerson_assurance']] != "") {
- $parts = explode(', ', $rawAccounts[$i][$ids['eduPerson_assurance']]);
- $partialAccounts[$i]['eduPersonAssurance'] = $parts;
- }
+ $this->mapSimpleUploadField($rawAccounts, $ids, $partialAccounts, $i, 'eduPerson_assurance', 'eduPersonAssurance', null, array(), $messages, '/,[ ]*/');
}
return $messages;
}
diff --git a/lam/lib/modules/freeRadius.inc b/lam/lib/modules/freeRadius.inc
index 2dbea2fd..220ccd14 100644
--- a/lam/lib/modules/freeRadius.inc
+++ b/lam/lib/modules/freeRadius.inc
@@ -38,11 +38,11 @@ class freeRadius extends baseModule {
private static $monthList = array('01' => 'Jan', '02' => 'Feb', '03' => 'Mar', '04' => 'Apr', '05' => 'May',
'06' => 'Jun', '07' => 'Jul', '08' => 'Aug', '09' => 'Sep', '10' => 'Oct', '11' => 'Nov', '12' => 'Dec'
);
-
+
/** cache for profile DNs */
private $profileCache = null;
-
-
+
+
/**
* Creates a new freeRadius object.
*
@@ -55,7 +55,7 @@ class freeRadius extends baseModule {
/**
* Returns true if this module can manage accounts of the current type, otherwise false.
- *
+ *
* @return boolean true if module fits
*/
public function can_manage() {
@@ -66,7 +66,7 @@ class freeRadius extends baseModule {
* Returns meta data that is interpreted by parent class
*
* @return array array with meta data
- *
+ *
* @see baseModule::get_metaData()
*/
function get_metaData() {
@@ -277,10 +277,10 @@ class freeRadius extends baseModule {
}
return $return;
}
-
+
/**
* Returns a list of configuration options.
- *
+ *
* Calling this method does not require the existence of an enclosing {@link accountContainer}.
*
* The field names are used as keywords to load and save settings.
@@ -289,7 +289,7 @@ class freeRadius extends baseModule {
* @param array $scopes account types (user, group, host)
* @param array $allScopes list of all active account modules and their scopes (module => array(scopes))
* @return mixed htmlElement or array of htmlElement
- *
+ *
* @see htmlElement
*/
public function get_configOptions($scopes, $allScopes) {
@@ -344,7 +344,7 @@ class freeRadius extends baseModule {
/**
* Returns the HTML meta data for the main account page.
- *
+ *
* @return htmlElement HTML meta data
*/
function display_html_attributes() {
@@ -508,7 +508,7 @@ class freeRadius extends baseModule {
}
return $errors;
}
-
+
/**
* This function will create the meta HTML code to show a page to change the expiration date.
*
@@ -566,7 +566,7 @@ class freeRadius extends baseModule {
$buttons->addElement(new htmlAccountPageButton(get_class($this), 'attributes', 'back' . $attr, _('Cancel')));
$buttons->colspan = 6;
$return->addElement($buttons);
- return $return;
+ return $return;
}
/**
@@ -627,18 +627,7 @@ class freeRadius extends baseModule {
$this->mapSimpleUploadField($rawAccounts, $ids, $partialAccounts, $i, 'freeRadius_radiusRealm', 'radiusRealm',
'DNSname', $this->messages['radiusRealm'][1], $errors);
// group names
- if ($rawAccounts[$i][$ids['freeRadius_radiusGroupName']] != "") {
- $groupList = preg_split('/;[ ]*/', $rawAccounts[$i][$ids['freeRadius_radiusGroupName']]);
- $partialAccounts[$i]['radiusGroupName'] = $groupList;
- for ($x = 0; $x < sizeof($groupList); $x++) {
- if (!get_preg($groupList[$x], 'groupname')) {
- $errMsg = $this->messages['radiusGroupName'][1];
- array_push($errMsg, array($i));
- $errors[] = $errMsg;
- break;
- }
- }
- }
+ $this->mapSimpleUploadField($rawAccounts, $ids, $partialAccounts, $i, 'freeRadius_radiusGroupName', 'radiusGroupName', 'groupname', $this->messages['radiusGroupName'][1], $errors, '/;[ ]*/');
// expiration date
if ($rawAccounts[$i][$ids['freeRadius_radiusExpiration']] != "") {
if (preg_match('/^[0-9]{1,2}.[0-9]{1,2}.[0-9]{4} [0-9]{1,2}:[0-9]{1,2}$/', $rawAccounts[$i][$ids['freeRadius_radiusExpiration']])) {
@@ -670,16 +659,7 @@ class freeRadius extends baseModule {
}
}
// profile DN
- if (!empty($rawAccounts[$i][$ids['freeRadius_radiusProfileDn']])) {
- if (get_preg($rawAccounts[$i][$ids['freeRadius_radiusProfileDn']], 'dn')) {
- $partialAccounts[$i]['radiusProfileDn'] = $rawAccounts[$i][$ids['freeRadius_radiusProfileDn']];
- }
- else {
- $errMsg = $this->messages['radiusProfileDn'][0];
- array_push($errMsg, array($i));
- $errors[] = $errMsg;
- }
- }
+ $this->mapSimpleUploadField($rawAccounts, $ids, $partialAccounts, $i, 'freeRadius_radiusProfileDn', 'radiusProfileDn', 'dn', $this->messages['radiusProfileDn'][0], $errors);
}
return $errors;
}
@@ -749,10 +729,10 @@ class freeRadius extends baseModule {
}
}
}
-
+
/**
* Formats the expiration date attribute.
- *
+ *
* @param String $date date value
*/
private function formatExpirationDate($date) {
@@ -769,10 +749,10 @@ class freeRadius extends baseModule {
}
return $date;
}
-
+
/**
* Returns a list of possible profile DNs.
- *
+ *
* @return array list of profile DNs
*/
private function getProfiles() {
@@ -789,7 +769,7 @@ class freeRadius extends baseModule {
usort($this->profileCache, 'compareDN');
return $this->profileCache;
}
-
+
}