diff --git a/plugins/admin/users/class_userManagement.inc b/plugins/admin/users/class_userManagement.inc
index 3e1c08410d35f16ad287dd4d0b763bff53ca335d..b1b1d303da7768fa20c1fa167c94247929ede3b5 100644 (file)
$this->usertab->givenName = $this->givenName;
$template_dn = $_POST['template'];
$this->usertab->adapt_from_template($template_dn);
- $template_base = $userfilter['depselect'];//preg_replace("/^[^,]+,".get_people_ou()."/", '', $template_dn);
+ $template_base = preg_replace("/^[^,]+,".get_people_ou()."/", '', $template_dn);
$this->usertab->by_object['user']->base= $template_base;
/* Set up the users ACL's for this 'dn' */
$acl= get_permissions ($template_base, $this->ui->subtreeACL);
$this->usertab->set_acl($acl);
}
+
+ if (isset($_POST['template_continue']) && ($_POST['template'] == 'none')){
+ $this->usertab->by_object['user']->base= $userfilter['depselect'];
+ }
/* Show tab dialog if object is present */
if ($this->usertab){
$action= "<input type='image' src='images/edit.png' alt='"._("edit")."' name='user_edit_%KEY%' title='"._("Edit user")."'>";
$action.= "<input type='image' src='images/list_password.png' alt='"._("password")."' name='user_chgpw_%KEY%' title='"._("Change password")."'>";
- $action.= "<input type='image' src='images/editdelete.png' alt='"._("delete")."' name='user_del_%KEY%' title='"._("Delete user")."'>";
+ $action.= "<input type='image' src='images/edittrash.png' alt='"._("delete")."' name='user_del_%KEY%' title='"._("Delete user")."'>";
name='user_edit_%KEY%-user' title='"._("Edit generic properties")."'>";
$posiximg = "<input type='image' src='images/select_user.png' alt='"._("Posix")."'
name='user_edit_%KEY%-posixAccount' title='"._("Edit UNIX properties")."'>";
+ $eviroimg = "<input type='image' src='images/network.png' alt='"._("Environment")."'
+ name='user_edit_%KEY%-environment' title='"._("Edit environment properties")."'>";
$mailimg = "<input type='image' src='images/mailto.png' alt='"._("Mail")."'
name='user_edit_%KEY%-mailAccount' title='"._("Edit mail properties")."'>";
$fonimg = "<input type='image' src='images/%image%' alt='"._("Phone")."'
}
if((isset($mysql_entry[0]))&&($mysql_entry[0]==0)){
$connected = " | "._("Offline");
- $fonac = preg_replace("/%image%/", "select_phone_notconnected.png", $fonimg);
+ $fonac = preg_replace("/%image%/", "select_phone.png", $fonimg);
$fonac = preg_replace("/%KEY%/", "$key", $fonac);
$fonac = preg_replace("/%title%/", $connected, $fonac);
}
}else{
$posix=$empty;
}
+
+ if(in_array("gotoEnvironment" ,$val['objectClass'])){
+ $enviro = preg_replace("/%KEY%/", "$key", $eviroimg);
+ }else{
+ $enviro =$empty;
+ }
if(in_array("gosaMailAccount" ,$val['objectClass'])){
$maila = preg_replace("/%KEY%/", "$key", $mailimg);
$tpl=$userimg;
}
- $usrimg = preg_replace("/%KEY%/", "$key", $usrimg);
+ $usrimg2 = preg_replace("/%KEY%/", "$key", $usrimg);
// Generate caption for rows
if (isset($val["sn"]) && isset($val["givenName"])){
/* Create each field */
$field1 = array("string" => sprintf($tpl,$val['dn']),"attach"=>"style='width:20px;align:middle;'");
$field2 = array("string" => sprintf($editlink,$key,$display).$ip_port,"attach"=>"title='".$val['dn']."'");
- $field3 = array("string" => $usrimg." ".$posix." ".$maila." ".$fonac." ".$faxac." ".$samba." ".$s_img_create_from_template, "attach" => "style='width:138px;'");
+ $field3 = array("string" => $usrimg2." ".$posix." ".$enviro." ".$maila." ".$fonac." ".$faxac." ".$samba." ".$s_img_create_from_template, "attach" => "style='width:138px;'");
$field4 = array("string" => preg_replace("/%KEY%/", "$key", $action),"attach" => "style='border:none; text-align:right;width:48px'");
$add = array($field1,$field2,$field3,$field4);