X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_plugin.inc;h=ba5c715c72d8504c21f5a1e96a026576399a1f80;hb=f04b7b95f6468a806353f05cdd3faf97dd744d5c;hp=b8e01fa84e79b60822ac5bc8f2557217f6b3a31b;hpb=71d69612c44bde64986692f0f536017594de3704;p=gosa.git diff --git a/gosa-core/include/class_plugin.inc b/gosa-core/include/class_plugin.inc index b8e01fa84..ba5c715c7 100644 --- a/gosa-core/include/class_plugin.inc +++ b/gosa-core/include/class_plugin.inc @@ -31,7 +31,11 @@ */ class plugin -{ +{ + /*! \brief The title shown in path menu while this plugin is visible. + */ + var $pathTitle = ""; + /*! \brief Reference to parent object @@ -141,6 +145,9 @@ class plugin */ function plugin (&$config, $dn= NULL, $object= NULL) { + + $this->initTime = microtime(TRUE); + /* Configuration is fine, allways */ $this->config= &$config; $this->dn= $dn; @@ -157,6 +164,10 @@ class plugin } } + // Create statistic table entry + stats::log('plugin', $class = get_class($this), $category = array($this->acl_category), $action = 'open', + $amount = 1, $duration = (microtime(TRUE) - $this->initTime)); + /* Handle new accounts, don't read information from LDAP */ if ($dn == "new"){ return; @@ -276,6 +287,12 @@ class plugin session::set('LOCK_VARS_USED_GET',array()); session::set('LOCK_VARS_USED_POST',array()); session::set('LOCK_VARS_USED_REQUEST',array()); + + pathNavigator::registerPlugin($this); + + // Create statistic table entry + stats::log('plugin', $class = get_class($this), $category = array($this->acl_category), $action = 'view', + $amount = 1, $duration = (microtime(TRUE) - $this->initTime)); } /*! \brief Removes object from parent @@ -313,6 +330,13 @@ class plugin /* $ldap->modify($this->attrs); */ + if($this->initially_was_account){ + $this->handle_pre_events('remove'); + + // Create statistic table entry + stats::log('plugin', $class = get_class($this), $category = array($this->acl_category), $action = 'remove', + $amount = 1, $duration = (microtime(TRUE) - $this->initTime)); + } } @@ -327,16 +351,14 @@ class plugin /* Save values to object */ foreach ($this->attributes as $val){ - if ($this->acl_is_writeable($val) && isset ($_POST["$val"])){ + if (isset ($_POST["$val"]) && $this->acl_is_writeable($val)){ + /* Check for modifications */ - if (get_magic_quotes_gpc()) { - $data= stripcslashes($_POST["$val"]); - } else { - $data= $this->$val = $_POST["$val"]; - } + $data= get_post($val); if ($this->$val != $data){ $this->is_modified= TRUE; } + $this->$val = $data; /* Okay, how can I explain this fix ... * In firefox, disabled option fields aren't selectable ... but in IE you can select these fileds. @@ -394,6 +416,45 @@ class plugin /* Handle tagging */ $this->tag_attrs($this->attrs); + + if($this->is_new){ + $this->handle_pre_events('add'); + + // Create statistic table entry + stats::log('plugin', $class = get_class($this), $category = array($this->acl_category), $action = 'create', + $amount = 1, $duration = (microtime(TRUE) - $this->initTime)); + }else{ + $this->handle_pre_events('modify'); + + // Create statistic table entry + stats::log('plugin', $class = get_class($this), $category = array($this->acl_category), $action = 'modify', + $amount = 1, $duration = (microtime(TRUE) - $this->initTime)); + } + } + + + /*! \brief Forward command execution requests + * to the hook execution method. + */ + function handle_pre_events($mode, $addAttrs= array()) + { + if(!in_array($mode, array('add','remove','modify'))){ + trigger_error(sprintf("Invalid pre event type given %s! Valid types are [add,modify,remove].", $mode)); + return; + } + switch ($mode){ + case "add": + plugin::callHook($this,"PRECREATE", $addAttrs); + break; + + case "modify": + plugin::callHook($this,"PREMODIFY", $addAttrs); + break; + + case "remove": + plugin::callHook($this,"PREREMOVE", $addAttrs); + break; + } } @@ -460,8 +521,7 @@ class plugin } /* Find hooks entries for this class */ - $command= $this->config->search(get_class($this), "CHECK", array('menu', 'tabs')); - + $command = $this->config->configRegistry->getPropertyValue(get_class($this),"check"); if ($command != ""){ if (!check_command($command)){ @@ -518,7 +578,7 @@ class plugin $current_csn = getEntryCSN($this->dn); if($current_csn != $this->entryCSN && !empty($this->entryCSN) && !empty($current_csn)){ $this->entryCSN = $current_csn; - $message[] = _("The object has changed since opened in GOsa. All changes that may be done by others get lost if you save this entry!"); + $message[] = _("The current object has been altered while beeing edited. If you save this entry, changes that have been made by others will be discarded!"); } } return ($message); @@ -588,9 +648,10 @@ class plugin } else { $state= ""; } - $display= "\n

$text

\n"; - $display.= "

 

"; + $display = "
\n"; + $display.= "

$text

\n"; + $display.= "\n"; + $display.= "
\n"; return($display); } @@ -604,31 +665,14 @@ class plugin } else { $state= ""; } - $display= "\n

$text

\n"; - $display.= "

 

"; - + $display = "
\n"; + $display.= "

$text

\n"; + $display.= "\n"; + $display.= "
\n"; return($display); } - /*! \brief Show header message for tab dialogs */ - function show_header($button_text, $text, $disabled= FALSE) - { - echo "FIXME: show_header should be replaced by show_disable_header and show_enable_header
"; - if ($disabled == TRUE){ - $state= "disabled"; - } else { - $state= ""; - } - $display= "\n

$text

\n"; - $display.= "acl_is_createable()?'':'disabled')." ".$state. - ">

 

