X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_listing.inc;h=3b83e0811adcc73b06f1a2e398003d61833b6611;hb=2c7257e5e02afafdfd3a6c4457c6b87467f26eae;hp=217adbf404cc2f3bd9053ba78550a48ac91243e4;hpb=900290aef5eb96ada4b916e35d8f7d974f0f7051;p=gosa.git diff --git a/gosa-core/include/class_listing.inc b/gosa-core/include/class_listing.inc index 217adbf40..3b83e0811 100644 --- a/gosa-core/include/class_listing.inc +++ b/gosa-core/include/class_listing.inc @@ -1,41 +1,128 @@ pid= preg_replace("/[^0-9]/", "", microtime(TRUE)); if (!$this->load($filename)) { die("Cannot parse $filename!"); } + // Set base for filter + if ($this->baseMode) { + $this->base= session::global_get("CurrentMainBase"); + if ($this->base == null) { + $this->base= $config->current['BASE']; + } + $this->refreshBasesList(); + } else { + $this->base= $config->current['BASE']; + } + // Move footer information $this->showFooter= ($config->get_cfg_value("listSummary") == "true"); // Register build in filters $this->registerElementFilter("objectType", "listing::filterObjectType"); + $this->registerElementFilter("departmentLink", "listing::filterDepartmentLink"); $this->registerElementFilter("link", "listing::filterLink"); $this->registerElementFilter("actions", "listing::filterActions"); - // Initialize pid - $this->pid= preg_replace("/[^0-9]/", "", microtime(TRUE)); + // Load exporters + foreach($class_mapping as $class => $dummy) { + if (preg_match('/Exporter$/', $class)) { + $info= call_user_func(array($class, "getInfo")); + if ($info != null) { + $this->exporter= array_merge($this->exporter, $info); + } + } + } + } + + + function setCopyPasteHandler($handler) + { + $this->copyPasteHandler= &$handler; + } + + + function setHeight($height) + { + $this->height= $height; + } + + + function setSnapshotHandler($handler) + { + $this->snapshotHandler= &$handler; + } + + + function setFilter($filter) + { + $this->filter= &$filter; + if ($this->departmentBrowser){ + $this->departments= $this->getDepartments(); + } + $this->filter->setBase($this->base); } @@ -62,17 +149,30 @@ class listing { $this->xmlData= $this->xmlData["list"]; // Load some definition values - foreach (array("departmentBrowser", "departmentRootVisible", "multiSelect") as $token) { + foreach (array("departmentBrowser", "departmentRootVisible", "multiSelect", "baseMode") as $token) { if (isset($this->xmlData['definition'][$token]) && $this->xmlData['definition'][$token] == "true"){ $this->$token= true; } } - // Fill objectTypes + // Fill objectTypes from departments and xml definition + $types = departmentManagement::get_support_departments(); + foreach ($types as $class => $data) { + $this->objectTypes[]= array("label" => $data['TITLE'], + "objectClass" => $data['OC'], + "image" => $data['IMG']); + } + $this->categories= array(); if (isset($this->xmlData['definition']['objectType'])) { + if(isset($this->xmlData['definition']['objectType']['label'])) { + $this->xmlData['definition']['objectType']= array($this->xmlData['definition']['objectType']); + } foreach ($this->xmlData['definition']['objectType'] as $index => $otype) { $this->objectTypes[]= $this->xmlData['definition']['objectType'][$index]; + if (isset($this->xmlData['definition']['objectType'][$index]['category'])){ + $this->categories[]= $this->xmlData['definition']['objectType'][$index]['category']; + } } } @@ -80,81 +180,222 @@ class listing { $this->colprops= $this->parseLayout($this->xmlData['table']['layout']); // Prepare table headers + $this->renderHeader(); + + // Assign headline/module + $this->headline= _($this->xmlData['definition']['label']); + $this->module= $this->xmlData['definition']['module']; + if (!is_array($this->categories)){ + $this->categories= array($this->categories); + } + + // Evaluate columns to be exported + if (isset($this->xmlData['table']['column'])){ + foreach ($this->xmlData['table']['column'] as $index => $config) { + if (isset($config['export']) && $config['export'] == "true"){ + $this->exportColumns[]= $index; + } + } + } + + return true; + } + + + function renderHeader() + { $this->header= array(); + $this->plainHeader= array(); + + // Initialize sort? + $sortInit= false; + if (!$this->sortDirection) { + $this->sortColumn= 0; + if (isset($this->xmlData['definition']['defaultSortColumn'])){ + $this->sortColumn= $this->xmlData['definition']['defaultSortColumn']; + } else { + $this->sortAttribute= ""; + } + $this->sortDirection= array(); + $sortInit= true; + } + if (isset($this->xmlData['table']['column'])){ foreach ($this->xmlData['table']['column'] as $index => $config) { + // Initialize everything to one direction + if ($sortInit) { + $this->sortDirection[$index]= false; + } + + $sorter= ""; + if ($index == $this->sortColumn && isset($config['sortAttribute']) && + isset($config['sortType'])) { + $this->sortAttribute= $config['sortAttribute']; + $this->sortType= $config['sortType']; + $sorter= " "; + } + $sortable= (isset($config['sortAttribute'])); + + $link= "href='?plug=".$_GET['plug']."&PID=".$this->pid."&act=SORT_$index'"; if (isset($config['label'])) { - $this->header[$index]= "colprops[$index].">"._($config['label']).""; + if ($sortable) { + $this->header[$index]= "colprops[$index].">"._($config['label'])."$sorter"; + } else { + $this->header[$index]= "colprops[$index].">"._($config['label']).""; + } + $this->plainHeader[]= _($config['label']); } else { - $this->header[$index]= "colprops[$index]."> "; + if ($sortable) { + $this->header[$index]= "colprops[$index]."> $sorter"; + } else { + $this->header[$index]= "colprops[$index]."> "; + } + $this->plainHeader[]= ""; } } } - - // Assign headline/module - $this->headline= _($this->xmlData['definition']['label']); - $this->module= $this->xmlData['definition']['module']; - - return true; } function render() { -echo "sorting, department browsing, filter base handling, copy'n paste handler, snapshot handler
"; + // Check for exeeded sizelimit + if (($message= check_sizelimit()) != ""){ + 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= ""; - $result.= "
"; - $result.= " -"; // Add the footer if requested if ($this->showFooter) { - $result.= ""; + $result.= ""; } - $result.= "
"; - $num_cols= count($this->colprops) + ($this->multiSelect?1:0); + $result= "\n"; + $height= 450; + if ($this->height != 0) { + $result.= "\n"; + $height= $this->height; + } + + $result.= "
"; - - // 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.= ""; + $result.= "\n"; if ($this->multiSelect) { - $result.= ""; + $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.= "
 
