X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fdepartments%2Fclass_departmentGeneric.inc;h=9aecbccdff2cb3d39578dc59596a449b74e37625;hb=206abcab698395b6c61297782e8c304c4e77dc56;hp=1f788f1955839ed18b32d2e82350dd2fd0f6ac04;hpb=c904cd0bb9748eaffe909b3f3fc5eb5719dfa6a6;p=gosa.git
diff --git a/plugins/admin/departments/class_departmentGeneric.inc b/plugins/admin/departments/class_departmentGeneric.inc
index 1f788f195..9aecbccdf 100644
--- a/plugins/admin/departments/class_departmentGeneric.inc
+++ b/plugins/admin/departments/class_departmentGeneric.inc
@@ -137,6 +137,7 @@ class department extends plugin
$smarty->assign("$val", $this->$val);
$smarty->assign("$val"."ACL", chkacl($this->acl, "$val"));
}
+ $smarty->assign("baseACL", chkacl($this->acl,"base"));
$smarty->assign("base_select", $this->base);
/* Set admin unit flag */
@@ -166,6 +167,7 @@ class department extends plugin
$ldap= $this->config->get_ldap_link();
$ldap->cd ($this->dn);
$ldap->recursive_remove();
+ show_ldap_error($ldap->get_error(), _("Removing department failed"));
/* Optionally execute a command after we're done */
$this->handle_post_events('remove');
@@ -212,15 +214,14 @@ class department extends plugin
$message= plugin::check();
/* Permissions for that base? */
- // $this->dn= "ou=$this->ou,".$this->base;
if (chkacl($this->acl, "create") != ""){
$message[]= _("You have no permissions to create a department on this 'Base'.");
}
/* Check for presence of this department */
$ldap= $this->config->get_ldap_link();
- $attrs= $ldap->cat ($this->dn, array('dn'));
- if ($this->orig_dn == "new" && !($attrs === FALSE)){
+ $ldap->ls ("(&(ou=".$this->ou.")(objectClass=organizationalUnit))", $this->base, array('dn'));
+ if ($this->orig_dn == "new" && $ldap->count()){
$message[]= _("Department with that 'Name' already exists.");
} elseif ($this->orig_dn != $this->dn && !($attrs === FALSE)){
$message[]= _("Department with that 'Name' already exists.");
@@ -234,19 +235,11 @@ class department extends plugin
$message[]= _("Required field 'Description' is not set.");
}
- /* Validate and modify - or: spaghetti rules! */
- $SkipNames = array( "incoming","apps","systems","fai","config",
- preg_replace("/ou=(.*),/","\\1",get_people_ou()),
- preg_replace("/ou=(.*),/","\\1",get_groups_ou())
- );
- foreach($SkipNames as $name){
- if ($this->ou == $name){
- $message[]= sprintf(_("The field 'Name' contains the reserved word '%s'. Please choose another name."),$name);
- }
- }
-
+ if(is_department_name_reserved($this->ou,$this->base)){
+ $message[]= sprintf(_("The field 'Name' contains the reserved word '%s'. Please choose another name."),$this->ou);
+ }
- if (preg_match ('/[#+:=>\\\\\/]/', $this->ou)){
+ if (preg_match ('/["+>\\\\]/', $this->ou)){
$message[]= _("The field 'Name' contains invalid characters.");
}
if (!is_phone_nr($this->telephoneNumber)){
@@ -269,7 +262,9 @@ class department extends plugin
if ($this->is_administrational_unit){
if(!in_array_ics("gosaAdministrativeUnit",$this->objectclasses)){
$this->objectclasses[]= "gosaAdministrativeUnit";
+ $this->gosaUnitTag= "";
}
+
if ($this->gosaUnitTag == ""){
/* It's unlikely, but check if already used... */
@@ -292,8 +287,6 @@ class department extends plugin
}
$this->gosaUnitTag= preg_replace("/\./", "", $sec.$usec);
}
- } else {
- $this->gosaUnitTag= "";
}
plugin::save();
@@ -303,13 +296,18 @@ class department extends plugin
$tmp= array();
/* Remove gosaAdministrativeUnit from this plugin */
+ $has_unit_tag= false;
foreach($this->attrs['objectClass'] as $oc){
if (!preg_match("/^gosaAdministrativeUnit$/i", $oc)){
$tmp[]= $oc;
}
+ if (preg_match("/^gosaAdministrativeUnitTag$/i", $oc)){
+ $has_unit_tag= true;
+ }
}
$this->attrs['objectClass']= $tmp;
- if(isset($this->attrs['gosaUnitTag'])){
+
+ if(!$has_unit_tag && isset($this->attrs['gosaUnitTag'])){
$this->attrs['gosaUnitTag']= array();
}
}
@@ -329,11 +327,16 @@ class department extends plugin
$ldap->add($this->attrs);
$this->handle_post_events('add');
}
- show_ldap_error($ldap->get_error());
+ show_ldap_error($ldap->get_error(), _("Saving department failed"));
/* The parameter forces only to set must_be_tagged, and don't touch any objects
This will be done later */
$this->tag_objects(true);
+
+ /* Fix tagging if needed */
+ if (!$this->is_administrational_unit){
+ $this->handle_object_tagging();
+ }
/* Optionally execute a command after we're done */
$this->postcreate();
@@ -344,16 +347,18 @@ class department extends plugin
function ShowMoveFrame()
{
$smarty = get_smarty();
- $smarty->assign("src","?plug=".$_GET['plug']."&PerformRecMove");
- $display= $smarty->fetch(get_template_path("recursive_move.tpl",TRUE));
+ $smarty->assign("src","?plug=".$_GET['plug']."&PerformRecMove");
+ $smarty->assign("message","As soon as the move operation has finished, you can scroll down to end of the page and press the 'Continue' button to continue with the department management dialog.");
+ $display= $smarty->fetch(get_template_path("dep_iframe.tpl",TRUE));
return($display);
}
function ShowTagFrame()
{
$smarty = get_smarty();
- $smarty->assign("src","?plug=".$_GET['plug']."&TagDepartment");
- $display= $smarty->fetch(get_template_path("recursive_move.tpl",TRUE));
+ $smarty->assign("src","?plug=".$_GET['plug']."&TagDepartment");
+ $smarty->assign("message","As soon as the tag operation has finished, you can scroll down to end of the page and press the 'Continue' button to continue with the department management dialog.");
+ $display= $smarty->fetch(get_template_path("dep_iframe.tpl",TRUE));
return($display);
}
@@ -362,9 +367,19 @@ class department extends plugin
{
if(!$OnlySetTagFlag){
$smarty= get_smarty();
- echo "".$smarty->fetch(get_template_path('headers.tpl'));
- echo "";
- echo "