X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_listing.inc;h=225509525ad1420ae3c3b97d4b2ddb220d2473ec;hb=0d0212e3580dd226418612cee85b6d08f8a5399d;hp=d4f972d3da2c5357fdb2f11ed6fe0c502125e3f3;hpb=5ab7ebd28e53d52c3e6f3eddebde408550226ec2;p=gosa.git diff --git a/gosa-core/include/class_listing.inc b/gosa-core/include/class_listing.inc index d4f972d3d..225509525 100644 --- a/gosa-core/include/class_listing.inc +++ b/gosa-core/include/class_listing.inc @@ -28,6 +28,7 @@ class listing { var $departmentBrowser= false; var $departmentRootVisible= false; var $multiSelect= false; + var $singleSelect= false; var $template; var $headline; var $base; @@ -56,7 +57,7 @@ class listing { var $baseSelector; - function listing($filename) + function listing($source, $isString = FALSE) { global $config; global $class_mapping; @@ -64,8 +65,14 @@ class listing { // Initialize pid $this->pid= preg_replace("/[^0-9]/", "", microtime(TRUE)); - if (!$this->load($filename)) { - die("Cannot parse $filename!"); + if($isString){ + if(!$this->loadString($source)){ + die("Cannot parse $source!"); + } + }else{ + if (!$this->loadFile($source)) { + die("Cannot parse $source!"); + } } // Set base for filter @@ -80,7 +87,7 @@ class listing { } // Move footer information - $this->showFooter= ($config->get_cfg_value("listSummary") == "true"); + $this->showFooter= ($config->get_cfg_value("core","listSummary") == "true"); // Register build in filters $this->registerElementFilter("objectType", "listing::filterObjectType"); @@ -121,9 +128,14 @@ class listing { } + function getFilter() + { + return($this->filter); + } + + function setFilter($filter) { - $filter->setCategories($this->categories); $this->filter= &$filter; if ($this->departmentBrowser){ $this->departments= $this->getDepartments(); @@ -142,10 +154,13 @@ class listing { return false; } + function loadFile($filename) + { + return($this->loadString(file_get_contents($filename))); + } - function load($filename) + function loadString($contents) { - $contents = file_get_contents($filename); $this->xmlData= xml::xml2array($contents, 1); if (!isset($this->xmlData['list'])) { @@ -155,7 +170,7 @@ class listing { $this->xmlData= $this->xmlData["list"]; // Load some definition values - foreach (array("departmentBrowser", "departmentRootVisible", "multiSelect", "baseMode") as $token) { + foreach (array("departmentBrowser", "departmentRootVisible", "multiSelect","singleSelect", "baseMode") as $token) { if (isset($this->xmlData['definition'][$token]) && $this->xmlData['definition'][$token] == "true"){ $this->$token= true; @@ -239,7 +254,7 @@ class listing { isset($config['sortType'])) { $this->sortAttribute= $config['sortAttribute']; $this->sortType= $config['sortType']; - $sorter= " ".image("images/lists/sort-".($this->sortDirection[$index]?"up":"down").".png", null, $this->sortDirection[$index]?_("Up"):_("Down"), "text-top"); + $sorter= " ".image("images/lists/sort-".($this->sortDirection[$index]?"up":"down").".png", null, $this->sortDirection[$index]?_("Sort ascending"):_("Sort descending"), "text-top"); } $sortable= (isset($config['sortAttribute'])); @@ -289,16 +304,23 @@ class listing { $result.= "
\n"; $result.= "\n"; - $this->numColumns= count($this->colprops) + ($this->multiSelect?1:0); + $this->numColumns= count($this->colprops) + (($this->multiSelect|$this->singleSelect)?1:0); // Build list header $result.= "\n"; - if ($this->multiSelect) { + if ($this->multiSelect || $this->singleSelect) { $width= "24px"; if (preg_match('/Konqueror/i', $_SERVER['HTTP_USER_AGENT'])){ $width= "28px"; } - $result.= "\n"; + $result.= "\n"; } foreach ($this->header as $header) { $result.= $header; @@ -323,11 +345,11 @@ class listing { // Fill with department browser if configured this way $departmentIterator= new departmentSortIterator($this->departments, $this->sortDirection[$this->sortColumn]); foreach ($departmentIterator as $row => $entry){ - $result.=""; + $rowResult= ""; // Render multi select if needed - if ($this->multiSelect) { - $result.=""; + if ($this->multiSelect || $this->singleSelect) { + $rowResult.=""; } // Render defined department columns, fill the rest with some stuff @@ -338,19 +360,27 @@ class listing { $colspan= $config['span']; $this->useSpan= true; } - $result.=""; + $rowResult.=""; $rest-= $colspan; } // Fill remaining cols with nothing $last= $this->numColumns - $rest; for ($i= 0; $i<$rest; $i++){ - $result.= ""; + $rowResult.= ""; } - $result.=""; + $rowResult.=""; + // Apply label to objecttype icon? + if (preg_match("//i", $rowResult, $matches)){ + $objectType= image($matches[1], null, LDAP::fix(base64_decode($matches[2]))); + $rowResult= preg_replace("/]+>/", $objectType, $rowResult); + } + $result.= $rowResult; $alt++; } + + $deps= $alt; } @@ -363,6 +393,10 @@ class listing { $trow.="\n"; } + if ($this->singleSelect) { + $trow.="\n"; + } + foreach ($this->xmlData['table']['column'] as $index => $config) { $renderedCell= $this->renderCell($config['value'], $entry, $row); $trow.="\n"; @@ -383,8 +417,27 @@ class listing { // Complete list by sorting entries for _sort$index and appending them to the output $entryIterator= new listingSortIterator($this->entries, $this->sortDirection[$this->sortColumn], "_sort".$this->sortColumn, $this->sortType); foreach ($entryIterator as $row => $entry){ - $result.="\n"; - $result.= $entry['_rendered']; + + // Apply label to objecttype icon? + if (preg_match("//i", $entry['_rendered'], $matches)){ + if (preg_match("//i", $entry['_rendered'], $m)) { + $objectType= image($matches[1]."[".$m[1]."]", null, LDAP::fix(base64_decode($matches[2]))); + } else { + $objectType= image($matches[1], null, LDAP::fix(base64_decode($matches[2]))); + } + $entry['_rendered']= preg_replace("/]+>/", $objectType, $entry['_rendered']); + $entry['_rendered']= preg_replace("/]+>/", '', $entry['_rendered']); + } + + // Apply custom class to row? + if (preg_match("//i", $entry['_rendered'], $matches)) { + $result.="\n"; + $result.= preg_replace("/]+>/", '', $entry['_rendered']); + } else { + $result.="\n"; + $result.= $entry['_rendered']; + } + $result.="\n"; $alt++; } @@ -404,6 +457,7 @@ class listing { $result.= ""; } } + $result.= ""; } @@ -434,7 +488,7 @@ class listing { $result.= ''; $smarty= get_smarty(); - $smarty->assign("usePrototype", "true"); + $smarty->assign("FILTER", $this->filter->render()); $smarty->assign("SIZELIMIT", print_sizelimit_warning()); $smarty->assign("LIST", $result); @@ -446,6 +500,7 @@ class listing { } // Assign action menu / base + $smarty->assign("HEADLINE", $this->headline); $smarty->assign("ACTIONS", $this->renderActionMenu()); $smarty->assign("BASE", $this->renderBase()); @@ -475,6 +530,7 @@ class listing { // Take care of base selector if ($this->baseMode) { $this->baseSelector->update(); + // Check if a wrong base was supplied if(!$this->baseSelector->checkLastBaseUpdate()){ msg_dialog::display(_("Error"), msgPool::check_base(), ERROR_DIALOG); @@ -819,7 +875,7 @@ class listing { $objectType= $this->getObjectType($this->objectTypes, $classes); if ($objectType) { $this->objectDnMapping[$dn]= $objectType["objectClass"]; - $result= image($objectType["image"], null, LDAP::fix($dn)); + $result= ""; if (!isset($this->objectTypeCount[$objectType['label']])) { $this->objectTypeCount[$objectType['label']]= 0; } @@ -998,17 +1054,17 @@ class listing { /* Draw back button */ if($enableBack){ - $result["BACK"]= image('images/lists/back.png', 'BACK', _("Go up one department")); + $result["BACK"]= image('images/lists/back.png', 'BACK', _("Go to preceding level")); }else{ - $result["BACK"]= image('images/lists/back-grey.png', null, _("Go up one department")); + $result["BACK"]= image('images/lists/back-grey.png', null, _("Go to preceding level")); } /* Draw home button */ /* Draw home button */ if($enableHome){ - $result["HOME"]= image('images/lists/home.png', 'HOME', _("Go to users department")); + $result["HOME"]= image('images/lists/home.png', 'HOME', _("Go to current users level")); }else{ - $result["HOME"]= image('images/lists/home-grey.png', null, _("Go to users department")); + $result["HOME"]= image('images/lists/home-grey.png', null, _("Go to current users level")); } @@ -1049,6 +1105,12 @@ class listing { return $result; } + // Get single selection (radio box) + if($this->singleSelect && isset($_POST['listing_radio_selected'])){ + $entry = $_POST['listing_radio_selected']; + $result['targets']= array($this->entries[$entry]['dn']); + } + // Filter POST with "listing_" attributes foreach ($_POST as $key => $prop) { @@ -1095,9 +1157,11 @@ class listing { function renderActionMenu() { + $result= "
"; + // Don't send anything if the menu is not defined if (!isset($this->xmlData['actionmenu']['action'])){ - return ""; + return $result; } // Array? @@ -1107,13 +1171,12 @@ class listing { // Load shortcut $actions= &$this->xmlData['actionmenu']['action']; - $result= "
". - ""; } @@ -1172,7 +1235,7 @@ class listing { // Render entry elseways if (isset($action['label'])){ - $result.= "$img"._($action['label']).""; + $result.= "$img"._($action['label']).""; } // Check for special types @@ -1378,13 +1441,13 @@ class listing { // Copy entry if($copy){ - $result.= "".image('images/lists/copy.png')." "._("Copy").""; + $result.= "".image('images/lists/copy.png')." "._("Copy").""; $separator= ""; } // Cut entry if($cut){ - $result.= "".image("images/lists/cut.png")." "._("Cut").""; + $result.= "".image("images/lists/cut.png")." "._("Cut").""; $separator= ""; } } @@ -1392,7 +1455,7 @@ class listing { // Draw entries that allow pasting entries if($paste){ if($this->copyPasteHandler->entries_queued()){ - $result.= "".image("images/lists/paste.png")." "._("Paste").""; + $result.= "".image("images/lists/paste.png")." "._("Paste").""; }else{ $result.= "".image('images/lists/paste-grey.png')." "._("Paste").""; } @@ -1458,7 +1521,7 @@ class listing { // Draw icons according to the restore flag if($restore){ - $result.= "".image('images/lists/restore.png')." "._("Restore snapshots").""; + $result.= "".image('images/lists/restore.png')." "._("Restore snapshots").""; }else{ $result.= "".image('images/lists/restore-grey.png')." "._("Restore snapshots").""; } @@ -1478,7 +1541,7 @@ class listing { // Export CVS as build in exporter foreach ($this->exporter as $action => $exporter) { - $result.= "
  • ".image($exporter['image'])." ".$exporter['label']."
  • "; + $result.= "
  • ".image($exporter['image'])." ".$exporter['label']."
  • "; } // Finalize list @@ -1516,7 +1579,7 @@ class listing { // Draw snapshot button if($ui->allow_snapshot_create($dn, $category)){ - $result.= image('images/snapshot.png', "listing_snapshot_$row", _("Create a new snapshot from this object")); + $result.= image('images/snapshot.png', "listing_snapshot_$row", _("Create new snapshot for this object")); }else{ $result.= image('images/empty.png'); } @@ -1535,7 +1598,7 @@ class listing { $events= DaemonEvent::get_event_types_by_category($this->categories); if(isset($events['BY_CLASS']) && count($events['BY_CLASS'])){ foreach($events['BY_CLASS'] as $name => $event){ - $result.= "".$event['MenuImage']." ".$event['s_Menu_Name'].""; + $result.= "".$event['MenuImage']." ".$event['s_Menu_Name'].""; $separator= ""; } } @@ -1564,6 +1627,7 @@ class listing { function getType($dn) { + $dn = LDAP::fix($dn); if (isset($this->objectDnMapping[$dn])) { return $this->objectDnMapping[$dn]; }
    "; + if($this->multiSelect){ + $result.= ""; + }else{ + $result.= " "; + } + $result.="
      colprops[$index]." class='list1'>".$this->renderCell($config['value'], $entry, $row)."colprops[$index]." class='list1'>".$this->renderCell($config['value'], $entry, $row)."colprops[$last+$i-1]." class='list1'> colprops[$last+$i-1]." class='list1'> 
    colprops[$index]." class='list0'>".$renderedCell."