"; - - return($display); - } - /* Create unique DN */ function create_unique_dn2($data, $base) @@ -852,8 +896,7 @@ class plugin $ldap->cd($this->config->current['BASE']); $ldap->create_missing_trees(preg_replace("/^[^,]+,/","",$dst_dn)); if (!$ldap->rename_dn($src_dn,$dst_dn)){ -# msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $src_dn, "", get_class())); - new log("debug","Ldap Protocol v3 implementation error, ldap_rename failed, falling back to manual copy.","FROM: $src_dn -- TO: $dst_dn",array(),$ldap->get_error()); + new log("debug","LDAP protocol v3 implementation error, ldap_rename failed, falling back to manual copy.","FROM: $src_dn -- TO: $dst_dn",array(),$ldap->get_error()); @DEBUG(DEBUG_LDAP,__LINE__,__FUNCTION__,__FILE__,"Rename failed FROM: $src_dn -- TO: $dst_dn", "Ldap Protocol v3 implementation error, falling back to maunal method."); return(FALSE); @@ -872,7 +915,7 @@ class plugin // Migrate objectgroups if needed $ogroups = get_sub_list("(&(objectClass=gosaGroupOfNames)(member=".LDAP::prepare4filter(LDAP::fix($src_dn))."))", - "ogroups", array(get_ou("ogroupRDN")),$this->config->current['BASE'],array("dn"), GL_SUBSEARCH | GL_NO_ACL_CHECK); + "ogroups", array(get_ou("group", "ogroupRDN")),$this->config->current['BASE'],array("dn"), GL_SUBSEARCH | GL_NO_ACL_CHECK); // Walk through all objectGroups foreach($ogroups as $ogroup){ @@ -888,7 +931,7 @@ class plugin } // Migrate rfc groups if needed - $groups = get_sub_list("(&(objectClass=posixGroup)(member=".LDAP::prepare4filter(LDAP::fix($src_dn))."))","groups", array(get_ou("groupRDN")),$this->config->current['BASE'],array("dn"), GL_SUBSEARCH | GL_NO_ACL_CHECK); + $groups = get_sub_list("(&(objectClass=posixGroup)(member=".LDAP::prepare4filter(LDAP::fix($src_dn))."))","groups", array(get_ou("core", "groupRDN")),$this->config->current['BASE'],array("dn"), GL_SUBSEARCH | GL_NO_ACL_CHECK); // Walk through all POSIX groups foreach($groups as $group){ @@ -899,7 +942,7 @@ class plugin } /* Update roles to use the new entry dn */ - $roles = get_sub_list("(&(objectClass=organizationalRole)(roleOccupant=".LDAP::prepare4filter(LDAP::fix($src_dn))."))","roles", array(get_ou("roleRDN")),$this->config->current['BASE'],array("dn"), GL_SUBSEARCH | GL_NO_ACL_CHECK); + $roles = get_sub_list("(&(objectClass=organizationalRole)(roleOccupant=".LDAP::prepare4filter(LDAP::fix($src_dn))."))","roles", array(get_ou("roleGeneric", "roleRDN")),$this->config->current['BASE'],array("dn"), GL_SUBSEARCH | GL_NO_ACL_CHECK); // Walk through all roles foreach($roles as $role){ @@ -924,9 +967,14 @@ class plugin $ldap->cd($entry['dn']); $ldap->modify($update); if(!$ldap->success()){ - trigger_error(sprintf("Failed to update manager for '%s', error was '%s'", $entry['dn'], $ldap->get_error())); + trigger_error(sprintf("Failed to update manager for %s: %s", bold($entry['dn']), $ldap->get_error())); } } + + // Migrate 'dyn-groups' here. labeledURIObject + if(class_available('DynamicLdapGroup')) { + DynamicLdapGroup::moveDynGroup($this->config,$src_dn,$dst_dn); + } /* Check if there are gosa departments moved. If there were deps moved, the force reload of config->deps. @@ -954,7 +1002,10 @@ class plugin return(TRUE); } - + // Create statistic table entry + stats::log('plugin', $class = get_class($this), $category = array($this->acl_category), $action = 'move', + $amount = 1, $duration = (microtime(TRUE) - $this->initTime)); + /* Try to move the entry instead of copy & delete */ if(TRUE){ @@ -1137,114 +1188,6 @@ class plugin } - /*! \brief Create a snapshot of the current object */ - function create_snapshot($type= "snapshot", $description= array()) - { - - /* Check if snapshot functionality is enabled */ - if(!$this->snapshotEnabled()){ - return; - } - - /* Get configuration from gosa.conf */ - $config = $this->config; - - /* Create lokal ldap connection */ - $ldap= $this->config->get_ldap_link(); - $ldap->cd($this->config->current['BASE']); - - /* check if there are special server configurations for snapshots */ - if($config->get_cfg_value("snapshotURI") == ""){ - - /* Source and destination server are both the same, just copy source to dest obj */ - $ldap_to = $ldap; - $snapldapbase = $this->config->current['BASE']; - - }else{ - $server = $config->get_cfg_value("snapshotURI"); - $user = $config->get_cfg_value("snapshotAdminDn"); - $password = $this->config->get_credentials($config->get_cfg_value("snapshotAdminPassword")); - $snapldapbase = $config->get_cfg_value("snapshotBase"); - - $ldap_to = new ldapMultiplexer(new LDAP($user,$password, $server)); - $ldap_to -> cd($snapldapbase); - - if (!$ldap_to->success()){ - msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap_to->get_error(), $snapldapbase, "", get_class())); - } - - } - - /* check if the dn exists */ - if ($ldap->dn_exists($this->dn)){ - - /* Extract seconds & mysecs, they are used as entry index */ - list($usec, $sec)= explode(" ", microtime()); - - /* Collect some infos */ - $base = $this->config->current['BASE']; - $snap_base = $config->get_cfg_value("snapshotBase"); - $base_of_object = preg_replace ('/^[^,]+,/i', '', $this->dn); - $new_base = preg_replace("/".preg_quote($base, '/')."$/","",$base_of_object).$snap_base; - - /* Create object */ -#$data = preg_replace('/^dn:.*\n/', '', $ldap->gen_ldif($this->dn,"(!(objectClass=gosaDepartment))")); - $data = $ldap->gen_ldif($this->dn,"(&(!(objectClass=gosaDepartment))(!(objectClass=FAIclass)))"); - $newName = str_replace(".", "", $sec."-".$usec); - $target= array(); - $target['objectClass'] = array("top", "gosaSnapshotObject"); - $target['gosaSnapshotData'] = gzcompress($data, 6); - $target['gosaSnapshotType'] = $type; - $target['gosaSnapshotDN'] = $this->dn; - $target['description'] = $description; - $target['gosaSnapshotTimestamp'] = $newName; - - /* Insert the new snapshot - But we have to check first, if the given gosaSnapshotTimestamp - is already used, in this case we should increment this value till there is - an unused value. */ - $new_dn = "gosaSnapshotTimestamp=".$newName.",".$new_base; - $ldap_to->cat($new_dn); - while($ldap_to->count()){ - $ldap_to->cat($new_dn); - $newName = str_replace(".", "", $sec."-".($usec++)); - $new_dn = "gosaSnapshotTimestamp=".$newName.",".$new_base; - $target['gosaSnapshotTimestamp'] = $newName; - } - - /* Inset this new snapshot */ - $ldap_to->cd($snapldapbase); - $ldap_to->create_missing_trees($snapldapbase); - $ldap_to->create_missing_trees($new_base); - $ldap_to->cd($new_dn); - $ldap_to->add($target); - if (!$ldap_to->success()){ - msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap_to->get_error(), $new_dn, LDAP_ADD, get_class())); - } - - if (!$ldap->success()){ - msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $new_base, "", get_class())); - } - - } - } - - /*! \brief Remove a snapshot */ - function remove_snapshot($dn) - { - $ui = get_userinfo(); - $old_dn = $this->dn; - $this->dn = $dn; - $ldap = $this->config->get_ldap_link(); - $ldap->cd($this->config->current['BASE']); - $ldap->rmdir_recursive($this->dn); - if(!$ldap->success()){ - msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $this->dn)); - } - $this->dn = $old_dn; - } - - /*! \brief Test if snapshotting is enabled * * Test weither snapshotting is enabled or not. There will also be some errors posted, @@ -1253,271 +1196,13 @@ class plugin */ function snapshotEnabled() { - return $this->config->snapshotEnabled(); - } - - - /* \brief Return available snapshots for the given base */ - function Available_SnapsShots($dn,$raw = false) - { - if(!$this->snapshotEnabled()) return(array()); - - /* Create an additional ldap object which - points to our ldap snapshot server */ - $ldap= $this->config->get_ldap_link(); - $ldap->cd($this->config->current['BASE']); - $cfg= &$this->config->current; - - /* check if there are special server configurations for snapshots */ - if($this->config->get_cfg_value("snapshotURI") == ""){ - $ldap_to = $ldap; - }else{ - $server = $this->config->get_cfg_value("snapshotURI"); - $user = $this->config->get_cfg_value("snapshotAdminDn"); - $password = $this->config->get_credentials($this->config->get_cfg_value("snapshotAdminPassword")); - $snapldapbase = $this->config->get_cfg_value("snapshotBase"); - $ldap_to = new ldapMultiplexer(new LDAP($user,$password, $server)); - $ldap_to -> cd($snapldapbase); - if (!$ldap_to->success()){ - msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap_to->get_error(), $snapldapbase, "", get_class())); - } - } - - /* Prepare bases and some other infos */ - $base = $this->config->current['BASE']; - $snap_base = $this->config->get_cfg_value("snapshotBase"); - $base_of_object = preg_replace ('/^[^,]+,/i', '', $dn); - $new_base = preg_replace("/".preg_quote($base, '/')."$/","",$base_of_object).$snap_base; - $tmp = array(); - - /* Fetch all objects with gosaSnapshotDN=$dn */ - $ldap_to->cd($new_base); - $ldap_to->ls("(&(objectClass=gosaSnapshotObject)(gosaSnapshotDN=".$dn."))",$new_base, - array("gosaSnapshotType","gosaSnapshotTimestamp","gosaSnapshotDN","description")); - - /* Put results into a list and add description if missing */ - while($entry = $ldap_to->fetch()){ - if(!isset($entry['description'][0])){ - $entry['description'][0] = ""; - } - $tmp[] = $entry; - } - - /* Return the raw array, or format the result */ - if($raw){ - return($tmp); - }else{ - $tmp2 = array(); - foreach($tmp as $entry){ - $tmp2[base64_encode($entry['dn'])] = $entry['description'][0]; - } - } - return($tmp2); + return $this->config->snapshotEnabled(); } - function getAllDeletedSnapshots($base_of_object,$raw = false) - { - if(!$this->snapshotEnabled()) return(array()); - - /* Create an additional ldap object which - points to our ldap snapshot server */ - $ldap= $this->config->get_ldap_link(); - $ldap->cd($this->config->current['BASE']); - $cfg= &$this->config->current; - - /* check if there are special server configurations for snapshots */ - if($this->config->get_cfg_value("snapshotURI") == ""){ - $ldap_to = $ldap; - }else{ - $server = $this->config->get_cfg_value("snapshotURI"); - $user = $this->config->get_cfg_value("snapshotAdminDn"); - $password = $this->config->get_credentials($this->config->get_cfg_value("snapshotAdminPassword")); - $snapldapbase = $this->config->get_cfg_value("snapshotBase"); - $ldap_to = new ldapMultiplexer(new LDAP($user,$password, $server)); - $ldap_to -> cd($snapldapbase); - if (!$ldap_to->success()){ - msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap_to->get_error(), $snapldapbase, "", get_class())); - } - } - - /* Prepare bases */ - $base = $this->config->current['BASE']; - $snap_base = $this->config->get_cfg_value("snapshotBase"); - $new_base = preg_replace("/".preg_quote($base, '/')."$/","",$base_of_object).$snap_base; - - /* Fetch all objects and check if they do not exist anymore */ - $ui = get_userinfo(); - $tmp = array(); - $ldap_to->cd($new_base); - $ldap_to->ls("(objectClass=gosaSnapshotObject)",$new_base,array("gosaSnapshotType","gosaSnapshotTimestamp","gosaSnapshotDN","description")); - while($entry = $ldap_to->fetch()){ - - $chk = str_replace($new_base,"",$entry['dn']); - if(preg_match("/,ou=/",$chk)) continue; - - if(!isset($entry['description'][0])){ - $entry['description'][0] = ""; - } - $tmp[] = $entry; - } - - /* Check if entry still exists */ - foreach($tmp as $key => $entry){ - $ldap->cat($entry['gosaSnapshotDN'][0]); - if($ldap->count()){ - unset($tmp[$key]); - } - } - - /* Format result as requested */ - if($raw) { - return($tmp); - }else{ - $tmp2 = array(); - foreach($tmp as $key => $entry){ - $tmp2[base64_encode($entry['dn'])] = $entry['description'][0]; - } - } - return($tmp2); - } - - - /* \brief Restore selected snapshot */ - function restore_snapshot($dn) - { - if(!$this->snapshotEnabled()) return(array()); - - $ldap= $this->config->get_ldap_link(); - $ldap->cd($this->config->current['BASE']); - $cfg= &$this->config->current; - - /* check if there are special server configurations for snapshots */ - if($this->config->get_cfg_value("snapshotURI") == ""){ - $ldap_to = $ldap; - }else{ - $server = $this->config->get_cfg_value("snapshotURI"); - $user = $this->config->get_cfg_value("snapshotAdminDn"); - $password = $this->config->get_credentials($this->config->get_cfg_value("snapshotAdminPassword")); - $snapldapbase = $this->config->get_cfg_value("snapshotBase"); - $ldap_to = new ldapMultiplexer(new LDAP($user,$password, $server)); - $ldap_to -> cd($snapldapbase); - if (!$ldap_to->success()){ - msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap_to->get_error(), $snapldapbase, "", get_class())); - } - } - - /* Get the snapshot */ - $ldap_to->cat($dn); - $restoreObject = $ldap_to->fetch(); - - /* Prepare import string */ - $data = gzuncompress($ldap_to->get_attribute($dn,'gosaSnapshotData')); - - /* Import the given data */ - $err = ""; - $ldap->import_complete_ldif($data,$err,false,false); - if (!$ldap->success()){ - msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $dn, "", get_class())); - } - } - - - function showSnapshotDialog($base,$baseSuffixe,&$parent) - { - $once = true; - $ui = get_userinfo(); - $this->parent = $parent; - - foreach($_POST as $name => $value){ - - /* Create a new snapshot, display a dialog */ - if(preg_match("/^CreateSnapShotDialog_[^_]*_[xy]$/",$name) && $once){ - - $entry = base64_decode(preg_replace("/^CreateSnapShotDialog_([^_]*)_[xy]$/","\\1",$name)); - $once = false; - $entry = preg_replace("/^CreateSnapShotDialog_/","",$entry); - - if(!empty($entry) && $ui->allow_snapshot_create($entry,$this->parent->acl_module)){ - $this->snapDialog = new SnapShotDialog($this->config,$entry,$this); - }else{ - msg_dialog::display(_("Permission"),sprintf(_("You are not allowed to create a snapshot for %s."),$entry),ERROR_DIALOG); - } - } - - /* Restore a snapshot, display a dialog with all snapshots of the current object */ - if(preg_match("/^RestoreSnapShotDialog_/",$name) && $once){ - $once = false; - $entry = base64_decode(preg_replace("/^RestoreSnapShotDialog_([^_]*)_[xy]$/i","\\1",$name)); - if(!empty($entry) && $ui->allow_snapshot_restore($this->dn,$this->parent->acl_module)){ - $this->snapDialog = new SnapShotDialog($this->config,$entry,$this); - $this->snapDialog->display_restore_dialog = true; - }else{ - msg_dialog::display(_("Permission"),sprintf(_("You are not allowed to restore a snapshot for %s."),$entry),ERROR_DIALOG); - } - } - - /* Restore one of the already deleted objects */ - if(((isset($_POST['menu_action']) && $_POST['menu_action'] == "RestoreDeletedSnapShot") - || preg_match("/^RestoreDeletedSnapShot_/",$name)) && $once){ - $once = false; - - if($ui->allow_snapshot_restore($this->dn,$this->parent->acl_module)){ - $this->snapDialog = new SnapShotDialog($this->config,"",$this); - $this->snapDialog->set_snapshot_bases($baseSuffixe); - $this->snapDialog->display_restore_dialog = true; - $this->snapDialog->display_all_removed_objects = true; - }else{ - msg_dialog::display(_("Permission"),sprintf(_("You are not allowed to restore a snapshot for %s."),$base),ERROR_DIALOG); - } - } - - /* Restore selected snapshot */ - if(preg_match("/^RestoreSnapShot_/",$name) && $once){ - $once = false; - $entry = base64_decode(preg_replace("/^RestoreSnapShot_([^_]*)_[xy]$/i","\\1",$name)); - - if(!empty($entry) && $ui->allow_snapshot_restore($this->dn,$this->parent->acl_module)){ - $this->restore_snapshot($entry); - $this->snapDialog = NULL; - }else{ - msg_dialog::display(_("Permission"),sprintf(_("You are not allowed to restore a snapshot for %s."),$entry),ERROR_DIALOG); - } - } - } - - /* Create a new snapshot requested, check - the given attributes and create the snapshot*/ - if(isset($_POST['CreateSnapshot']) && is_object($this->snapDialog)){ - $this->snapDialog->save_object(); - $msgs = $this->snapDialog->check(); - if(count($msgs)){ - foreach($msgs as $msg){ - msg_dialog::display(_("Error"), $msg, ERROR_DIALOG); - } - }else{ - $this->dn = $this->snapDialog->dn; - $this->create_snapshot("snapshot",$this->snapDialog->CurrentDescription); - $this->snapDialog = NULL; - } - } - - /* Restore is requested, restore the object with the posted dn .*/ - if((isset($_POST['RestoreSnapshot'])) && (isset($_POST['SnapShot']))){ - } - - if(isset($_POST['CancelSnapshot'])){ - $this->snapDialog = NULL; - } - - if(is_object($this->snapDialog )){ - $this->snapDialog->save_object(); - return($this->snapDialog->execute()); - } - } - - - /*! \brief Return plugin informations for acl handling */ + /*! \brief Return plugin informations for acl handling + * See class_core.inc for examples. + */ static function plInfo() { return array(); @@ -1526,12 +1211,14 @@ class plugin function set_acl_base($base) { + @DEBUG (DEBUG_ACL, __LINE__, __FUNCTION__, __FILE__,"".$base."","ACL-Base: "); $this->acl_base= $base; } function set_acl_category($category) { + @DEBUG (DEBUG_ACL, __LINE__, __FUNCTION__, __FILE__,"".$category."(/".get_class($this).")","ACL-Category: "); $this->acl_category= "$category/"; } @@ -1695,8 +1382,7 @@ class plugin /* Acls for this object must be adjusted */ if($found){ - $debug_info= _("Changing ACL dn")." : 
 -"._("from")."  ". - $old_dn."
 -"._("to")." ".$new_dn."
