".
- "
".
- "
".
- "
".
- "
".
- "
".
- "
".
"
".
@@ -115,7 +115,6 @@ class divListSystem extends MultiSelectWindow
{
$this->ClearElementsList();
$this->GenHeader();
- $this->AddDepartments($this->selectedBase);
}
function setEntries($terminals)
@@ -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='".@LDAP::fix($val['dn'])."'");
- $field3 = array("string" => preg_replace("/%KEY%/", "$key", $action2.$action), "attach" => "style='width:60px;border-right:0px;text-align:right;'");
+ $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:70px;border-right:0px;text-align:right;'");
$this->AddElement( array($field1,$field2,$field3));
}
@@ -192,55 +206,7 @@ class divListSystem extends MultiSelectWindow
function save_object()
{
/* Save automatic created POSTs like regex, checkboxes */
- MultiSelectWindow::save_object();
-
- $s_action ="";
- foreach($_POST as $key => $value){
- if(preg_match("/^dep_back.*/i",$key)){
- $s_action="back";
- }elseif(preg_match("/^dep_root.*/",$key)){
- $s_action="root";
- }elseif(preg_match("/^dep_home.*/i",$key)){
- $s_action="home";
- }
- }
-
- /* Save base selection from headpage selectbox*/
- if(isset($_POST['CurrentMainBase'])){
- $this->selectedBase = $_POST['CurrentMainBase'];
- }
-
- /* Homebutton is posted */
- if($s_action=="home"){
- $ui= get_userinfo();
- $this->selectedBase=(preg_replace("/^[^,]+,/","",$ui->dn));
- $this->selectedBase=(preg_replace("/^[^,]+,/","",$this->selectedBase));
- }
-
- /* Open selected department
- this is posted by the parent class MultiSelectWindow */
- if(isset($_GET['act'])&& ($_GET['act'] == "dep_open")){
- $s_entry = base64_decode($_GET['dep_id']);
- $this->selectedBase = $this->config->departments[trim($s_entry)];
- }
-
- /* back to the roots ^^ */
- if($s_action=="root"){
- $this->selectedBase=($this->config->current['BASE']);
- }
-
- /* If Backbutton is Posted */
- if($s_action=="back"){
- $base_back = preg_replace("/^[^,]+,/","",$this->selectedBase);
- $base_back = convert_department_dn($base_back);
- if(isset($this->config->departments[trim($base_back)])){
- $this->selectedBase= $this->config->departments[trim($base_back)];
- }else{
- $this->selectedBase= $this->config->departments["/"];
- }
- }
-
- $_SESSION['CurrentMainBase'] = $this->selectedBase;
+ MultiSelectWindow :: save_object();
}
}
// vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: