![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7d77216)
raw | patch | inline | side by side (parent: 7d77216)
| author | hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
| Thu, 11 May 2006 10:50:07 +0000 (10:50 +0000) | ||
| committer | hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
| Thu, 11 May 2006 10:50:07 +0000 (10:50 +0000) |
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@3290 594d385d-05f5-0310-b6e9-bd551577e9d8
| plugins/admin/departments/class_departmentGeneric.inc | patch | blob | history | |
| plugins/admin/departments/class_departmentManagement.inc | patch | blob | history |
diff --git a/plugins/admin/departments/class_departmentGeneric.inc b/plugins/admin/departments/class_departmentGeneric.inc
index 0954ac8eca934f65157405350b705c566393ed63..790f787c455cb32cc28c3da3320cf016eadf7144 100644 (file)
var $last_dep_sorting= "invalid";
var $departments= array();
+ var $must_be_tagged = false;
+
/* attribute list for save action */
var $attributes= array("ou", "description", "businessCategory", "st", "l", "postalAddress",
"telephoneNumber", "facsimileTelephoneNumber", "gosaUnitTag");
$smarty->assign("unitTag", "");
}
$smarty->assign("unitTag"."ACL", chkacl($this->acl, "unitTag"));
-
+
return($smarty->fetch (get_template_path('generic.tpl', TRUE)));
}
/* 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())
- );
+ 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);
$this->gosaUnitTag= preg_replace("/\./", "", $sec.$usec);
}
} else {
- $this->gosaUnitTag= "";
+ $this->gosaUnitTag= "";
}
plugin::save();
$this->attrs['gosaUnitTag']= array();
}
}
-
+
/* Write back to ldap */
$ldap= $this->config->get_ldap_link();
$ldap->cat($this->dn, array('dn'));
$a= $ldap->fetch();
$ldap->cd($this->dn);
-
+
if (count($a)){
$this->cleanup();
$ldap->modify ($this->attrs);
$this->handle_post_events('add');
}
show_ldap_error($ldap->get_error());
- $this->tag_objects();
- /* Optionally execute a command after we're done */
+
+ /* Optionally execute a command after we're done */
$this->postcreate();
+
+ $this->must_be_tagged =true;
+ $smarty = get_smarty();
+ $smarty->assign("src","?plug=".$_GET['plug']."&Tag");
+ $display= $smarty->fetch(get_template_path("iframe.tpl",TRUE));
+ return($display);
+ exit();
+
+
}
$ldap->cd($this->dn);
if ($add){
$ldap->search('(!(&(objectClass=gosaAdministrativeUnitTag)(gosaUnitTag='.
- $this->gosaUnitTag.')))', array('dn'));
+ $this->gosaUnitTag.')))', array('dn'));
} else {
$ldap->search('objectClass=gosaAdministrativeUnitTag', array('dn'));
}
break;
}
}
-
+
/* Fix entry if needed */
if ($fix){
+
$this->handle_object_tagging($attrs['dn'], $this->gosaUnitTag);
}
}
echo sprintf_("Recursive_move: '%s' already exists", $dst_dn)."<br>";
return (FALSE);
}
-
+
/* Perform a search for all objects to be moved */
$objects= array();
$ldap->cd($src_dn);
/* Copy objects from small to big indent levels by replacing src_dn by dst_dn */
foreach ($objects as $object => $len){
-
+
$src= str_replace("\\","\\\\",$object);
$dst= preg_replace("/".str_replace("\\","\\\\",$src_dn)."$/", "$dst_dn", $object);
$dst= str_replace($src_dn,$dst_dn,$object);
echo "<b>"._("Object").":</b> $src<br>";
-
+
if (!$this->copy($src, $dst)){
echo "<font color='#FF0000'><br>".sprintf(_("FAILED to copy %s, aborting operation"),$src)."</font>";
return (FALSE);
</form></div>";
echo "</body></html>";
-
+
return (TRUE);
}
}
+ function must_be_tagged()
+ {
+ return $this->must_be_tagged;
+ }
+
function am_i_moved()
{
return $this->rec_cpy;
}
-}
+ function handle_object_tagging($dn= "", $tag= "")
+ {
+ //FIXME: How to optimize this? We have at least two
+ // LDAP accesses per object. It would be a good
+ // idea to have it integrated.
+
+ /* No dn? Self-operation... */
+ if ($dn == ""){
+ $dn= $this->dn;
+
+ /* No tag? Find it yourself... */
+ if ($tag == ""){
+ $len= strlen($dn);
+
+ echo sprintf(_("No tag for %s - looking for one..."),$dn);
+ $relevant= array();
+ foreach ($this->config->adepartments as $key => $ntag){
+
+ /* This one is bigger than our dn, its not relevant... */
+ if ($len <= strlen($key)){
+ continue;
+ }
+
+ /* This one matches with the latter part. Break and don't fix this entry */
+ if (preg_match('/(^|,)'.normalizePreg($key).'$/', $dn)){
+ echo sprintf(_("Possibly relevant: %s"),$key);
+ $relevant[strlen($key)]= $ntag;
+ continue;
+ }
+
+ }
+ if (count($relevant)){
+ ksort($relevant);
+ $tmp= array_keys($relevant);
+ $idx= end($tmp);
+ $tag= $relevant[$idx];
+ $this->gosaUnitTag= $tag;
+ }
+ }
+ }
+
+
+ /* Set tag? */
+ if ($tag != ""){
+ /* Set objectclass and attribute */
+ $ldap= $this->config->get_ldap_link();
+ $ldap->cat($dn, array('gosaUnitTag', 'objectClass'));
+ $attrs= $ldap->fetch();
+ if(isset($attrs['gosaUnitTag'][0]) && $attrs['gosaUnitTag'][0] == $tag){
+ echo sprintf(_("%s is already tagged"),$dn);
+ return;
+ }
+ if (count($attrs)){
+ echo sprintf(_("Add tagging (%s) to %s"),$tag,$dn);
+ $nattrs= array("gosaUnitTag" => $this->gosaUnitTag);
+ $nattrs['objectClass']= array();
+ for ($i= 0; $i<$attrs['objectClass']['count']; $i++){
+ $oc= $attrs['objectClass'][$i];
+ if ($oc != "gosaAdministrativeUnitTag"){
+ $nattrs['objectClass'][]= $oc;
+ }
+ }
+ $nattrs['objectClass'][]= "gosaAdministrativeUnitTag";
+ $ldap->cd($dn);
+ $ldap->modify($nattrs);
+ } else {
+ echo sprintf(_("Not tagging (%s) %s - seems to have moved away"),$tag,$dn);
+ }
+ } else {
+ /* Remove objectclass and attribute */
+ $ldap= $this->config->get_ldap_link();
+ $ldap->cat($dn, array('gosaUnitTag', 'objectClass'));
+ $attrs= $ldap->fetch();
+ if (isset($attrs['objectClass']) && !in_array_ics("gosaAdministrativeUnitTag", $attrs['objectClass'])){
+ echo sprintf(_("%s is not tagged"),$dn);
+ return;
+ }
+ if (count($attrs)){
+ echo sprintf(_("Remove tagging from %s"),$dn);
+ $nattrs= array("gosaUnitTag" => array());
+ $nattrs['objectClass']= array();
+ for ($i= 0; $i<$attrs['objectClass']['count']; $i++){
+ $oc= $attrs['objectClass'][$i];
+ if ($oc != "gosaAdministrativeUnitTag"){
+ $nattrs['objectClass'][]= $oc;
+ }
+ }
+ $ldap->cd($dn);
+ $ldap->modify($nattrs);
+ show_ldap_error($ldap->get_error());
+ } else {
+ echo sprintf(_("Not removing tag (%s) %s - seems to have moved away"),$tag,$dn);
+ }
+ }
+ }
+}
+// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
?>
diff --git a/plugins/admin/departments/class_departmentManagement.inc b/plugins/admin/departments/class_departmentManagement.inc
index f6163834fee77c2925012c266001792693bf4c80..b2feb33eafe0015affeeff1c72e6855f5650fff9 100644 (file)
/* Reload departments */
$this->config->get_departments();
- $this->config->make_idepartments();
- $_SESSION['config']= $this->config;
-
$smarty = get_smarty();
$display = "";
$depfilter = get_global("depfilter");
$s_action = ""; // Will contain an action, like del or edit
$s_entry = ""; // The entry name for edit delete -...
+ $this->config->make_idepartments();
+
if (isset($_POST['regex'])){
$depfilter['regex']= $_POST['regex'];
}
}
}
+
+ /* This department must be tagged
+ */
+ if((isset($_GET['Tag'])) && ($this->deptabs->by_object['department']->must_be_tagged())){
+ $this->deptabs->by_object['department']->tag_objects();
+ if ($this->dn != "new"){
+ del_lock ($this->dn);
+ }
+ unset ($this->deptabs);
+ $this->deptabs= NULL;
+ unset ($_SESSION['objectinfo']);
+ exit();
+ }
+
+
/* Edit Complete ...
* Finish request
*/
$this->deptabs->save(true);
$this->deptabs->by_object['department']->recursive_move("","",true);
$this->reload ();
-
- /* Group has been saved successfully, remove lock from LDAP. */
+ /* Group has been saved successfully, remove lock from
+ LDAP. */
if ($this->dn != "new"){
del_lock ($this->dn);
}
/* Save user data to ldap */
$disp = $this->deptabs->save();
- if(!$this->deptabs->by_object['department']->am_i_moved()){
+ if(!($this->deptabs->by_object['department']->am_i_moved() || ($this->deptabs->by_object['department']->must_be_tagged())) ){
gosa_log ("Department object'".$this->dn."' has been saved");
/* Group has been saved successfully, remove lock from
}
}
-
/* User cancelt edit oder delete
* Cancel dialog
*/
}
natcasesort ($this->departments);
reset ($this->departments);
+
+ /* Unset global department list */
+ unset($_SESSION['cached_departments']);
}
function remove_from_parent()