fixed error message for special groups
This commit is contained in:
parent
b2d7045eb0
commit
a116aa4b31
|
@ -357,7 +357,7 @@ class sambaGroupMapping extends baseModule {
|
||||||
/** this functin fills the error message array with messages
|
/** this functin fills the error message array with messages
|
||||||
**/
|
**/
|
||||||
function load_Messages() {
|
function load_Messages() {
|
||||||
$this->messages['sambaSID'][0] = array('ERROR', _('Special Group'),sprintf( _('There can be only one group %s.'), $rids[$i]), 'sambaSID');
|
$this->messages['sambaSID'][0] = array('ERROR', _('There can be only one group of this type.')); // third parameter must be set dynamically
|
||||||
$this->messages['sambaSID'][1] = array('ERROR', _("Account %s:") . " (sambaGroupMapping_domain): " . _("LAM was unable to find a Samba 3 domain with this name!")); // third parameter must be set dynamically
|
$this->messages['sambaSID'][1] = array('ERROR', _("Account %s:") . " (sambaGroupMapping_domain): " . _("LAM was unable to find a Samba 3 domain with this name!")); // third parameter must be set dynamically
|
||||||
$this->messages['groupType'][0] = array('ERROR', _("Account %s:") . " (sambaGroupMapping_type): " . _("This is not a valid Samba 3 group type!"), _("Possible values") . ": %s");
|
$this->messages['groupType'][0] = array('ERROR', _("Account %s:") . " (sambaGroupMapping_type): " . _("This is not a valid Samba 3 group type!"), _("Possible values") . ": %s");
|
||||||
}
|
}
|
||||||
|
@ -413,9 +413,12 @@ class sambaGroupMapping extends baseModule {
|
||||||
$wrid = true;
|
$wrid = true;
|
||||||
// Get Domain SID
|
// Get Domain SID
|
||||||
$this->attributes['sambaSID'][0] = $SID."-".$this->rids[$rids[$i]];
|
$this->attributes['sambaSID'][0] = $SID."-".$this->rids[$rids[$i]];
|
||||||
// Do a check if special grou pis unique
|
// Do a check if special group is unique
|
||||||
if ($_SESSION['cache']->in_cache($SID."-".$this->rids[$rids[$i]], 'sambaSID', 'group'))
|
if ($_SESSION['cache']->in_cache($SID."-".$this->rids[$rids[$i]], 'sambaSID', 'group')) {
|
||||||
$triggered_messages[] = $this->messages['sambaSID'][0];
|
$message = $this->messages['sambaSID'][0];
|
||||||
|
$message[] = $rids[$i];
|
||||||
|
$triggered_messages['sambaSID'][] = $message;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (!$wrid) $this->attributes['sambaSID'][0] = $SID . "-" . ($_SESSION[$this->base]->module['posixGroup']->attributes['gidNumber'][0]*2+$RIDbase+1);
|
if (!$wrid) $this->attributes['sambaSID'][0] = $SID . "-" . ($_SESSION[$this->base]->module['posixGroup']->attributes['gidNumber'][0]*2+$RIDbase+1);
|
||||||
|
|
Loading…
Reference in New Issue