index b91c063ee4d1ec22aa87760937008a6358458369..7ec88be52a422b8b9b0f6de6c030477f7489c826 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']);
// Some browsers don't have the ability do do scrollable table bodies, filter them
// here.
$switch= false;
- if (preg_match('/(Opera|Konqueror|Safari|msie)/i', $_SERVER['HTTP_USER_AGENT'])){
+ if (preg_match('/(Opera|Konqueror|Safari)/i', $_SERVER['HTTP_USER_AGENT'])){
$switch= true;
}
$height= $this->height;
}
- $result.= "<table cellpadding='0' cellspacing='0' border='0'><tr><td><div class='listContainer' id='d_scrollbody' style='border-top:1px solid #B0B0B0;border-right:1px solid #B0B0B0;width:700px;min-height:".($height+25)."px;'>\n";
-
- $height= "";
- if ($switch){
- $height= "height:100%;";
- }
- $result.= "<table summary='$this->headline' style='${height}width:100%; table-layout:fixed;' cellspacing='0' cellpadding='0' id='t_scrolltable'>\n";
+ $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";
$this->numColumns= count($this->colprops) + ($this->multiSelect?1:0);
// Build list header
// 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){
- $alt++;
$result.="<tr class='rowxp".($alt&1)."'>\n";
$result.= $entry['_rendered'];
$result.="</tr>\n";
+ $alt++;
}
// Need to fill the list if it's not full (nobody knows why this is 22 ;-))
}
// Close list body
- $result.= "</tbody></table></div></td></tr>";
+ $result.= "</tbody></table></div>";
// Add the footer if requested
if ($this->showFooter) {
- $result.= "<tr><td class='nlistFooter'>";
+ $result.= "<div class='nlistFooter'><div style='padding:3px'>";
foreach ($this->objectTypes as $objectType) {
if (isset($this->objectTypeCount[$objectType['label']])) {
}
}
- $result.= "</td></tr>";
+ $result.= "</div></div>";
}
// Close list
- $result.= "</table>";
$result.= $switch?"<input type='hidden' id='list_workaround'>":"";
// Add scroll positioner
$ui= get_userinfo();
// Take care of base selector
- $this->baseSelector->update();
+ 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);
+ }
+ }
// Save base
$refresh= false;
$deps= $ui->get_module_departments($this->categories);
$this->base= $deps[0];
$this->baseSelector->setBase($this->base);
+ session::global_set("CurrentMainBase", $this->base);
}
if ($action == 'BACK') {
$deps= $ui->get_module_departments($this->categories);
if(in_array_ics($base, $deps)){
$this->base= $base;
$this->baseSelector->setBase($this->base);
+ session::global_set("CurrentMainBase", $this->base);
}
}
if ($action == 'HOME') {
$ui= get_userinfo();
- $this->base= $this->filter->getObjectBase($ui->dn);
+ $this->base= get_base_from_people($ui->dn);
$this->baseSelector->setBase($this->base);
+ session::global_set("CurrentMainBase", $this->base);
}
}
$listhead ="";
/* Check if we are in users home department */
- if(!count($deps) || $this->filter->base == $this->filter->getObjectBase($ui->dn)){
+ if(!count($deps) || $this->filter->base == get_base_from_people($ui->dn)){
$enableHome = false;
}
$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);
}
}
}
+ function getEntries()
+ {
+ return $this->entries;
+ }
+
+
function getType($dn)
{
if (isset($this->objectDnMapping[$dn])) {