"; + $debug_info= sprintf(_("Changing ACL DN from %s to %s"), bold($old_dn), bold($new_dn)); @DEBUG (DEBUG_ACL, __LINE__, __FUNCTION__, __FILE__,$debug_info,"ACL"); $update[$attrs['dn']] =array(); @@ -1819,14 +1505,9 @@ class plugin $this->multi_boxes[] = $val; } - if ($this->acl_is_writeable($val) && isset ($_POST["$val"])){ + if (isset ($_POST["$val"]) && $this->acl_is_writeable($val)){ - /* Check for modifications */ - if (get_magic_quotes_gpc()) { - $data= stripcslashes($_POST["$val"]); - } else { - $data= $this->$val = $_POST["$val"]; - } + $data= $this->$val = get_post($val); if ($this->$val != $data){ $this->is_modified= TRUE; } @@ -1862,131 +1543,6 @@ class plugin return($message); } - - /*! \brief Returns the snapshot header part for "Actions" menu in management dialogs - \param $layer_menu - */ - function get_snapshot_header($base,$category) - { - $str = ""; - $ui = get_userinfo(); - if($this->snapshotEnabled() && $ui->allow_snapshot_restore($base,$category)){ - - $ok = false; - foreach($this->get_used_snapshot_bases() as $base){ - $ok |= count($this->getAllDeletedSnapshots($base)) >= 1 ; - } - - if($ok){ - $str = "..| "._("Restore"). "|RestoreDeletedSnapShot|\n"; - }else{ - $str = "..| "._("Restore")."||\n"; - } - } - return($str); - } - - - function get_snapshot_action($base,$category) - { - $str= ""; - $ui = get_userinfo(); - if($this->snapshotEnabled()){ - if ($ui->allow_snapshot_restore($base,$category)){ - - if(count($this->Available_SnapsShots($base))){ - $str.= " "; - } else { - $str = " "; - } - } - if($ui->allow_snapshot_create($base,$category)){ - $str.= " "; - }else{ - $str = "  "; - } - } - - return($str); - } - - - function get_copypaste_action($base,$category,$class,$copy = TRUE, $cut = TRUE) - { - $ui = get_userinfo(); - $action = ""; - if($this->CopyPasteHandler){ - if($cut){ - if($ui->is_cutable($base,$category,$class)){ - $action .= " "; - }else{ - $action.="  "; - } - } - if($copy){ - if($ui->is_copyable($base,$category,$class)){ - $action.= " "; - }else{ - $action.="  "; - } - } - } - - return($action); - } - - - function get_copypaste_header($base,$category,$copy = TRUE, $cut = TRUE) - { - $s = ""; - $ui =get_userinfo(); - - if(!is_array($category)){ - $category = array($category); - } - - /* Check permissions for each category, if there is at least one category which - support read or paste permissions for the given base, then display the specific actions. - */ - $readable = $pasteable = false; - foreach($category as $cat){ - $readable= $readable || preg_match('/r/', $ui->get_category_permissions($base, $cat)); - $pasteable= $pasteable || $ui->is_pasteable($base, $cat) == 1; - } - - if(($cut || $copy) && isset($this->CopyPasteHandler) && is_object($this->CopyPasteHandler)){ - if($readable){ - $s.= "..|---|\n"; - if($copy){ - $s.= "..|". - " "._("Copy")."|"."multiple_copy_systems|\n"; - } - if($cut){ - $s.= "..|". - " "._("Cut")."|"."multiple_cut_systems|\n"; - } - } - - if($pasteable){ - if($this->CopyPasteHandler->entries_queued()){ - $img = ""; - $s.="..|".$img." "._("Paste")."|editPaste|\n"; - }else{ - $img = ""; - $s.="..|".$img." "._("Paste")."\n"; - } - } - } - return($s); - } - - function get_used_snapshot_bases() { return(array()); @@ -2004,7 +1560,7 @@ class plugin function handle_post_events($mode, $addAttrs= array()) { if(!in_array($mode, array('add','remove','modify'))){ - trigger_error(sprintf("Invalid post event type given '%s'! Valid types are [add,modify,remove].", $mode)); + trigger_error(sprintf("Invalid post event type given %s! Valid types are [add,modify,remove].", bold($mode))); return; } switch ($mode){ @@ -2027,10 +1583,11 @@ class plugin * Replaces placeholder by class values of this plugin instance. * @param Allows to a add special replacements. */ - static function callHook($plugin, $cmd, $addAttrs= array()) + static function callHook($plugin, $cmd, $addAttrs= array(), &$returnOutput = array(), &$returnCode = NULL) { global $config; - $command= $config->search(get_class($plugin), $cmd,array('menu','tabs')); + $command = $config->configRegistry->getPropertyValue(get_class($plugin),$cmd); + if ($command != ""){ // Walk trough attributes list and add the plugins attributes. @@ -2042,6 +1599,7 @@ class plugin $ui = get_userinfo(); $addAttrs['callerDN']=$ui->dn; $addAttrs['dn']=$plugin->dn; + $addAttrs['location']=$config->current['NAME']; // Sort attributes by length, ensures correct replacement $tmp = array(); @@ -2077,14 +1635,22 @@ class plugin } if (check_command($command)){ + @DEBUG (DEBUG_SHELL, __LINE__, __FUNCTION__, __FILE__,$command,"Execute"); - exec($command,$arr); - if(is_array($arr)){ + exec($command, $arr, $returnCode); + $returnOutput = $arr; + + if($returnCode != 0){ + $str = implode("\n",$arr); + @DEBUG (DEBUG_SHELL, __LINE__, __FUNCTION__, __FILE__, $command, "Execution failed code: ".$returnCode); + $message= msgPool::cmdexecfailed($cmd,$command, get_class($plugin)); + msg_dialog::display(_("Error"), $message, ERROR_DIALOG); + }elseif(is_array($arr)){ $str = implode("\n",$arr); @DEBUG (DEBUG_SHELL, __LINE__, __FUNCTION__, __FILE__, $command, "Result: ".$str); } } else { - $message= msgPool::cmdnotfound("POSTCREATE", get_class($plugin)); + $message= msgPool::cmdinvalid($cmd,$command, get_class($plugin)); msg_dialog::display(_("Error"), $message, ERROR_DIALOG); } }