fixed two problems

This commit is contained in:
katagia 2004-09-26 13:55:27 +00:00
parent e53a3874cb
commit 37da9db821
2 changed files with 17 additions and 34 deletions

View File

@ -252,41 +252,25 @@ class posixGroup extends baseModule {
) )
); );
// configuration checks // configuration checks
$return['config_checks']['group']['posixGroup_minGID'] = array $return['config_checks']['group']['posixGroup_minGID'] = array (
'type' => 'regex',
'type' => 'regex' 'regex' => 'digit',
'required' => true,
'regex' => 'digit' 'required_message' => $this->errormessages['gidNumber'][5],
'error_message' => $this->errormessages['gidNumber'][5]);
'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_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 // available PDF fields
$return['PDF_fields'] = array( 'cn', $return['PDF_fields'] = array( 'cn',

View File

@ -35,7 +35,6 @@ class sambaGroupMapping extends baseModule {
*/ */
function sambaGroupMapping($scope) { function sambaGroupMapping($scope) {
// load error messages // load error messages
$this->load_errorMessages();
$this->rids = array( $this->rids = array(
_('Domain Admins') => 512, _('Domain Admins') => 512,
_('Domain Users') => 513, _('Domain Users') => 513,