diff --git a/gosa-core/plugins/admin/departments/class_departmentGeneric.inc b/gosa-core/plugins/admin/departments/class_departmentGeneric.inc
index d6cd8e31dfb8cd66e158e8fa94235268373129f9..27ad5c002bd9f29a56a6d8104ad5d8a94aec92b6 100644 (file)
/* Set admin unit flag */
if ($this->is_administrational_unit) {
- $smarty->assign("unitTag", "checked");
+ $smarty->assign("gosaUnitTag", "checked");
} else {
- $smarty->assign("unitTag", "");
+ $smarty->assign("gosaUnitTag", "");
}
$smarty->assign("dep_type",$this->type);
}
/* Save tagging flag */
- if ($this->acl_is_writeable("unitTag")){
- if (isset($_POST['unitTag'])){
+ if ($this->acl_is_writeable("gosaUnitTag")){
+ if (isset($_POST['is_administrational_unit'])){
$this->is_administrational_unit= true;
} else {
$this->is_administrational_unit= false;
}
/* This one matches with the latter part. Break and don't fix this entry */
- if (preg_match('/(^|,)'.normalizePreg($key).'$/', $attrs['dn'])){
+ if (preg_match('/(^|,)'.preg_quote($key).'$/', $attrs['dn'])){
$fix= false;
break;
}
if(!$OnlySetTagFlag){
$this->must_be_tagged = FALSE;
echo '<p class="seperator"> </p>';
- echo "<div style='width:100%;text-align:right;'><form name='form' method='post' action='?plug=".$_GET['plug']."' target='_parent'>
- <br><input type='submit' name='back' value='"._("Continue")."'>
- </form></div>";
+ echo "<div style='width:100%;text-align:right;'>".
+ "<form name='form' method='post' action='?plug=".$_GET['plug']."' target='_parent'>".
+ "<br>".
+ "<input type='submit' name='back' value='"._("Continue")."'>".
+ "<input type='hidden' name='php_c_check' value='1'>".
+ "</form>".
+ "</div>";
echo "<script language=\"javascript\" type=\"text/javascript\">scrollDown2();</script>" ;
}
}
"plSelfModify" => FALSE,
"plPriority" => 0,
"plDepends" => array(),
- "plSection" => array("admin"),
+ "plSection" => array("administration"),
"plCategory" => array("department" => array("objectClass" => "gosaDepartment", "description" => _("Departments"))),
"plProvidedAcls" => array(
- "description" => _("Description"),
- "c" => _("Country"),
- "base" => _("Base"),
- "l" => _("Location"),
- "telephoneNumber" => _("Telephone"),
"ou" => _("Department name"),
+ "description" => _("Description"),
"businessCategory" => _("Category"),
+ "base" => _("Base"),
+
"st" => _("State"),
+ "l" => _("Location"),
"postalAddress" => _("Address"),
- "gosaUnitTag" => _("Administrative settings"),
- "facsimileTelephoneNumber" => _("Fax"))
+ "telephoneNumber" => _("Telephone"),
+ "facsimileTelephoneNumber" => _("Fax"),
+
+ "gosaUnitTag" => _("Administrative settings"))
));
}
}
/* This one matches with the latter part. Break and don't fix this entry */
- if (preg_match('/(^|,)'.normalizePreg($key).'$/', $dn)){
+ if (preg_match('/(^|,)'.preg_quote($key).'$/', $dn)){
@DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, "DEBUG: Possibly relevant: $key", "Tagging");
$relevant[strlen($key)]= $ntag;
continue;