X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_listing.inc;h=3b83e0811adcc73b06f1a2e398003d61833b6611;hb=2c7257e5e02afafdfd3a6c4457c6b87467f26eae;hp=156cc7b80ef8d44756f5f5517d45a64cd22b587d;hpb=6cc9cb08f58130892b4509d414df53cb4577e480;p=gosa.git diff --git a/gosa-core/include/class_listing.inc b/gosa-core/include/class_listing.inc index 156cc7b80..3b83e0811 100644 --- a/gosa-core/include/class_listing.inc +++ b/gosa-core/include/class_listing.inc @@ -45,10 +45,13 @@ class listing { var $pid; var $objectTypes= array(); var $objectTypeCount= array(); + var $objectDnMapping= array(); var $copyPasteHandler= null; var $snapshotHandler= null; var $exporter= array(); var $exportColumns= array(); + var $useSpan= false; + var $height= 0; function listing($filename) @@ -101,6 +104,12 @@ class listing { } + function setHeight($height) + { + $this->height= $height; + } + + function setSnapshotHandler($handler) { $this->snapshotHandler= &$handler; @@ -247,6 +256,7 @@ class listing { } } + function render() { // Check for exeeded sizelimit @@ -254,27 +264,46 @@ class listing { return($message); } + // 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'])){ + $switch= true; + } + // Initialize list $result= "\n"; - $result.= "
\n"; - $result.= " -"; // Add the footer if requested if ($this->showFooter) { - $result.= ""; + $result.= ""; } - $result.= "
\n"; + $height= 450; + if ($this->height != 0) { + $result.= "\n"; + $height= $this->height; + } + + $result.= "
\n"; - - // New table for the real list contents - $result.= ""; + // Close list body + $result.= "
\n"; + + $height= ""; + if ($switch){ + $height= "height:100%;"; + } + $result.= "\n"; $this->numColumns= count($this->colprops) + ($this->multiSelect?1:0); // Build list header - $result.= "\n"; + $result.= "\n"; if ($this->multiSelect) { - $result.= "\n"; + $width= "24px"; + if (preg_match('/Konqueror/i', $_SERVER['HTTP_USER_AGENT'])){ + $width= "28px"; + } + $result.= "\n"; } foreach ($this->header as $header) { $result.= $header; } + $result.= "\n"; - // Add 13px for scroller - $result.= "
 
\n"; + // Build list body + $result.= "\n"; // No results? Just take an empty colspanned row if (count($this->entries) + count($this->departments) == 0) { @@ -286,6 +315,7 @@ class listing { $deps= 0; // Draw department browser if configured and we're not in sub mode + $this->useSpan= false; if ($this->departmentBrowser && $this->filter->scope != "sub") { // Fill with department browser if configured this way $departmentIterator= new departmentSortIterator($this->departments, $this->sortDirection[$this->sortColumn]); @@ -294,7 +324,7 @@ class listing { // Render multi select if needed if ($this->multiSelect) { - $result.=""; + $result.=""; } // Render defined department columns, fill the rest with some stuff @@ -303,6 +333,7 @@ class listing { $colspan= 1; if (isset($config['span'])){ $colspan= $config['span']; + $this->useSpan= true; } $result.=""; $rest-= $colspan; @@ -356,7 +387,7 @@ class listing { } // Need to fill the list if it's not full (nobody knows why this is 22 ;-)) - $emptyListStyle= (count($this->entries) + $deps == 0)?"border:0;":""; + $emptyListStyle= (count($this->entries) + (($this->useSpan && count($this->entries))?$deps:0) == 0)?"border:0;":""; if ((count($this->entries) + $deps) < 22) { $result.= ""; for ($i= 0; $i<$this->numColumns; $i++) { @@ -373,11 +404,12 @@ class listing { $result.= ""; } - $result.= "
  colprops[$index]." class='list1'>".$this->renderCell($config['value'], $entry, $row)."
"; + $result.= "
"; foreach ($this->objectTypes as $objectType) { if (isset($this->objectTypeCount[$objectType['label']])) { @@ -386,12 +418,15 @@ class listing { } } - $result.= " 
"; + // Close list + $result.= ""; + $result.= $switch?"":""; $smarty= get_smarty(); + $smarty->assign("usePrototype", "true"); $smarty->assign("FILTER", $this->filter->render()); $smarty->assign("SIZELIMIT", print_sizelimit_warning()); $smarty->assign("LIST", $result); @@ -421,8 +456,9 @@ class listing { global $config; $ui= get_userinfo(); - // Reset object counter + // Reset object counter / DN mapping $this->objectTypeCount= array(); + $this->objectDnMapping= array(); // Do not do anything if this is not our PID if(isset($_REQUEST['PID']) && $_REQUEST['PID'] != $this->pid) { @@ -431,9 +467,10 @@ class listing { // Save base if (isset($_POST['BASE']) && $this->baseMode) { - $base= validate($_POST['BASE']); + $base= get_post('BASE'); if (isset($this->bases[$base])) { $this->base= $base; + session::global_set("CurrentMainBase", $this->base); } } @@ -442,6 +479,7 @@ class listing { if (preg_match('/^department_([0-9]+)$/', validate($_GET['act']), $match)){ if (isset($this->departments[$match[1]])){ $this->base= $this->departments[$match[1]]['dn']; + session::global_set("CurrentMainBase", $this->base); } } } @@ -451,7 +489,12 @@ class listing { if (preg_match('/^export.*$/', $_POST['act']) && isset($this->exporter[$_POST['act']])) { $exporter= $this->exporter[$_POST['act']]; $userinfo= ", "._("created by")." ".$ui->cn." - ".strftime('%A, %d. %B %Y, %H:%M:%S'); - $instance= new $exporter['class']($this->headline.$userinfo, $this->plainHeader, $this->entries, $this->exportColumns); + $entryIterator= new listingSortIterator($this->entries, $this->sortDirection[$this->sortColumn], "_sort".$this->sortColumn, $this->sortType); + $sortedEntries= array(); + foreach ($entryIterator as $entry){ + $sortedEntries[]= $entry; + } + $instance= new $exporter['class']($this->headline.$userinfo, $this->plainHeader, $sortedEntries, $this->exportColumns); $type= call_user_func(array($exporter['class'], "getInfo")); $type= $type[$_POST['act']]; send_binary_content($instance->query(), $type['filename'], $type= $type['mime']); @@ -498,7 +541,7 @@ class listing { } if ($action == 'HOME') { $ui= get_userinfo(); - $this->base= get_base_from_people($ui->dn); + $this->base= $this->filter->getObjectBase($ui->dn); } // Reload departments @@ -530,32 +573,38 @@ class listing { $layout= preg_replace("/^\|/", "", $layout); $layout= preg_replace("/\|$/", "", $layout); $cols= split("\|", $layout); + foreach ($cols as $index => $config) { if ($config != "") { + $res= ""; $components= split(';', $config); - $config= ""; foreach ($components as $part) { if (preg_match("/^r$/", $part)) { - $config.= "text-align:right;"; + $res.= "text-align:right;"; continue; } if (preg_match("/^l$/", $part)) { - $config.= "text-align:left;"; + $res.= "text-align:left;"; continue; } if (preg_match("/^c$/", $part)) { - $config.= "text-align:center;"; + $res.= "text-align:center;"; continue; } if (preg_match("/^[0-9]+(|px|%)$/", $part)) { - $config.= "width:$part;"; + $res.= "width:$part;min-width:$part;"; continue; } } - $result[$index]= " style='$config' "; + // Add minimum width for scalable columns + if (!preg_match('/width:/', $res)){ + $res.= "min-width:200px;"; + } + + $result[$index]= " style='$res' "; } else { - $result[$index]= null; + $result[$index]= " style='min-width:100px'"; } } @@ -613,8 +662,10 @@ class listing { $selected= " selected"; $found= true; } - $result.= ""; + $key = htmlentities($key,ENT_QUOTES); + $result.= "\n"; } + $result.= ""; // Reset the currently used base to the first DN we found if there @@ -632,11 +683,18 @@ class listing { preg_match_all("/%\{filter:([^(]+)\((.*)\)\}/", $data, $matches, PREG_SET_ORDER); foreach ($matches as $match) { - if (!isset($this->filters[$match[1]])) { - continue; + $cl= ""; + $method= ""; + if (preg_match('/::/', $match[1])) { + $cl= preg_replace('/::.*$/', '', $match[1]); + $method= preg_replace('/^.*::/', '', $match[1]); + } else { + if (!isset($this->filters[$match[1]])) { + continue; + } + $cl= preg_replace('/::.*$/', '', $this->filters[$match[1]]); + $method= preg_replace('/^.*::/', '', $this->filters[$match[1]]); } - $cl= preg_replace('/::.*$/', '', $this->filters[$match[1]]); - $method= preg_replace('/^.*::/', '', $this->filters[$match[1]]); // Prepare params for function call $params= array(); @@ -646,16 +704,31 @@ class listing { // Row is replaced by the row number if ($param == "row") { $params[]= $row; + continue; } // pid is replaced by the current PID if ($param == "pid") { $params[]= $this->pid; + continue; + } + + // base is replaced by the current base + if ($param == "base") { + $params[]= $this->getBase(); + continue; } // Fixie with "" is passed directly if (preg_match('/^".*"$/', $param)){ $params[]= preg_replace('/"/', '', $param); + continue; + } + + // Move dn if needed + if ($param == "dn") { + $params[]= LDAP::fix($config["dn"]); + continue; } // LDAP variables get replaced by their objects @@ -666,13 +739,9 @@ class listing { unset($values['count']); } $params[]= $values; + break; } } - - // Move dn if needed - if ($param == "dn") { - $params[]= LDAP::fix($config["dn"]); - } } // Replace information @@ -728,12 +797,14 @@ class listing { $objectType= $this->getObjectType($this->objectTypes, $classes); if ($objectType) { + $this->objectDnMapping[$dn]= $objectType["objectClass"]; $result= ""; if (!isset($this->objectTypeCount[$objectType['label']])) { $this->objectTypeCount[$objectType['label']]= 0; } $this->objectTypeCount[$objectType['label']]++; } + return $result; } @@ -751,9 +822,28 @@ class listing { foreach($actions as $action) { // Skip the entry completely if there's no permission to execute it if (!$this->hasActionPermission($action, $dn)) { + $result.= " "; continue; } + // Skip entry if the pseudo filter does not fit + if (isset($action['filter']) && preg_match('/^[a-z0-9_]+!?=[a-z0-9_]+$/i', $action['filter'])) { + list($fa, $fv)= split('=', $action['filter']); + if (preg_match('/^(.*)!$/', $fa, $m)){ + $fa= $m[1]; + if (isset($this->entries[$row][$fa]) && $this->entries[$row][$fa][0] == $fv) { + $result.= " "; + continue; + } + } else { + if (!isset($this->entries[$row][$fa]) && !$this->entries[$row][$fa][0] == $fv) { + $result.= " "; + continue; + } + } + } + + // If there's an objectclass definition and we don't have it // add an empty picture here. if (isset($action['objectclass'])){ @@ -791,7 +881,9 @@ class listing { } if ($action['type'] == "copypaste") { - $result.= $this->renderCopyPasteActions($row, $this->entries[$row]['dn'], $category, $class); + $copy = !isset($action['copy']) || $action['copy'] == "true"; + $cut = !isset($action['cut']) || $action['cut'] == "true"; + $result.= $this->renderCopyPasteActions($row, $this->entries[$row]['dn'], $category, $class,$copy,$cut); } else { $result.= $this->renderSnapshotActions($row, $this->entries[$row]['dn'], $category, $class); } @@ -863,7 +955,7 @@ class listing { $listhead =""; /* Check if we are in users home department */ - if(!count($deps) ||$this->filter->base == get_base_from_people($ui->dn)){ + if(!count($deps) || $this->filter->base == $this->filter->getObjectBase($ui->dn)){ $enableHome = false; } @@ -901,8 +993,8 @@ class listing { function getAction() { - // Do not do anything if this is not our PID - if(isset($_REQUEST['PID']) && $_REQUEST['PID'] != $this->pid) { + // Do not do anything if this is not our PID, or there's even no PID available... + if(!isset($_REQUEST['PID']) || $_REQUEST['PID'] != $this->pid) { return; } @@ -975,10 +1067,15 @@ class listing { return ""; } + // Array? + if (isset($this->xmlData['actionmenu']['action']['type'])){ + $this->xmlData['actionmenu']['action']= array($this->xmlData['actionmenu']['action']); + } + // Load shortcut $actions= &$this->xmlData['actionmenu']['action']; $result= "
". - "