diff --git a/lam/lib/modules/posixGroup.inc b/lam/lib/modules/posixGroup.inc index 65df7274..f5792151 100644 --- a/lam/lib/modules/posixGroup.inc +++ b/lam/lib/modules/posixGroup.inc @@ -252,41 +252,25 @@ class posixGroup extends baseModule { ) ); // configuration checks - $return['config_checks']['group']['posixGroup_minGID'] = array - - 'type' => 'regex' - - 'regex' => 'digit' - - 'required' => true - - 'required_message' => $this->errormessages['gidNumber'][5] - - 'error_message' => $this->errormessages['gidNumber'][5]) - - $return['config_checks']['group']['posixGroup_maxGID'] = array - - 'type' => 'regex' - - 'regex' => 'digit' - - 'required' => true - - 'required_message' => $this->errormessages['gidNumber'][6] - - 'error_message' => $this->errormessages['gidNumber'][6]) - - $return['config_checks']['group']['cmpGID'] = array - - 'type' => 'int_greater' - - 'cmp_name1' => 'posixGroup_maxGID' - - 'cmp_name2' => 'posixGroup_minGID' - - 'error_message' => $this->errormessages['gidNumber'][7]) + $return['config_checks']['group']['posixGroup_minGID'] = array ( + 'type' => 'regex', + 'regex' => 'digit', + 'required' => true, + 'required_message' => $this->errormessages['gidNumber'][5], + 'error_message' => $this->errormessages['gidNumber'][5]); + $return['config_checks']['group']['posixGroup_maxGID'] = array ( + 'type' => 'regex', + 'regex' => 'digit', + 'required' => true, + 'required_message' => $this->errormessages['gidNumber'][6], + 'error_message' => $this->errormessages['gidNumber'][6]); + $return['config_checks']['group']['cmpGID'] = array ( + 'type' => 'int_greater', + 'cmp_name1' => 'posixGroup_maxGID', + 'cmp_name2' => 'posixGroup_minGID', + 'error_message' => $this->errormessages['gidNumber'][7]); // available PDF fields $return['PDF_fields'] = array( 'cn', diff --git a/lam/lib/modules/sambaGroupMapping.inc b/lam/lib/modules/sambaGroupMapping.inc index f2387930..db7e1bf7 100644 --- a/lam/lib/modules/sambaGroupMapping.inc +++ b/lam/lib/modules/sambaGroupMapping.inc @@ -35,7 +35,6 @@ class sambaGroupMapping extends baseModule { */ function sambaGroupMapping($scope) { // load error messages - $this->load_errorMessages(); $this->rids = array( _('Domain Admins') => 512, _('Domain Users') => 513,