X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fadmin%2Fsystems%2Fclass_divListSystem.inc;h=42ce4cbcee7315408c546461e1c513d8e1411cc1;hb=d9f1895952e9b02c1b0c398cc5dc09b88178e603;hp=d36f76051690f5e02f96a237db96267a150519a9;hpb=edb2d06d9b841de6148a22b544aef05f2c2d4bde;p=gosa.git
diff --git a/plugins/admin/systems/class_divListSystem.inc b/plugins/admin/systems/class_divListSystem.inc
index d36f76051..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"));
@@ -50,7 +55,7 @@ class divListSystem extends MultiSelectWindow
/* set Page header */
$this->AddHeader(array("string"=>" ","attach"=>"style='width:20px;'"));
$this->AddHeader(array("string"=>_("System / Department")));
- $this->AddHeader(array("string"=>_("Actions"),"attach"=>"style='width:60px;border-right:0px;'"));
+ $this->AddHeader(array("string"=>_("Actions"),"attach"=>"style='width:70px;border-right:0px;'"));
/* Text ,Value ,Name ,Is selected */
$this->AddCheckBox("ShowServers", _("Select to see servers"), _("Show servers"), true);
@@ -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;
@@ -159,26 +164,35 @@ class divListSystem extends MultiSelectWindow
$val['cn'][0]= preg_replace('/\$$/', '', $val['cn'][0]);
// Generate Array to Add
+ $dsc= "";
+ if (isset($val['description'][0])){
+ $dsc= " [".$val['description'][0]."]";
+ }
if((isset($val['is_new']))&&(!empty($val['is_new']))){
- $display= "".$val["cn"][0]." ".$val['is_new'];
+ $display= $val["cn"][0]." ".$val['is_new'].$dsc;
}else{
- $display= "".$val["cn"][0]."";
+ $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($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);
$field1 = array("string" => sprintf($img['img'],$val['dn']), "attach" => "style='text-align:center;width:20px;'");
$field2 = array("string" => sprintf($editlink,$key,$display), "attach" => "style='' title='".preg_replace('/ /', ' ', @LDAP::fix($val['dn']))."'");
- $field3 = array("string" => preg_replace("/%KEY%/", "$key", $action2.$action), "attach" => "style='width:60px;border-right:0px;text-align:right;'");
+ $field3 = array("string" => preg_replace("/%KEY%/", "$key", $action2.$action), "attach" => "style='width:70px;border-right:0px;text-align:right;'");
$this->AddElement( array($field1,$field2,$field3));
}