check for already existing dn, when creating new macro

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@882 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/plugins/gofon/macro/class_gofonMacro.inc b/plugins/gofon/macro/class_gofonMacro.inc
index 5aa085b119a944996b358e0af0ebd20351ba9f11..ee480dd6cc58bae20b1d1139676b7537f22b9553 100755 (executable)
--- a/plugins/gofon/macro/class_gofonMacro.inc
+++ b/plugins/gofon/macro/class_gofonMacro.inc
@@ -33,6 +33,7 @@ class macro extends plugin
     /* This is always an account */
     $this->is_account= TRUE;
 
+
     /* Edit or new one ?*/
     if ($this->dn == "new"){
       $ui= get_userinfo();
@@ -132,6 +133,14 @@ class macro extends plugin
   {
     $message = array();
 
+    if($this->dn=="new"){
+      $ldap = $this->config->get_ldap_link();
+      $ldap->search("(&(objectClass=goFonMacro)(cn=".$this->cn."))",array("cn"));
+      if($ldap->count()>0){
+        $message[]=sprintf(_("The given cn '%s' already exists."),$this->cn);
+      }
+    }
+
     if(empty($this->displayName)){
       $message[] = _("You must specify the 'Display Name' in order to save this macro");
     }  
@@ -163,7 +172,6 @@ class macro extends plugin
     $this->execute();
 
     plugin::save();
-
     unset($this->attrs['base']);
 
     /* Write back to ldap */

diff --git a/plugins/gofon/macro/tabs_macros.inc b/plugins/gofon/macro/tabs_macros.inc
index 6cf8a22711ac418e3721a6af1b41f65be688c7af..27047c7bcbb961ee9a3be04d8953f01477b61227 100755 (executable)
--- a/plugins/gofon/macro/tabs_macros.inc
+++ b/plugins/gofon/macro/tabs_macros.inc
@@ -14,7 +14,7 @@ class macrotabs extends tabs
 
        /* Check for new 'dn', in order to propagate the
           'dn' to all plugins */
-       $new_dn= "cn=".$baseobject->cn.",".$baseobject->base;
+       $new_dn= "cn=".$baseobject->cn.",ou=macros,ou=asterisk,ou=config,".$baseobject->base;
 
         /* Move group? */
         if ($this->dn != $new_dn){