When modifying an entry, if the nick name is different, check that the new nick name...

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@11602 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/functions/abook_local_file.php b/functions/abook_local_file.php
index 1929226ba040b514925d45ab88514d5a5e50956c..4b2b9a751407b608cab107ec1fa4bbb7dc77dede 100644 (file)
--- a/functions/abook_local_file.php
+++ b/functions/abook_local_file.php
@@ -512,7 +512,15 @@ class abook_local_file extends addressbook_backend {
             // i18n: don't use html formating in translation
             return $this->set_error(sprintf(_("User \"%s\" does not exist"),$alias));
         }
-
+        
+        /* If the alias changed, see if the new alias exists */
+        if (strtolower($alias) != strtolower($userdata['nickname'])) {
+            $ret = $this->lookup($userdata['nickname']);
+            if (!empty($ret)) {
+                return $this->set_error(sprintf(_("User \"%s\" already exists"), $userdata['nickname']));
+            }
+        }
+        
         /* Lock the file to make sure we're the only process working
          * on it. */
         if(!$this->lock()) {