Updated translation, fixed some typo/errors

[gosa.git] / plugins / admin / systems / class_phoneGeneric.inc

diff --git a/plugins/admin/systems/class_phoneGeneric.inc b/plugins/admin/systems/class_phoneGeneric.inc
index 659b1910a5c2e1d96ebb578c9934f2036128a7ff..33388787b8305f5c3b945b43bb3fbd10777cf728 100644 (file)
--- a/plugins/admin/systems/class_phoneGeneric.inc
+++ b/plugins/admin/systems/class_phoneGeneric.inc
@@ -220,11 +220,19 @@ class phoneGeneric extends plugin
     $smarty->assign("base_select", $this->base);
     $smarty->assign("baseACL", chkacl($this->acl,"base"));
    
-    $smarty->assign("goFonDefaultIPs",array("dynamic"=>_("dynamic"),"network"=>_("Networksettings")));
- 
-    /* Show main page */
+    $smarty->assign("goFonDefaultIPs",array("dynamic"=>_("dynamic"),"network"=>_("Network settings")));
     $this->netConfigDNS->cn= $this->cn;
     $smarty->assign("netconfig", $this->netConfigDNS->execute());
+
+    /* Display sub dialog from network settings */
+    if($this->netConfigDNS->dialog){
+      $this->dialog = TRUE;
+      return($this->netConfigDNS->execute());
+    }else{ 
+      $this->dialog = FALSE;
+    }
+
+    /* Show main page */
     $smarty->assign("phonesettings", dirname(__FILE__)."/phonesettings.tpl");
     return($smarty->fetch (get_template_path('phone.tpl', TRUE)));
   }
@@ -237,7 +245,7 @@ class phoneGeneric extends plugin
 
     $ldap->search ("(&(objectClass=goFonAccount)(goFonHardware=".$this->cn."))", array("uid","cn"));
     while ($attr =  $ldap->fetch()){
-      print_red(sprintf(_("Can't delete because there are user which are depending on this phone. One of them is user '%s'."),
+      print_red(sprintf(_("Can't delete because there are users which are depending on this phone. One of them is user '%s'."),
         ($attr['uid'][0]." - ".$attr['cn'][0])));
       return;
     }
@@ -245,7 +253,7 @@ class phoneGeneric extends plugin
     $this->netConfigDNS->remove_from_parent();
     $ldap->rmdir($this->dn);
     show_ldap_error($ldap->get_error(), _("Removing phone failed"));
-    $this->handle_post_events("remove");
+    $this->handle_post_events("remove",array("macAddress" => $this->netConfigDNS->macAddress,"ipHostNumber" => $this->netConfigDNS->ipHostNumber));
 
     /* Delete references to object groups */
     $ldap->cd ($this->config->current['BASE']);
@@ -308,6 +316,11 @@ class phoneGeneric extends plugin
       $ldap->search ("(cn=".$this->cn.")", array("cn"));
       if ($ldap->count() != 0){
         while ($attrs= $ldap->fetch()){
+
+          if(preg_match("/cn=dhcp,/",$attrs['dn'])){
+            continue;
+          }
+  
           if ($attrs['dn'] != $this->orig_dn){
             $message[]= sprintf (_("There is already an entry '%s' in the base choosen by you"), $this->cn);
             break;
@@ -372,7 +385,7 @@ class phoneGeneric extends plugin
       $ldap->create_missing_trees(preg_replace('/^[^,]+,/', '', $this->dn));
       $ldap->cd($this->dn);
       $ldap->add($this->attrs);
-      $this->handle_post_events("add");
+      $this->handle_post_events("add",array("macAddress" => $this->netConfigDNS->macAddress,"ipHostNumber" => $this->netConfigDNS->ipHostNumber));
     } else {
       if ($this->orig_dn != $this->dn){
         $this->move($this->orig_dn, $this->dn);
@@ -391,14 +404,11 @@ class phoneGeneric extends plugin
         $usertab->save();
         unset($usertab);
       }
-      $this->handle_post_events("modify");
+      $this->handle_post_events("modify",array("macAddress" => $this->netConfigDNS->macAddress,"ipHostNumber" => $this->netConfigDNS->ipHostNumber));
     }
     $this->netConfigDNS->cn = $this->cn;    
     $this->netConfigDNS->save($this->dn);
     show_ldap_error($ldap->get_error(), _("Saving phone failed"));
-
-    /* Optionally execute a command after we're done */
-    $this->postcreate();
   }
 
 }