![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 8e5f104c90a413fc618ff76046d457532f28d739..d4f972d3da2c5357fdb2f11ed6fe0c502125e3f3 100644 (file)
function setFilter($filter)
{
+ $filter->setCategories($this->categories);
$this->filter= &$filter;
if ($this->departmentBrowser){
$this->departments= $this->getDepartments();
// 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']);
isset($config['sortType'])) {
$this->sortAttribute= $config['sortAttribute'];
$this->sortType= $config['sortType'];
- $sorter= " <img border='0' title='".($this->sortDirection[$index]?_("Up"):_("Down"))."' src='images/lists/sort-".($this->sortDirection[$index]?"up":"down").".png' align='top'>";
+ $sorter= " ".image("images/lists/sort-".($this->sortDirection[$index]?"up":"down").".png", null, $this->sortDirection[$index]?_("Up"):_("Down"), "text-top");
}
$sortable= (isset($config['sortAttribute']));
$link= "href='?plug=".$_GET['plug']."&PID=".$this->pid."&act=SORT_$index'";
if (isset($config['label'])) {
if ($sortable) {
- $this->header[$index]= "<td class='listheader' ".$this->colprops[$index]."><a $link>"._($config['label'])."$sorter</a></td>";
+ $this->header[$index]= "<td class='listheader' ".$this->colprops[$index]."><a $link>"._($config['label'])."</a>$sorter</td>";
} else {
$this->header[$index]= "<td class='listheader' ".$this->colprops[$index].">"._($config['label'])."</td>";
}
$this->plainHeader[]= _($config['label']);
} else {
if ($sortable) {
- $this->header[$index]= "<td class='listheader' ".$this->colprops[$index]."><a $link> $sorter</a></td>";
+ $this->header[$index]= "<td class='listheader' ".$this->colprops[$index]."><a $link> </a>$sorter</td>";
} else {
$this->header[$index]= "<td class='listheader' ".$this->colprops[$index]."> </td>";
}
// 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='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){
- $alt++;
- $result.="<tr class='rowxp".($alt&1)."'>\n";
+ $result.="<tr>\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']])) {
$label= _($objectType['label']);
- $result.= "<img class='center' src='".$objectType['image']."' title='$label' alt='$label'> ".$this->objectTypeCount[$objectType['label']]." ";
+ $result.= image($objectType['image'], null, $label)." ".$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
// 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);
+ }
}
// Save base
// Override base if we got signals from the navigation elements
$action= "";
foreach ($_POST as $key => $value) {
- if (preg_match('/^(ROOT|BACK|HOME)_x$/', $key, $match)) {
+ if (preg_match('/^(ROOT|BACK|HOME)(_x)?$/', $key, $match)) {
$action= $match[1];
break;
}
$objectType= $this->getObjectType($this->objectTypes, $classes);
if ($objectType) {
$this->objectDnMapping[$dn]= $objectType["objectClass"];
- $result= "<img class='center' title='".LDAP::fix($dn)."' src='".$objectType["image"]."'>";
+ $result= image($objectType["image"], null, LDAP::fix($dn));
if (!isset($this->objectTypeCount[$objectType['label']])) {
$this->objectTypeCount[$objectType['label']]= 0;
}
// Go thru all actions
$result= "";
$actions= $this->xmlData['actiontriggers']['action'];
+
+ // Ensure we've a valid actions array, if there is only one action in the actiontriggers col
+ // then we've to create a valid array here.
+ if(isset($actions['name'])) $actions = array($actions);
+
foreach($actions as $action) {
// Skip the entry completely if there's no permission to execute it
if (!$this->hasActionPermission($action, $dn, $classes)) {
- $result.= "<img src='images/empty.png' alt=' ' class='center' style='padding:1px'>";
+ $result.= image('images/empty.png');
continue;
}
if (preg_match('/^(.*)!$/', $fa, $m)){
$fa= $m[1];
if (isset($this->entries[$row][$fa]) && $this->entries[$row][$fa][0] == $fv) {
- $result.= "<img src='images/empty.png' alt=' ' class='center' style='padding:1px'>";
+ $result.= image('images/empty.png');
continue;
}
} else {
if (!isset($this->entries[$row][$fa]) && !$this->entries[$row][$fa][0] == $fv) {
- $result.= "<img src='images/empty.png' alt=' ' class='center' style='padding:1px'>";
+ $result.= image('images/empty.png');
continue;
}
}
if (preg_match('/^!(.*)$/', $objectclass, $m)){
$objectclass= $m[1];
if(in_array($objectclass, $classes)) {
- $result.= "<img src='images/empty.png' alt=' ' class='center' style='padding:1px'>";
+ $result.= image('images/empty.png');
continue;
}
} elseif (is_string($objectclass)) {
if(!in_array($objectclass, $classes)) {
- $result.= "<img src='images/empty.png' alt=' ' class='center' style='padding:1px'>";
+ $result.= image('images/empty.png');
continue;
}
} elseif (is_array($objectclass)) {
if(count(array_intersect($objectclass, $classes)) != count($objectclass)){
- $result.= "<img src='images/empty.png' alt=' ' class='center' style='padding:1px'>";
+ $result.= image('images/empty.png');
continue;
}
}
if ($action['type'] == "entry") {
$label= $this->processElementFilter($action['label'], $this->entries[$row], $row);
$image= $this->processElementFilter($action['image'], $this->entries[$row], $row);
- $result.="<input class='center' type='image' src='$image' title='$label' ".
- "name='listing_".$action['name']."_$row' style='padding:1px'>";
+ $result.= image($image, "listing_".$action['name']."_$row", $label);
}
// Handle special types
/* Draw root button */
if($enableRoot){
- $result["ROOT"]= "<input class='center' type='image' src='images/lists/root.png' align='middle' ".
- "title='"._("Go to root department")."' name='ROOT' alt='"._("Root")."'>";
+ $result["ROOT"]= image('images/lists/root.png', 'ROOT', _("Root"));
}else{
- $result["ROOT"]= "<img src='images/lists/root_grey.png' class='center' alt='"._("Root")."'>";
+ $result["ROOT"]= image('images/lists/root-grey.png', null, _("Root"));
}
/* Draw back button */
if($enableBack){
- $result["BACK"]= "<input class='center' type='image' align='middle' src='images/lists/back.png' ".
- "title='"._("Go up one department")."' alt='"._("Up")."' name='BACK'>";
+ $result["BACK"]= image('images/lists/back.png', 'BACK', _("Go up one department"));
}else{
- $result["BACK"]= "<img src='images/lists/back_grey.png' class='center' alt='"._("Up")."'>";
+ $result["BACK"]= image('images/lists/back-grey.png', null, _("Go up one department"));
}
/* Draw home button */
+ /* Draw home button */
if($enableHome){
- $result["HOME"]= "<input class='center' type='image' align='middle' src='images/lists/home.png' ".
- "title='"._("Go to users department")."' alt='"._("Home")."' name='HOME'>";
+ $result["HOME"]= image('images/lists/home.png', 'HOME', _("Go to users department"));
}else{
- $result["HOME"]= "<img src='images/lists/home_grey.png' class='center' alt='"._("Home")."'>";
+ $result["HOME"]= image('images/lists/home-grey.png', null, _("Go to users department"));
}
+
/* Draw reload button, this button is enabled everytime */
- $result["RELOAD"]= "<input class='center' type='image' src='images/lists/reload.png' align='middle' ".
- "title='"._("Reload list")."' name='REFRESH' alt='"._("Submit")."'>";
+ $result["RELOAD"]= image('images/lists/reload.png', 'REFRESH', _("Reload list"));
return ($result);
}
// Load shortcut
$actions= &$this->xmlData['actionmenu']['action'];
$result= "<input type='hidden' name='act' id='actionmenu' value=''><div style='display:none'><input type='submit' name='exec_act' id='exec_act' value=''></div>".
- "<ul class='level1' id='root'><li><a href='#'>"._("Actions")." <img ".
- "border=0 class='center' src='images/lists/sort-down.png'></a>";
+ "<ul class='level1' id='root'><li><a href='#'>"._("Actions")." ".image("images/lists/sort-down.png")."</a>";
// Build ul/li list
$result.= $this->recurseActions($actions);
// Fill image if set
$img= "";
if (isset($action['image'])){
- $img= "<img border='0' class='center' src='".$action['image']."'> ";
+ $img= image($action['image'])." ";
}
if ($action['type'] == "separator"){
if ($action['type'] == "sub" && isset($action['action'])) {
$level++;
if (isset($action['label'])){
- $result.= "<li$separator><a href='#'>$img"._($action['label'])." <img border='0' src='images/forward-arrow.png'></a>";
+ $result.= "<li$separator><a href='#'>$img"._($action['label'])." ".image('images/forward-arrow.png')."</a>";
}
// Ensure we've an array of actions, this enables sub menus with only one action.
$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);
}
}
// Copy entry
if($copy){
- $result.= "<li$separator><a href='#' onClick='document.getElementById(\"actionmenu\").value= \"copy\";document.getElementById(\"exec_act\").click();'><img src='images/lists/copy.png' alt='' border='0' class='center'> "._("Copy")."</a></li>";
+ $result.= "<li$separator><a href='#' onClick='document.getElementById(\"actionmenu\").value= \"copy\";document.getElementById(\"exec_act\").click();'>".image('images/lists/copy.png')." "._("Copy")."</a></li>";
$separator= "";
}
// Cut entry
if($cut){
- $result.= "<li$separator><a href='#' onClick='document.getElementById(\"actionmenu\").value= \"cut\";document.getElementById(\"exec_act\").click();'><img src='images/lists/cut.png' alt='' border='0' class='center'> "._("Cut")."</a></li>";
+ $result.= "<li$separator><a href='#' onClick='document.getElementById(\"actionmenu\").value= \"cut\";document.getElementById(\"exec_act\").click();'>".image("images/lists/cut.png")." "._("Cut")."</a></li>";
$separator= "";
}
}
// Draw entries that allow pasting entries
if($paste){
if($this->copyPasteHandler->entries_queued()){
- $result.= "<li$separator><a href='#' onClick='document.getElementById(\"actionmenu\").value= \"paste\";document.getElementById(\"exec_act\").click();'><img src='images/lists/paste.png' alt='' border='0' class='center'> "._("Paste")."</a></li>";
+ $result.= "<li$separator><a href='#' onClick='document.getElementById(\"actionmenu\").value= \"paste\";document.getElementById(\"exec_act\").click();'>".image("images/lists/paste.png")." "._("Paste")."</a></li>";
}else{
- $result.= "<li$separator><a href='#'><img src='images/lists/paste-grey.png' alt='' border='0' class='center'> "._("Paste")."</a></li>";
+ $result.= "<li$separator><a href='#'>".image('images/lists/paste-grey.png')." "._("Paste")."</a></li>";
}
}
// Render cut entries
if($cut){
if($ui->is_cutable($dn, $category, $class)){
- $result .= "<input class='center' type='image'
- src='images/lists/cut.png' alt='"._("Cut")."' name='listing_cut_$row' title='"._("Cut this entry")."' style='padding:1px'>";
+ $result.= image('images/lists/cut.png', "listing_cut_$row", _("Cut this entry"));
}else{
- $result.="<img src='images/empty.png' alt=' ' class='center' style='padding:1px'>";
+ $result.= image('images/empty.png');
}
}
// Render copy entries
if($copy){
if($ui->is_copyable($dn, $category, $class)){
- $result.= "<input class='center' type='image'
- src='images/lists/copy.png' alt='"._("Copy")."' name='listing_copy_$row' title='"._("Copy this entry")."' style='padding:1px'>";
+ $result.= image('images/lists/copy.png', "listing_copy_$row", _("Copy this entry"));
}else{
- $result.="<img src='images/empty.png' alt=' ' class='center' style='padding:1px'>";
+ $result.= image('images/empty.png');
}
}
// Draw icons according to the restore flag
if($restore){
- $result.= "<li$separator><a href='#' onClick='document.getElementById(\"actionmenu\").value= \"restore\";document.getElementById(\"exec_act\").click();'><img src='images/lists/restore.png' alt='' border='0' class='center'> "._("Restore snapshots")."</a></li>";
+ $result.= "<li$separator><a href='#' onClick='document.getElementById(\"actionmenu\").value= \"restore\";document.getElementById(\"exec_act\").click();'>".image('images/lists/restore.png')." "._("Restore snapshots")."</a></li>";
}else{
- $result.= "<li$separator><a href='#'><img src='images/lists/restore_grey.png' alt='' border='0' class='center'> "._("Restore snapshots")."</a></li>";
+ $result.= "<li$separator><a href='#'>".image('images/lists/restore-grey.png')." "._("Restore snapshots")."</a></li>";
}
}
$result = "";
// Draw entries
- $result.= "<li$separator><a href='#'><img border='0' class='center' src='images/lists/export.png'> "._("Export list")." <img border='0' src='images/forward-arrow.png'></a><ul class='level3'>";
+ $result.= "<li$separator><a href='#'>".image('images/lists/export.png')." "._("Export list")." ".image("images/forward-arrow.png")."</a><ul class='level3'>";
// Export CVS as build in exporter
foreach ($this->exporter as $action => $exporter) {
- $result.= "<li><a href='#' onClick='document.getElementById(\"actionmenu\").value= \"$action\";document.getElementById(\"exec_act\").click();'><img border='0' class='center' src='".$exporter['image']."'> ".$exporter['label']."</a></li>";
+ $result.= "<li><a href='#' onClick='document.getElementById(\"actionmenu\").value= \"$action\";document.getElementById(\"exec_act\").click();'>".image($exporter['image'])." ".$exporter['label']."</a></li>";
}
// Finalize list
// Do we have snapshots for this dn?
if($this->snapshotHandler->hasSnapshots($dn)){
- $result.= "<input class='center' type='image' src='images/lists/restore.png' ".
- "alt='"._("Restore snapshot")."' name='listing_restore_$row' title='".
- _("Restore snapshot")."' style='padding:1px'>";
+ $result.= image('images/lists/restore.png', "listing_restore_$row", _("Restore snapshot"));
} else {
- $result.= "<img src='images/lists/restore_grey.png' alt=' ' class='center' style='padding:1px'>";
+ $result.= image('images/lists/restore-grey.png');
}
}
// Draw snapshot button
if($ui->allow_snapshot_create($dn, $category)){
- $result.= "<input class='center' type='image' src='images/snapshot.png' ".
- "alt='"._("Create snapshot")."' name='listing_snapshot_$row' title='".
- _("Create a new snapshot from this object")."' style='padding:1px'>";
+ $result.= image('images/snapshot.png', "listing_snapshot_$row", _("Create a new snapshot from this object"));
}else{
- $result.= "<img src='images/empty.png' alt=' ' class='center' style='padding:1px'>";
+ $result.= image('images/empty.png');
}
}