![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/gosa-plugins/systems/admin/systems/class_systemManagement.inc b/gosa-plugins/systems/admin/systems/class_systemManagement.inc
index 09bcfd24c07d5e8c0465235e26278df8763ecfcb..b4479d1feb24b6f005fe4070bc5faa26ebfb1cdd 100644 (file)
/* Definitions */
var $plHeadline = "Systems";
var $plDescription = "This does something";
+ var $plIcon = "plugins/systems/images/plugin.png";
var $departments = array();
/* Dialog attributes */
*/
if(class_available("gosaSupportDaemon")){
$o = new gosaSupportDaemon();
- $this->si_active = $o->connect();
+ $this->si_active = $o->connect() && class_available("DaemonEvent");
}
}
$this->dns = array();
$ids = $this->list_get_selected_items();
- if(count($ids)){
+ if(count($ids) && class_available("DaemonEvent")){
$mac= array();
$ldap = $this->config->get_ldap_link();
}
/* Insert scheduled events into queue */
- if($this->systab instanceof DaemonEvent){
+ if(class_available("DaemonEvent") && $this->systab instanceof DaemonEvent){
$this->systab->save_object();
/* Save event
Delete MULTIPLE entries requested, display confirm dialog
********************/
- if ($s_action=="del_multiple"){
+ if ($s_action=="del_multiple" || $s_action == "del"){
$this->dns = array();
- $ids = $this->list_get_selected_items();
+
+ if($s_action == "del_multiple"){
+ $ids = $this->list_get_selected_items();
+ }else{
+ $ids = array($s_entry);
+ }
$ui = get_userinfo();
$tabs = array(
}
- /********************
- Delete system, confirm dialog
- ********************/
-
- /* Remove terminal was requested */
- if ($s_action=="del"){
-
- /* Get 'dn' from posted termlinst */
- $this->dn = $this->terminals[$s_entry]['dn'];
- $attrs = $this->terminals[$s_entry];
-
-
-
- $type= $this->get_system_type($attrs);
- $ui = get_userinfo();
- $tabs = array(
- "ArpNewDevice"=> array("CLASS"=>"TERMTABS", "TABCLASS" =>"termtabs", "ACL"=> "incoming/systems"),
- "NewDevice" => array("CLASS"=>"TERMTABS", "TABCLASS" =>"termtabs", "ACL"=> "incoming/systems"),
- "terminal" => array("CLASS"=>"TERMTABS", "TABCLASS" =>"termtabs", "ACL"=> "terminal/termgeneric"),
- "workstation" => array("CLASS"=>"WORKTABS", "TABCLASS" =>"worktabs", "ACL"=> "workstation/workgeneric"),
- "server" => array("CLASS"=>"SERVTABS", "TABCLASS" =>"servtabs", "ACL"=> "server/servgeneric"),
- "printer" => array("CLASS"=>"PRINTTABS", "TABCLASS" =>"printtabs", "ACL"=> "printer/printgeneric"),
- "phone" => array("CLASS"=>"PHONETABS", "TABCLASS" =>"phonetabs", "ACL"=> "phone/phoneGeneric"),
- "winstation" => array("CLASS"=>"WINTABS", "TABCLASS" =>"wintabs", "ACL"=> "winworkstation/wingeneric"),
- "component" => array("CLASS"=>"COMPONENTTABS","TABCLASS" =>"componenttabs", "ACL"=> "component/componentGeneric"));
-
- /* get object type */
- $tabtype = "termtabs";
- $tabobj = "TERMTABS";
- $tabacl = "";
- if(isset($tabs[$type])){
- $tabtype = $tabs[$type]['TABCLASS'];
- $tabobj = $tabs[$type]['CLASS'];
- $tabacl = $ui->get_permissions($this->dn,$tabs[$type]['ACL']);
- }
-
- /* Load permissions for selected 'dn' and check if
- we're allowed to remove this 'dn' */
- if(preg_match("/d/",$tabacl)){
-
- /* Check locking, save current plugin in 'back_plugin', so
- the dialog knows where to return. */
- if (($user= get_lock($this->dn)) != ""){
- return(gen_locked_message ($user, $this->dn));
- }
-
- /* Lock the current entry, so nobody will edit it during deletion */
- add_lock ($this->dn, $this->ui->dn);
- $smarty->assign("warning", msgPool::deleteInfo(@LDAP::fix($this->dn)));
- $smarty->assign("multiple", false);
- return($smarty->fetch(get_template_path('remove.tpl', TRUE)));
- } else {
-
- /* Obviously the user isn't allowed to delete. Show message and
- clean session. */
- msg_dialog::display(_("Permission error"), msgPool::permDelete(), ERROR_DIALOG);
- }
- }
-
-
- /********************
- Delete system, confirmed
- ********************/
- /* Confirmation for deletion has been passed. Terminal should be deleted. */
- if (isset($_POST['delete_terminal_confirm'])){
-
- /* Find out more about the object type */
- $ldap= $this->config->get_ldap_link();
- $ldap->cat($this->dn, array('objectClass'));
- $attrs= $ldap->fetch();
- $type= $this->get_system_type($attrs);
-
- $ui = get_userinfo();
-
- $tabs = array(
- "ArpNewDevice"=> array("CLASS"=>"TERMTABS", "TABCLASS" =>"termtabs", "ACL"=> "incoming/systems"),
- "NewDevice" => array("CLASS"=>"TERMTABS", "TABCLASS" =>"termtabs", "ACL"=> "incoming/systems"),
- "terminal" => array("CLASS"=>"TERMTABS", "TABCLASS" =>"termtabs", "ACL"=> "terminal/termgeneric"),
- "workstation" => array("CLASS"=>"WORKTABS", "TABCLASS" =>"worktabs", "ACL"=> "workstation/workgeneric"),
- "server" => array("CLASS"=>"SERVTABS", "TABCLASS" =>"servtabs", "ACL"=> "server/servgeneric"),
- "printer" => array("CLASS"=>"PRINTTABS", "TABCLASS" =>"printtabs", "ACL"=> "printer/printgeneric"),
- "phone" => array("CLASS"=>"PHONETABS", "TABCLASS" =>"phonetabs", "ACL"=> "phone/phoneGeneric"),
- "winstation" => array("CLASS"=>"WINTABS", "TABCLASS" =>"wintabs", "ACL"=> "winworkstation/wingeneric"),
- "component" => array("CLASS"=>"COMPONENTTABS","TABCLASS" =>"componenttabs", "ACL"=> "component/componentGeneric"));
-
- /* get object type */
- $tabtype = "termtabs";
- $tabobj = "TERMTABS";
- $tabacl = "";
- if(isset($tabs[$type])){
- $tabtype = $tabs[$type]['TABCLASS'];
- $tabobj = $tabs[$type]['CLASS'];
- $tabacl = $ui->get_permissions($this->dn,$tabs[$type]['ACL']);
- }
-
- /* Check if we are allowed to remove this object */
- if(preg_match("/d/",$tabacl)){
-
- /* Delete request is permitted, perform LDAP action */
- if(in_array($type,array("ArpNewDevice","NewDevice")) && class_available("termgeneric")){
- $this->systab= new termgeneric($this->config, $this->dn);
- $this->systab->set_acl_base($this->dn);
- $this->systab->remove_from_parent();
- }elseif($tabtype=="phonetabs"){
- $this->systab= new $tabtype($this->config, $this->config->data['TABS'][$tabobj], $this->dn,$type);
- $this->systab->set_acl_base($this->dn);
- $this->systab->by_object['phoneGeneric']->remove_from_parent ();
- }else{
- $this->systab= new $tabtype($this->config,$this->config->data['TABS'][$tabobj], $this->dn,$type);
- $this->systab->set_acl_base($this->dn);
- $this->systab->delete();
- }
- unset ($this->systab);
- $this->systab= NULL;
-
- /* Terminal list has changed, reload it. */
- } else {
-
- /* Normally this shouldn't be reached, send some extra
- logs to notify the administrator */
- msg_dialog::display(_("Permission error"), msgPool::permDelete(), ERROR_DIALOG);
- new log("security","systems/".get_class($this),$dn,array(),"Tried to trick deletion.");
- }
-
- /* Remove lock file after successfull deletion */
- $this->remove_lock();
- }
-
-
/********************
Edit system type finished, check if everything went ok
********************/
/* This array represents the combination between checkboxes and search filters */
$objs = array(
- "ShowServers" => array("CLASS" => "goServer" ,"TREE" => get_ou('serverou')),
- "ShowTerminals" => array("CLASS" => "gotoTerminal" ,"TREE" => get_ou('terminalou')),
- "ShowPrinters" => array("CLASS" => "gotoPrinter" ,"TREE" => get_ou('printerou')),
- "ShowDevices" => array("CLASS" => "ieee802Device" ,"TREE" => get_ou('componentou')),
- "ShowPhones" => array("CLASS" => "goFonHardware" ,"TREE" => get_ou('phoneou')),
- "ShowWorkstations" => array("CLASS" => "gotoWorkstation" ,"TREE" => get_ou('workstationou')),
- "ShowWinWorkstations"=> array("CLASS" => $samba ,"TREE" => get_winstations_ou() ));
+ "ShowServers" => array("TAB" => "servtabs", "CLASS" => "goServer" ,"TREE" => get_ou('serverou')),
+ "ShowTerminals" => array("TAB" => "termtabs", "CLASS" => "gotoTerminal" ,"TREE" => get_ou('terminalou')),
+ "ShowPrinters" => array("TAB" => "printtabs", "CLASS" => "gotoPrinter" ,"TREE" => get_ou('printerou')),
+ "ShowDevices" => array("TAB" => "componenttabs", "CLASS" => "ieee802Device" ,"TREE" => get_ou('componentou')),
+ "ShowPhones" => array("TAB" => "phonetabs", "CLASS" => "goFonHardware" ,"TREE" => get_ou('phoneou')),
+ "ShowWorkstations" => array("TAB" => "worktabs", "CLASS" => "gotoWorkstation" ,"TREE" => get_ou('workstationou')),
+ "ShowWinWorkstations"=> array("TAB" => "wintabs", "CLASS" => $samba ,"TREE" => get_winstations_ou() ));
/* Include the 'Display Systems of user' attribute */
if ((!empty($this->DivListSystem->UserRegex)) && ($this->DivListSystem->UserRegex!= "*")){
/* Walk through all possible search combinations, and search for some objects if the checkbox is enabled */
foreach($objs as $checkBox => $oc){
- if($this->DivListSystem->$checkBox){
+
+ if($this->DivListSystem->$checkBox && class_available($oc['TAB'])){
if($this->DivListSystem->SubSearch){
if($oc['CLASS'] != ""){
$filter = "(&".$userregex."(objectClass=".$oc['CLASS'].")(cn=".$this->DivListSystem->Regex."))";
} else {
$domain= "";
}
- $terminal=$value;
- $terminal['type'] ="W";
- $terminal['domain'] = $name.$domain;
+ $acl = $ui->get_permissions($value['dn'],"winworkstation/wingeneric");
+ if($add != "" || preg_match("/r/",$acl)) {
+ $terminal=$value;
+ $terminal['type'] ="W";
+ $terminal['domain'] = $name.$domain;
+ }
}
if(count($terminal)){