From 02efa0e3cf1b457240e62eee866b300f05298e66 Mon Sep 17 00:00:00 2001 From: careworks Date: Wed, 1 Mar 2006 10:08:53 +0000 Subject: [PATCH] * Allow Open-Xchange accountnames with a dot in them. * Check that we're not writing an empty loginname to the OX database git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@2794 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../personal/connectivity/class_oxchangeAccount.inc | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/plugins/personal/connectivity/class_oxchangeAccount.inc b/plugins/personal/connectivity/class_oxchangeAccount.inc index 317506027..714709670 100644 --- a/plugins/personal/connectivity/class_oxchangeAccount.inc +++ b/plugins/personal/connectivity/class_oxchangeAccount.inc @@ -776,10 +776,14 @@ $ldap->modify ($this->attrs); } } - $uidarray=array(); - preg_match("/^(\w+(?=\=))=((\w|\s)+(?=\,)),.*/",$this->dn,$uidarray); - $uid=$uidarray[2]; - + $uidarray=array(); + preg_match("/^(\w+(?=\=))=((\w|\s|\.)+(?=\,)),.*/",$this->dn,$uidarray); + $uid=$uidarray[2]; + if (trim($uid) == "") { + print_red(_("The Open-Xchange accountname is empty and thus invalid! Check to make sure that ". + "you are not using any strange characters in the loginname.")); + } + if ($istemplate) $needupdate=TRUE; if($needupdate){ -- 2.30.2