index 7c3ea972f196da4ad9516362ee8dc97ba85da3ac..37efe409d57c98598959e78a68e7a572df0c69ee 100644 (file)
// Fill objectTypes from departments and xml definition
$types = departmentManagement::get_support_departments();
foreach ($types as $class => $data) {
- $this->objectTypes[]= array("label" => $data['TITLE'],
+ $this->objectTypes[$data['OC']]= array("label" => $data['TITLE'],
"objectClass" => $data['OC'],
"image" => $data['IMG']);
}
$this->xmlData['definition']['objectType']= array($this->xmlData['definition']['objectType']);
}
foreach ($this->xmlData['definition']['objectType'] as $index => $otype) {
- $this->objectTypes[]= $this->xmlData['definition']['objectType'][$index];
+ $tmp = $this->xmlData['definition']['objectType'][$index];
+ $this->objectTypes[$tmp['objectClass']]= $tmp;
if (isset($this->xmlData['definition']['objectType'][$index]['category'])){
$this->categories[]= $otype['category'];
}
}
}
+ $this->objectTypes = array_values($this->objectTypes);
// Parse layout per column
$this->colprops= $this->parseLayout($this->xmlData['table']['layout']);
$height= $this->height;
}
- $result.= "<div class='listContainer' id='d_scrollbody' style='border-top:1px solid #B0B0B0;border-right:1px solid #B0B0B0;width:100%;min-height:".($height+25)."px;'>\n";
- $result.= "<table summary='$this->headline' style='width:100%; table-layout:fixed' cellspacing='0' cellpadding='0' id='t_scrolltable'>\n";
+ $result.= "<div class='listContainer' id='d_scrollbody' style='min-height:".($height+25)."px;'>\n";
+ $result.= "<table summary='$this->headline' style='width:100%;table-layout:fixed' cellspacing='0' cellpadding='0' id='t_scrolltable'>\n";
$this->numColumns= count($this->colprops) + ($this->multiSelect?1:0);
// Build list header
// No results? Just take an empty colspanned row
if (count($this->entries) + count($this->departments) == 0) {
- $result.= "<tr class='rowxp0'><td class='list1nohighlight' colspan='$this->numColumns' style='height:100%;border-right:0px;width:100%;'> </td></tr>";
+ $result.= "<tr><td class='list1nohighlight' colspan='$this->numColumns' style='height:100%;border-right:0px;width:100%;'> </td></tr>";
}
// Line color alternation
// Fill with department browser if configured this way
$departmentIterator= new departmentSortIterator($this->departments, $this->sortDirection[$this->sortColumn]);
foreach ($departmentIterator as $row => $entry){
- $result.="<tr class='rowxp".($alt&1)."'>";
+ $result.="<tr>";
// Render multi select if needed
if ($this->multiSelect) {
// 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.="<tr class='rowxp".($alt&1)."'>\n";
+ $result.="<tr>\n";
$result.= $entry['_rendered'];
$result.="</tr>\n";
$alt++;
$checkAcl= "";
// Category or detailed permission?
- if (strpos('/', $module) === false) {
+ if (strpos($module, '/') !== false) {
if (preg_match('/([a-zA-Z0-9]+):([rwcdm]+)/', $sAcl, $m) ) {
$checkAcl= $ui->get_permissions($dn, $module, $m[1]);
$sAcl= $m[2];
// Populate base selector if already present
if ($this->baseSelector && $this->baseMode) {
$this->baseSelector->setBases($this->bases);
+ $this->baseSelector->update(TRUE);
}
}