"; + // Build list body + $result.= "\n"; // No results? Just take an empty colspanned row - if (count($this->entries) == 0) { - $result.= ""; + if (count($this->entries) + count($this->departments) == 0) { + $result.= ""; + } + + // Line color alternation + $alt= 0; + $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]); + foreach ($departmentIterator as $row => $entry){ + $result.=""; + + // Render multi select if needed + if ($this->multiSelect) { + $result.=""; + } + + // Render defined department columns, fill the rest with some stuff + $rest= $this->numColumns - 1; + foreach ($this->xmlData['table']['department'] as $index => $config) { + $colspan= 1; + if (isset($config['span'])){ + $colspan= $config['span']; + $this->useSpan= true; + } + $result.=""; + $rest-= $colspan; + } + + // Fill remaining cols with nothing + $last= $this->numColumns - $rest; + for ($i= 0; $i<$rest; $i++){ + $result.= ""; + } + $result.=""; + + $alt++; + } + $deps= $alt; } - // Fill with contents - foreach ($this->entries as $row => $entry){ - $result.=""; + // Fill with contents, sort as configured + foreach ($this->entries as $row => $entry) { + $trow= ""; // Render multi select if needed if ($this->multiSelect) { - $result.=""; + $trow.="\n"; } foreach ($this->xmlData['table']['column'] as $index => $config) { - $result.=""; + $renderedCell= $this->renderCell($config['value'], $entry, $row); + $trow.="\n"; + + // Save rendered column + $sort= preg_replace('/.*>([^<]+)<.*$/', '$1', $renderedCell); + $sort= preg_replace('/ /', '', $sort); + if (preg_match('/entries[$row]["_sort$index"]= $sort; } - $result.=""; + + // Save rendered entry + $this->entries[$row]['_rendered']= $trow; + } + + // 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.="\n"; + $result.= $entry['_rendered']; + $result.="\n"; } // Need to fill the list if it's not full (nobody knows why this is 22 ;-)) - $emptyListStyle= (count($this->entries) == 0)?"border:0;":""; - if (count($this->entries) < 22) { + $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<$num_cols; $i++) { + for ($i= 0; $i<$this->numColumns; $i++) { if ($i == 0) { $result.= ""; continue; } - if ($i != $num_cols-1) { + if ($i != $this->numColumns-1) { $result.= ""; } else { $result.= ""; @@ -163,11 +404,12 @@ echo "sorting, department browsing, filter base handling, copy'n paste handler, $result.= ""; } - $result.= "
 
 
 colprops[$index]." class='list1'>".$this->renderCell($config['value'], $entry, $row)."colprops[$last+$i-1]." class='list1'> 
