X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fsystems%2Fclass_winGeneric.inc;h=fc0191a72fd502cea2a2735a87e62dd6f55f9571;hb=afecd435ef601ea27a281cc6667f94d7273b40e2;hp=e11e5a822702f7b99ee5f9352c9ee22b9f0a1552;hpb=59a6f7f4d3be3ab0a4fe4000e755b8452076ad38;p=gosa.git
diff --git a/plugins/admin/systems/class_winGeneric.inc b/plugins/admin/systems/class_winGeneric.inc
index e11e5a822..fc0191a72 100644
--- a/plugins/admin/systems/class_winGeneric.inc
+++ b/plugins/admin/systems/class_winGeneric.inc
@@ -13,8 +13,6 @@ class wingeneric extends plugin
/* Needed values and lists */
var $base= "";
var $cn= "";
- var $macAddress= "";
- var $ipHostNumber= "";
var $description= "";
var $orig_dn= "";
var $shadowLastChange="";
@@ -32,38 +30,25 @@ class wingeneric extends plugin
var $sambaSID="";
var $sambaPrimaryGroupSID="";
var $displayName="";
- var $sambaPwdCanChange2="";
var $sambaPwdMustChange="";
var $sambaNTPassword="";
var $sambaPwdLastSet="";
var $sambaAcctFlags="";
-
-
-
-
-
-
-
-
+ var $netConfigDNS;
/* attribute list for save action */
- var $attributes = array("cn", "description", "macAddress", "ipHostNumber","shadowLastChange",
+ var $ignore_account= TRUE;
+ var $attributes = array("cn", "description","shadowLastChange",
"uidNumber","gidNumber","loginShell","gecos","shadowMin","shadowWarning",
"shadowInactive","uid","cn","sn","givenName","homeDirectory","sambaSID",
- "sambaPrimaryGroupSID","displayName", "sambaPwdCanChange2","sambaPwdMustChange",
+ "sambaPrimaryGroupSID","displayName", "sambaPwdMustChange",
"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");
-// These are insertet !!!
-//"posixAccount","person","organizationalPerson","inetOrgPerson","gosaAccount","shadowAccount","sambaSamAccount"
-
-//$attrs2("shadowLastChange","uidNumber","gidNumber","loginShell","gecos","shadowMin","shadowWarning","shadowInactive","uid","cn","sn","givenName","homeDirectory","sambaSID","sambaPrimaryGroupSID","displayName","sambaPwdCanChange2","sambaPwdMustChange","sambaNTPassword","sambaPwdLastSet","sambaAcctFlags");
-
-
- function wingeneric ($config, $dn= NULL)
+ function wingeneric ($config, $dn= NULL, $parent= NULL)
{
- plugin::plugin ($config, $dn);
-
+ plugin::plugin ($config, $dn, $parent);
+ $this->netConfigDNS = new termDNS($this->config,$this->dn,$this->objectclasses);
/* Set base */
if ($this->dn == "new"){
$ui= get_userinfo();
@@ -79,15 +64,45 @@ class wingeneric extends plugin
function execute()
{
+ /* Call parent execute */
+ plugin::execute();
+
/* Do we represent a valid phone? */
if (!$this->is_account && $this->parent == NULL){
- $display= "
".
+ $display= "
".
_("This 'dn' has no network features.")."";
return($display);
}
+ /* Base select dialog */
+ $once = true;
+ foreach($_POST as $name => $value){
+ if(preg_match("/^chooseBase/",$name) && $once){
+ $once = false;
+ $this->dialog = new baseSelectDialog($this->config);
+ $this->dialog->setCurrentBase($this->base);
+ }
+ }
+
+ /* Dialog handling */
+ if(is_object($this->dialog)){
+ /* Must be called before save_object */
+ $this->dialog->save_object();
+
+ if($this->dialog->isClosed()){
+ $this->dialog = false;
+ }elseif($this->dialog->isSelected()){
+ $this->base = $this->dialog->isSelected();
+ $this->dialog= false;
+ }else{
+ return($this->dialog->execute());
+ }
+ }
+
/* Fill templating stuff */
$smarty= get_smarty();
+
+ // Undefined index in wingeneric.tpl ...
$smarty->assign("bases", $this->config->idepartments);
/* Assign attributes */
@@ -96,19 +111,19 @@ class wingeneric extends plugin
$smarty->assign("$attr", $this->$attr);
}
-
$smarty->assign("base_select", $this->base);
/* Show main page */
- $smarty->assign("netconfig", dirname(__FILE__)."/network.tpl");
+ $smarty->assign("netconfig", $this->netConfigDNS->execute());
return($smarty->fetch (get_template_path('wingeneric.tpl', TRUE)));
}
function remove_from_parent()
{
+ $this->netConfigDNS->remove_from_parent();
$ldap= $this->config->get_ldap_link();
$ldap->rmdir($this->dn);
- show_ldap_error($ldap->get_error());
+ show_ldap_error($ldap->get_error(), _("Removing Samba workstation failed"));
$this->handle_post_events("remove");
/* Delete references to object groups */
@@ -119,7 +134,6 @@ class wingeneric extends plugin
unset($og->member[$this->dn]);
$og->save ();
}
-
}
@@ -127,7 +141,7 @@ class wingeneric extends plugin
function save_object()
{
plugin::save_object();
-
+ $this->netConfigDNS->save_object();
/* Save base, since this is no LDAP attribute */
if (isset($_POST['base']) && chkacl($this->acl, "create") == ""){
$this->base= $_POST['base'];
@@ -138,17 +152,11 @@ class wingeneric extends plugin
/* Check supplied data */
function check()
{
- $message= array();
+ /* Call common method to give check the hook */
+ $message= plugin::check();
+ $message= array_merge($message, $this->netConfigDNS->check());
$this->dn= "cn=".$this->cn.",ou=netdevices,ou=systems,".$this->base;
- /* 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.";
- }
-
$ui= get_userinfo();
$acl= get_permissions ($this->dn, $ui->subtreeACL);
$acl= get_module_permission($acl, "component", $this->dn);
@@ -205,10 +213,15 @@ class wingeneric extends plugin
}
$ldap->cd($this->dn);
- $ldap->modify($this->attrs);
+ $this->cleanup();
+ $ldap->modify ($this->attrs);
+
$this->handle_post_events("modify");
}
- show_ldap_error($ldap->get_error());
+
+ $this->netConfigDNS->cn = $this->cn;
+ $this->netConfigDNS->save($this->dn);
+ show_ldap_error($ldap->get_error(), _("Saving Samba workstation failed"));
/* Optionally execute a command after we're done */
$this->postcreate();