X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fsystems%2Fclass_divListSystem.inc;h=42ce4cbcee7315408c546461e1c513d8e1411cc1;hb=d9f1895952e9b02c1b0c398cc5dc09b88178e603;hp=c5665751c8d9a00b726c01262ab5b7c419e0ba68;hpb=b732853e38b57be298974dd5e25a01b03f071b62;p=gosa.git
diff --git a/plugins/admin/systems/class_divListSystem.inc b/plugins/admin/systems/class_divListSystem.inc
index c5665751c..42ce4cbce 100644
--- a/plugins/admin/systems/class_divListSystem.inc
+++ b/plugins/admin/systems/class_divListSystem.inc
@@ -6,6 +6,7 @@ class divListSystem extends MultiSelectWindow
/* Current base */
var $selectedBase = "";
var $departments = array();
+ var $do_iso = FALSE;
/* Regex */
var $Regex = "*";
@@ -33,6 +34,10 @@ class divListSystem extends MultiSelectWindow
$this->parent = $parent;
$this->ui = get_userinfo();
+ if (search_config($config->data['TABS'], "workgeneric", "ISOCMD")){
+ $this->do_iso= TRUE;
+ }
+
/* Set list strings */
$this->SetTitle(_("List of systems"));
$this->SetSummary(_("List of systems"));
@@ -83,16 +88,10 @@ class divListSystem extends MultiSelectWindow
$options.= "";
}
}
- $listhead = "
".
- "
".
- "
".
- "
".
- "
".
- "
".
- "
".
"
".
@@ -132,14 +131,20 @@ class divListSystem extends MultiSelectWindow
$img10 = "
";
$empty =" ";
- $action= "
";
- $action.= "
";
-
// User and Template Images
$editlink = "
%s";
// Test Every Entry and generate divlist Array
foreach($terminals as $key => $val){
+
+ $acl= get_permissions ($val['dn'], $this->ui->subtreeACL);
+ $acl= get_module_permission($acl, "terminal", $val['dn']);
+
+ $action= "
";
+ if(chkacl($acl,"delete") ==""){
+ $action.= "
";
+ }
+
/* Generate picture list, which is currently disabled */
if(in_array("goCupsServer" ,$val['objectClass'])) $cups = $img1; else $cups =$empty;
@@ -169,18 +174,19 @@ class divListSystem extends MultiSelectWindow
$display= $val["cn"][0].$dsc;
}
- if((in_array("gotoTerminal",$val['objectClass']))||(in_array("gotoWorkstation",$val['objectClass']))){
+ if(((in_array("gotoTerminal",$val['objectClass']))||(in_array("gotoWorkstation",$val['objectClass']))) && chkacl($acl,"password") == ""){
$action2 = "
";
}else{
$action2 = "";
}
- if(in_array("gotoWorkstation",$val['objectClass'])){
+ if($this->do_iso && in_array("gotoWorkstation",$val['objectClass'])){
$action2= "
".$action2;
}
+ /* Add Message generated by mangement->reload*/
if(isset($val['message'])){
- $display.= " (".$val['message']." '".$this->config->idepartments[$_SESSION['CurrentMainBase']]."' )";
+ $display.= " (".$val['message'].")";
}
$img = $this->parent->convert_list($val);