colprops[$index]." class='list0'>".$this->renderCell($config['value'], $entry, $row)."colprops[$index]." class='list0'>".$renderedCell."
   
"; + $result.= "
"; foreach ($this->objectTypes as $objectType) { if (isset($this->objectTypeCount[$objectType['label']])) { @@ -176,13 +418,17 @@ echo "sorting, department browsing, filter base handling, copy'n paste handler, } } - $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); // Assign navigation elements @@ -191,8 +437,9 @@ echo "sorting, department browsing, filter base handling, copy'n paste handler, $smarty->assign($key, $html); } - // Assign action menu + // Assign action menu / base $smarty->assign("ACTIONS", $this->renderActionMenu()); + $smarty->assign("BASE", $this->renderBase()); // Assign separator $smarty->assign("SEPARATOR", "-"); @@ -204,22 +451,119 @@ echo "sorting, department browsing, filter base handling, copy'n paste handler, } - function setFilter($filter) + function update() { - $this->filter= &$filter; + global $config; + $ui= get_userinfo(); + + // 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) { + return; + } + + // Save base + if (isset($_POST['BASE']) && $this->baseMode) { + $base= get_post('BASE'); + if (isset($this->bases[$base])) { + $this->base= $base; + session::global_set("CurrentMainBase", $this->base); + } + } + + // Override the base if we got a message from the browser navigation + if ($this->departmentBrowser && isset($_GET['act'])) { + 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); + } + } + } + + // Filter POST with "act" attributes -> posted from action menu + if (isset($_POST['exec_act']) && $_POST['act'] != '') { + 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'); + $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']); + } + } + + // Filter GET with "act" attributes + if (isset($_GET['act'])) { + $key= validate($_GET['act']); + if (preg_match('/^SORT_([0-9]+)$/', $key, $match)) { + // Switch to new column or invert search order? + $column= $match[1]; + if ($this->sortColumn != $column) { + $this->sortColumn= $column; + } else { + $this->sortDirection[$column]= !$this->sortDirection[$column]; + } + + // Allow header to update itself according to the new sort settings + $this->renderHeader(); + } + } + + // 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)) { + $action= $match[1]; + break; + } + } + + // Navigation handling + if ($action == 'ROOT') { + $deps= $ui->get_module_departments($this->module); + $this->base= $deps[0]; + } + if ($action == 'BACK') { + $deps= $ui->get_module_departments($this->module); + $base= preg_replace("/^[^,]+,/", "", $this->base); + if(in_array_ics($base, $deps)){ + $this->base= $base; + } + } + if ($action == 'HOME') { + $ui= get_userinfo(); + $this->base= $this->filter->getObjectBase($ui->dn); + } + + // Reload departments + if ($this->departmentBrowser){ + $this->departments= $this->getDepartments(); + } + + // Update filter and refresh entries + $this->filter->setBase($this->base); $this->entries= $this->filter->query(); } - function update() + function setBase($base) { - // Do not do anything if this is not our PID - # DISABLED because the object is not in the session - #if(isset($_REQUEST['PID']) && $_REQUEST['PID'] != $this->pid) { - # return; - #} + $this->base= $base; + } - $this->entries= $this->filter->query(); + + function getBase() + { + return $this->base; } @@ -229,35 +573,44 @@ echo "sorting, department browsing, filter base handling, copy'n paste handler, $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'"; } } + // Save number of columns for later use + $this->numColumns= count($cols); + return $result; } @@ -279,20 +632,69 @@ echo "sorting, department browsing, filter base handling, copy'n paste handler, // Watch out for filters and prepare to execute them $data= $this->processElementFilter($data, $config, $row); + // Replace all non replaced %{...} instances because they + // are non resolved attributes or filters + $data= preg_replace('/%{[^}]+}/', ' ', $data); + return $data; } + function renderBase() + { + if (!$this->baseMode) { + return; + } + + $result= ""; + + // Reset the currently used base to the first DN we found if there + // was no match. + if(!$found){ + $this->base = $firstDN; + } + + return $result; + } + + function processElementFilter($data, $config, $row) { 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(); @@ -302,16 +704,31 @@ echo "sorting, department browsing, filter base handling, copy'n paste handler, // 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 @@ -322,13 +739,9 @@ echo "sorting, department browsing, filter base handling, copy'n paste handler, unset($values['count']); } $params[]= $values; + break; } } - - // Move dn if needed - if ($param == "dn") { - $params[]= LDAP::fix($config["dn"]); - } } // Replace information @@ -384,12 +797,14 @@ echo "sorting, department browsing, filter base handling, copy'n paste handler, $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; } @@ -407,9 +822,28 @@ echo "sorting, department browsing, filter base handling, copy'n paste handler, 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'])){ @@ -437,36 +871,52 @@ echo "sorting, department browsing, filter base handling, copy'n paste handler, } // Handle special types - if ($action['type'] == "snapshot") { - #TODO - #echo "actiontriggers: snapshot missing
"; - } - if ($action['type'] == "copypaste") { - #TODO - #echo "actiontriggers: copypaste missing
"; - } - if ($action['type'] == "daemon") { - #TODO - #echo "actiontriggers: daemon missing
"; - } + if ($action['type'] == "copypaste" || $action['type'] == "snapshot") { + $objectType= $this->getObjectType($this->objectTypes, $this->entries[$row]['objectClass']); + $category= $class= null; + if ($objectType) { + $category= $objectType['category']; + $class= $objectType['class']; + } + + if ($action['type'] == "copypaste") { + $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); + } + } } return $result; } + function filterDepartmentLink($row, $dn, $description) + { + $attr= $this->departments[$row]['sort-attribute']; + $name= $this->departments[$row][$attr]; + if (is_array($name)){ + $name= $name[0]; + } + $result= sprintf("%s [%s]", $name, $description[0]); + return("pid&act=department_$row' title='$dn'>$result"); + } + + function filterLink() { $result= " "; $row= func_get_arg(0); - $pid= func_get_arg(1); - $dn= LDAP::fix(func_get_arg(2)); - $params= array(func_get_arg(3)); + $pid= $this->pid; + $dn= LDAP::fix(func_get_arg(1)); + $params= array(func_get_arg(2)); // Collect sprintf params - for ($i = 4;$i < func_num_args();$i++) { + for ($i = 3;$i < func_num_args();$i++) { $val= func_get_arg($i); if (is_array($val)){ $params[]= $val[0]; @@ -505,14 +955,14 @@ echo "sorting, department browsing, filter base handling, copy'n paste handler, $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; } /* Draw root button */ if($enableRoot){ $result["ROOT"]= ""; + "title='"._("Go to root department")."' name='ROOT' alt='"._("Root")."'>"; }else{ $result["ROOT"]= ""._("Root").""; } @@ -520,7 +970,7 @@ echo "sorting, department browsing, filter base handling, copy'n paste handler, /* Draw back button */ if($enableBack){ $result["BACK"]= ""; + "title='"._("Go up one department")."' alt='"._("Up")."' name='BACK'>"; }else{ $result["BACK"]= ""._("Up").""; } @@ -528,14 +978,14 @@ echo "sorting, department browsing, filter base handling, copy'n paste handler, /* Draw home button */ if($enableHome){ $result["HOME"]= ""; + "title='"._("Go to users department")."' alt='"._("Home")."' name='HOME'>"; }else{ $result["HOME"]= ""._("Home").""; } /* Draw reload button, this button is enabled everytime */ $result["RELOAD"]= ""; + "title='"._("Reload list")."' name='REFRESH' alt='"._("Submit")."'>"; return ($result); } @@ -543,11 +993,10 @@ echo "sorting, department browsing, filter base handling, copy'n paste handler, function getAction() { - // Do not do anything if this is not our PID - # DISABLED because the object is not in the session - #if(isset($_REQUEST['PID']) && $_REQUEST['PID'] != $this->pid) { - # return; - #} + // 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; + } $result= array("targets" => array(), "action" => ""); @@ -598,7 +1047,9 @@ echo "sorting, department browsing, filter base handling, copy'n paste handler, // Filter POST with "act" attributes -> posted from action menu if (isset($_POST['act']) && $_POST['act'] != '') { - $result['action']= validate($_POST['act']); + if (!preg_match('/^export.*$/', $_POST['act'])){ + $result['action']= validate($_POST['act']); + } } // Drop targets if empty @@ -616,11 +1067,16 @@ echo "sorting, department browsing, filter base handling, copy'n paste handler, 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= "". - "