![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/gosa-core/plugins/admin/departments/class_departmentGeneric.inc b/gosa-core/plugins/admin/departments/class_departmentGeneric.inc
index 429b454f23f2751892d9633f1387ca5ba988f664..fc808e028976954813300647351b1fe8ef177690 100644 (file)
<?php
/*
- This code is part of GOsa (https://gosa.gonicus.de)
- Copyright (C) 2003 Cajus Pollmeier
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This code is part of GOsa (http://www.gosa-project.org)
+ * Copyright (C) 2003-2008 GONICUS GmbH
+ *
+ * ID: $$Id$$
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
class department extends plugin
var $objectclasses= array("top", "gosaDepartment", "organizationalUnit");
var $initially_was_tagged = false;
-
- /* Temporary disable the Unit Tag functionalityi.
- This is not used anymore, cause of the new acl implementation.
- Setting this to TRUE will disable
- all POST / GET activity, "Department tagging" and the checkbox within the generic template.
- */
- var $UnitTagDiabled = TRUE;
var $orig_base = "";
var $orig_ou = "";
$smarty->assign("base_select", $this->base);
/* Set admin unit flag */
- $smarty->assign("UnitTagDiabled",$this->UnitTagDiabled);
- if(!$this->UnitTagDiabled){
- if ($this->is_administrational_unit) {
- $smarty->assign("unitTag", "checked");
- } else {
- $smarty->assign("unitTag", "");
- }
+ if ($this->is_administrational_unit) {
+ $smarty->assign("unitTag", "checked");
+ } else {
+ $smarty->assign("unitTag", "");
}
return($smarty->fetch (get_template_path('generic.tpl', TRUE)));
$ldap->cd ($this->dn);
$ldap->recursive_remove();
new log("remove","department/".get_class($this),$this->dn,array_keys($this->attrs),$ldap->get_error());
- show_ldap_error($ldap->get_error(), sprintf(_("Removing of department with dn '%s' failed."),$this->dn));
+ if (!$ldap->success()){
+ msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $this->dn, LDAP_DEL, get_class()));
+ }
/* Optionally execute a command after we're done */
$this->handle_post_events('remove');
}
/* Save tagging flag */
- if(!$this->UnitTagDiabled){
- if ($this->acl_is_writeable("unitTag")){
- if (isset($_POST['unitTag'])){
- $this->is_administrational_unit= true;
- } else {
- $this->is_administrational_unit= false;
- }
+ if ($this->acl_is_writeable("unitTag")){
+ if (isset($_POST['unitTag'])){
+ $this->is_administrational_unit= true;
+ } else {
+ $this->is_administrational_unit= false;
}
}
}
$ldap= $this->config->get_ldap_link();
$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.");
+ $message[]= msgPool::duplicated(_("Name"));
} elseif ($this->orig_dn != $this->dn && !($attrs === FALSE)){
- $message[]= _("Department with that 'Name' already exists.");
+ $message[]= msgPool::duplicated(_("Name"));
}
/* All required fields are set? */
if ($this->ou == ""){
$message[]= _("Required field 'Name' is not set.");
+ $message[]= msgPool::required(_("Name"));
}
if ($this->description == ""){
$message[]= _("Required field 'Description' is not set.");
+ $message[]= msgPool::required(_("Description"));
}
- 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(tests::is_department_name_reserved($this->ou,$this->base)){
+ $message[]= msgPool::reserved(_("Name"));
}
if (preg_match ('/[#+:=>\\\\\/]/', $this->ou)){
- $message[]= _("The field 'Name' contains invalid characters.");
+ $message[]= msgPool::invalid(_("Name"), $this->ou, "/[^#+:=>\\\\\/]/");
}
- if (!is_phone_nr($this->telephoneNumber)){
- $message[]= _("The field 'Phone' contains an invalid phone number.");
+ if (!tests::is_phone_nr($this->telephoneNumber)){
+ $message[]= msgPool::invalid(_("Phone"), $this->telephoneNumber, "/[\/0-9 ()+*-]/");
}
- if (!is_phone_nr($this->facsimileTelephoneNumber)){
- $message[]= _("The field 'Fax' contains an invalid phone number.");
+ if (!tests::is_phone_nr($this->facsimileTelephoneNumber)){
+ $message[]= msgPool::invalid(_("Fax"), $this->facsimileTelephoneNumber, "/[\/0-9 ()+*-]/");
}
return $message;
{
$ldap= $this->config->get_ldap_link();
- if(!$this->UnitTagDiabled){
+ /* Add tag objects if needed */
+ if ($this->is_administrational_unit){
- /* Add tag objects if needed */
- if ($this->is_administrational_unit){
+ /* If this wasn't tagged before add oc an reset unit tag */
+ if(!$this->initially_was_tagged){
+ $this->objectclasses[]= "gosaAdministrativeUnit";
+ $this->gosaUnitTag= "";
- /* If this wasn't tagged before add oc an reset unit tag */
- if(!$this->initially_was_tagged){
- $this->objectclasses[]= "gosaAdministrativeUnit";
- $this->gosaUnitTag= "";
-
- /* It seams that this method is called twice,
- set this to true. to avoid adding this oc twice */
- $this->initially_was_tagged = true;
- }
+ /* It seams that this method is called twice,
+ set this to true. to avoid adding this oc twice */
+ $this->initially_was_tagged = true;
+ }
- if ($this->gosaUnitTag == ""){
+ if ($this->gosaUnitTag == ""){
- /* It's unlikely, but check if already used... */
- $try= 5;
- $ldap->cd($this->config->current['BASE']);
- while ($try--){
+ /* It's unlikely, but check if already used... */
+ $try= 5;
+ $ldap->cd($this->config->current['BASE']);
+ while ($try--){
- /* Generate microtime stamp as tag */
- list($usec, $sec)= explode(" ", microtime());
- $time_stamp= preg_replace("/\./", "", $sec.$usec);
+ /* Generate microtime stamp as tag */
+ list($usec, $sec)= explode(" ", microtime());
+ $time_stamp= preg_replace("/\./", "", $sec.$usec);
- $ldap->search("(&(objectClass=gosaAdministrativeUnit)(gosaUnitTag=$time_stamp))",array("gosaUnitTag"));
- if ($ldap->count() == 0){
- break;
- }
+ $ldap->search("(&(objectClass=gosaAdministrativeUnit)(gosaUnitTag=$time_stamp))",array("gosaUnitTag"));
+ if ($ldap->count() == 0){
+ break;
}
- if($try == 0) {
- print_red(_("Fatal error: Can't find an unused tag to mark the administrative unit!"));
- return;
- }
- $this->gosaUnitTag= preg_replace("/\./", "", $sec.$usec);
}
+ if($try == 0) {
+ msg_dialog::display(_("Fatal error"), _("Cannot find an unused tag for this administrative unit!"), WARNING_DIALOG);
+ return;
+ }
+ $this->gosaUnitTag= preg_replace("/\./", "", $sec.$usec);
}
}
- plugin::save();
+ $this->skipTagging = TRUE;
+ plugin::save();
- if(!$this->UnitTagDiabled){
+ $this->attrs['gosaUnitTag'] = $this->gosaUnitTag;
- /* Remove tag information if needed */
- if (!$this->is_administrational_unit){
- $tmp= array();
+ /* Remove tag information if needed */
+ if (!$this->is_administrational_unit){
+ $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;
- }
+ /* Remove gosaAdministrativeUnit from this plugin */
+ $has_unit_tag= false;
+ foreach($this->attrs['objectClass'] as $oc){
+ if (!preg_match("/^gosaAdministrativeUnit$/i", $oc)){
+ $tmp[]= $oc;
}
- $this->attrs['objectClass']= $tmp;
-
- if(!$has_unit_tag && isset($this->attrs['gosaUnitTag'])){
- $this->attrs['gosaUnitTag']= array();
+ if (preg_match("/^gosaAdministrativeUnitTag$/i", $oc)){
+ $has_unit_tag= true;
}
- $this->gosaUnitTag = "";
}
+ $this->attrs['objectClass']= $tmp;
+ $this->attrs['gosaUnitTag']= array();
+ $this->gosaUnitTag = "";
}
/* Write back to ldap */
$this->handle_post_events('add');
new log("create","department/".get_class($this),$this->dn,array_keys($this->attrs),$ldap->get_error());
}
- show_ldap_error($ldap->get_error(), sprintf(_("Saving of department with dn '%s' failed."),$this->dn));
-
-
- if(!$this->UnitTagDiabled){
- /* 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();
- }
+ if (!$ldap->success()){
+ msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $this->dn, LDAP_DEL, get_class()));
}
+
+ /* The parameter forces only to set must_be_tagged, and don't touch any objects
+ This will be done later */
+ $this->tag_objects(true);
/* Optionally execute a command after we're done */
$this->postcreate();
echo "<h3>".sprintf(_("Tagging '%s'."),"<i>".@LDAP::fix($this->dn)."</i>")."</h3>";
}
- $add= $this->is_administrational_unit;
- $len= strlen($this->dn);
- $ldap= $this->config->get_ldap_link();
- $ldap->cd($this->dn);
- if ($add){
- $ldap->search('(!(&(objectClass=gosaAdministrativeUnitTag)(gosaUnitTag='.
- $this->gosaUnitTag.')))', array('dn'));
- } else {
- $ldap->search('objectClass=gosaAdministrativeUnitTag', array('dn'));
- }
-
- while ($attrs= $ldap->fetch()){
-
- /* Skip self */
- if ($attrs['dn'] == $this->dn){
- continue;
- }
-
- /* Check for confilicting administrative units */
- $fix= true;
- foreach ($this->config->adepartments as $key => $tag){
- /* This one is shorter 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).'$/', $attrs['dn'])){
- $fix= false;
- break;
- }
- }
+ $add= $this->is_administrational_unit;
+ $len= strlen($this->dn);
+ $ldap= $this->config->get_ldap_link();
+ $ldap->cd($this->dn);
+ if ($add){
+ $ldap->search('(!(&(objectClass=gosaAdministrativeUnitTag)(gosaUnitTag='.
+ $this->gosaUnitTag.')))', array('dn'));
+ } else {
+ $ldap->search('objectClass=gosaAdministrativeUnitTag', array('dn'));
+ }
- /* Fix entry if needed */
- if ($fix){
- if($OnlySetTagFlag){
- $this->must_be_tagged =true;
- return;
- }
- $this->handle_object_tagging($attrs['dn'], $this->gosaUnitTag, TRUE );
- }
- }
+ while ($attrs= $ldap->fetch()){
+
+ /* Skip self */
+ if ($attrs['dn'] == $this->dn){
+ continue;
+ }
+
+ /* Check for confilicting administrative units */
+ $fix= true;
+ foreach ($this->config->adepartments as $key => $tag){
+ /* This one is shorter 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).'$/', $attrs['dn'])){
+ $fix= false;
+ break;
+ }
+ }
+
+ /* Fix entry if needed */
+ if ($fix){
+ if($OnlySetTagFlag){
+ $this->must_be_tagged =true;
+ return;
+ }
+ $this->handle_object_tagging($attrs['dn'], $this->gosaUnitTag, TRUE );
+ }
+ }
if(!$OnlySetTagFlag){
- 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 '<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>";
}
}
"facsimileTelephoneNumber" => _("Fax"))
));
}
+
+ function handle_object_tagging($dn= "", $tag= "", $show= false)
+ {
+ /* No dn? Self-operation... */
+ if ($dn == ""){
+ $dn= $this->dn;
+
+ /* No tag? Find it yourself... */
+ if ($tag == ""){
+ $len= strlen($dn);
+
+ @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, "No tag for $dn - looking for one...", "Tagging");
+ $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)){
+ @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, "DEBUG: Possibly relevant: $key", "Tagging");
+ $relevant[strlen($key)]= $ntag;
+ continue;
+ }
+
+ }
+
+ /* If we've some relevant tags to set, just get the longest one */
+ 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){
+ if ($show) {
+ echo sprintf(_("Object '%s' is already tagged"), @LDAP::fix($dn))."<br>";
+ flush();
+ }
+ return;
+ }
+ if (count($attrs)){
+ if ($show){
+ echo sprintf(_("Adding tag (%s) to object '%s'"), $tag, @LDAP::fix($dn))."<br>";
+ flush();
+ }
+ $nattrs= array("gosaUnitTag" => $tag);
+ $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);
+ if (!$ldap->success()){
+ msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $dn, LDAP_MOD, get_class()));
+ }
+ } else {
+ @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, "Not tagging ($tag) $dn - seems to have moved away", "Tagging");
+ }
+
+ } 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'])){
+ @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, "$dn is not tagged", "Tagging");
+ return;
+ }
+ if (count($attrs)){
+ if ($show){
+ echo sprintf(_("Removing tag from object '%s'"), @LDAP::fix($dn))."<br>";
+ flush();
+ }
+ $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);
+ if (!$ldap->success()){
+ msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $dn, LDAP_MOD, get_class()));
+ }
+ } else {
+ @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, "Not removing tag ($tag) $dn - seems to have moved away", "Tagging");
+ }
+ }
+
+ }
+
}
+
// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:
?>