diff --git a/plugins/admin/systems/class_winGeneric.inc b/plugins/admin/systems/class_winGeneric.inc
index cc0852f4f0326dd913540efdad91a3b0c92ccdbb..82b847a796a17f1617bb9746cd58972f05f543f4 100644 (file)
/* Needed values and lists */
var $base= "";
var $cn= "";
/* Needed values and lists */
var $base= "";
var $cn= "";
- var $macAddress= "";
- var $ipHostNumber= "";
var $description= "";
var $orig_dn= "";
var $shadowLastChange="";
var $description= "";
var $orig_dn= "";
var $shadowLastChange="";
var $sambaSID="";
var $sambaPrimaryGroupSID="";
var $displayName="";
var $sambaSID="";
var $sambaPrimaryGroupSID="";
var $displayName="";
- var $sambaPwdCanChange2="";
var $sambaPwdMustChange="";
var $sambaNTPassword="";
var $sambaPwdLastSet="";
var $sambaPwdMustChange="";
var $sambaNTPassword="";
var $sambaPwdLastSet="";
/* attribute list for save action */
var $ignore_account= TRUE;
/* attribute list for save action */
var $ignore_account= TRUE;
- var $attributes = array("cn", "description", "macAddress", "ipHostNumber","shadowLastChange",
+ var $attributes = array("cn", "description","shadowLastChange",
"uidNumber","gidNumber","loginShell","gecos","shadowMin","shadowWarning",
"shadowInactive","uid","cn","sn","givenName","homeDirectory","sambaSID",
"uidNumber","gidNumber","loginShell","gecos","shadowMin","shadowWarning",
"shadowInactive","uid","cn","sn","givenName","homeDirectory","sambaSID",
- "sambaPrimaryGroupSID","displayName", "sambaPwdCanChange2","sambaPwdMustChange",
+ "sambaPrimaryGroupSID","displayName", "sambaPwdMustChange",
"sambaNTPassword","sambaPwdLastSet","sambaAcctFlags");
"sambaNTPassword","sambaPwdLastSet","sambaAcctFlags");
- var $objectclasses= array("posixAccount","person","organizationalPerson","inetOrgPerson","gosaAccount","shadowAccount","sambaSamAccount","top", "device", "ipHost", "ieee802Device");
+ var $objectclasses= array("posixAccount","person","organizationalPerson","inetOrgPerson","gosaAccount","shadowAccount","sambaSamAccount","top");
function wingeneric ($config, $dn= NULL)
function wingeneric ($config, $dn= NULL)
function execute()
{
function execute()
{
+ /* Call parent execute */
+ plugin::execute();
+
/* Do we represent a valid phone? */
if (!$this->is_account && $this->parent == NULL){
$display= "<img alt=\"\" src=\"images/stop.png\" align=middle> <b>".
/* Do we represent a valid phone? */
if (!$this->is_account && $this->parent == NULL){
$display= "<img alt=\"\" src=\"images/stop.png\" align=middle> <b>".
/* Fill templating stuff */
$smarty= get_smarty();
/* Fill templating stuff */
$smarty= get_smarty();
+
+ // Undefined index in wingeneric.tpl ...
+ $smarty->assign("macAddress","");
+ $smarty->assign("ipHostNumber","");
+
$smarty->assign("bases", $this->config->idepartments);
/* Assign attributes */
$smarty->assign("bases", $this->config->idepartments);
/* Assign attributes */
$smarty->assign("$attr", $this->$attr);
}
$smarty->assign("$attr", $this->$attr);
}
+ /* Show Asterisk for required attribute ipHostNumber and macAddress */
+ $smarty->assign("staticAddress", "<font class=\"must\">*</font>");
$smarty->assign("base_select", $this->base);
$smarty->assign("base_select", $this->base);
$message= array();
$this->dn= "cn=".$this->cn.",ou=netdevices,ou=systems,".$this->base;
$message= array();
$this->dn= "cn=".$this->cn.",ou=netdevices,ou=systems,".$this->base;
+
/* must: cn, macAddress */
if ($this->cn == "" && chkacl ($this->acl, "cn") == ""){
/* must: cn, macAddress */
if ($this->cn == "" && chkacl ($this->acl, "cn") == ""){
- $message[]= "The required field 'Component name' is not set.";
- }
- if ($this->macAddress == "" && chkacl ($this->acl, "macAddresscn") == ""){
- $message[]= "The required field 'MAC-address' is not set.";
+ $message[]= _("The required field 'Component name' is not set.");
}
}
+/* if ($this->macAddress == "" && chkacl ($this->acl, "macAddress") == ""){
+ $message[]= _("The required field 'MAC-address' is not set.");
+ }
+ if ($this->ipHostNumber == "" && chkacl ($this->acl, "ipHostNumber") == ""){
+ $message[]= _("The required field 'IP-address' is not set.");
+ }
+*/
$ui= get_userinfo();
$acl= get_permissions ($this->dn, $ui->subtreeACL);
$acl= get_module_permission($acl, "component", $this->dn);
$ui= get_userinfo();
$acl= get_permissions ($this->dn, $ui->subtreeACL);
$acl= get_module_permission($acl, "component", $this->dn);