diff --git a/plugins/personal/connectivity/class_oxchangeAccount.inc b/plugins/personal/connectivity/class_oxchangeAccount.inc
index 864dc0d882a45a6a1ebf3e4c0e7addcfddce87ef..062ceb3aa4a75413b421c07782cedc5cc1399b5b 100644 (file)
{
/* Show tab dialog headers */
- $display= "";
+ $display="";
if ($this->parent != NULL){
if ($this->is_account){
$display="";
$smarty->assign("oxchangeAccountACL", chkacl($this->acl, "oxchangeAccount"));
if ($this->is_account){
$smarty->assign("oxchangeState", "checked");
+ $smarty->assign("oxState", "");
} else {
$smarty->assign("oxchangeState", "");
+ $smarty->assign("oxState", "disabled");
}
$smarty->assign("timezones", $this->timezones);
plugin::remove_from_parent();
$ldap= $this->config->get_ldap_link();
+ if($ldap->dn_exists("ou=addr,".$this->dn)){
+ $ldap->rmdir_recursive("ou=addr,".$this->dn);
+ show_ldap_error($ldap->get_error());
+ }
+
$ldap->cd($this->dn);
@DEBUG (DEBUG_LDAP, __LINE__, __FUNCTION__, __FILE__,
$this->attributes, "Save");
$ldap->modify($this->attrs);
show_ldap_error($ldap->get_error());
-
/* Optionally execute a command after we're done */
$this->postremove();
{
$needupdate=TRUE;
+ $istemplate=FALSE;
+
+
+/* print "<pre>".print_r($this->attrs, true)."</pre>";*/
+
/*First at all, we must check if this is new or is updated */
+ /*Also check is we have a template, if is a template, is a new user */
if (isset($this->attrs['objectClass'])){
foreach ($this->attrs['objectClass'] as $object){
if($object=="OXUserObject") $needupdate=FALSE;
+ if($object=="gosaUserTemplate") $istemplate=TRUE;
}
- $uid=$this->attrs[$this->dnmode][0];
- }else{
-
- if($this->dnmode="uid") $uid=$this->parent->by_object['user']->uid;
- else $uid=$this->parent->by_object['user']->sn." ".$this->parent->by_object['user']->givenName;
}
+ $uidarray=array();
+ preg_match("/^(\w+(?=\=))=((\w|\s)+(?=\,)),.*/",$this->dn,$uidarray);
+ $uid=$uidarray[2];
+
+ if ($istemplate) $needupdate=TRUE;
+
if($needupdate){
/* Trying to open a Postgresql Database Server */
if (function_exists("pg_connect")){
}
}
-
-
plugin::save();
/* Write back to ldap */
$this->postcreate();
if($needupdate){
+ $ldap->create_missing_trees("ou=addr,".$this->dn);
+ show_ldap_error($ldap->get_error());
/* Finally save data to postgresql server */
pg_set_client_encoding ("UNICODE");
$nv = "SELECT nextval ('serial_id')";