X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_listing.inc;h=e0ca916ef09189fa7e64a337fc6435643e90a057;hb=4b3498ae8e78a11c7c99663d45bab6a0a14df052;hp=63124a1945a9e7c917e23dfd0829f8aabda15e0c;hpb=33eeabb42dcafad4f9eb040cc887c2a0fc44c428;p=gosa.git
diff --git a/gosa-core/include/class_listing.inc b/gosa-core/include/class_listing.inc
index 63124a194..e0ca916ef 100644
--- a/gosa-core/include/class_listing.inc
+++ b/gosa-core/include/class_listing.inc
@@ -45,7 +45,8 @@ class listing {
var $pid;
var $objectTypes= array();
var $objectTypeCount= array();
- var $CopyPasteHandler= null;
+ var $copyPasteHandler= null;
+ var $snapshotHandler= null;
function listing($filename)
@@ -79,7 +80,24 @@ class listing {
function setCopyPasteHandler($handler)
{
- $this->CopyPasteHandler= &$handler;
+ $this->copyPasteHandler= &$handler;
+ }
+
+
+ function setSnapshotHandler($handler)
+ {
+ $this->snapshotHandler= &$handler;
+ }
+
+
+ function setFilter($filter)
+ {
+ $this->filter= &$filter;
+ if ($this->departmentBrowser){
+ $this->departments= $this->getDepartments();
+ }
+ $this->filter->setBase($this->base);
+ $this->entries= $this->filter->query();
}
@@ -122,6 +140,9 @@ class listing {
}
$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'])){
@@ -200,7 +221,6 @@ class listing {
function render()
{
-echo "snapshot handler, daemon handler
";
// Check for exeeded sizelimit
if (($message= check_sizelimit()) != ""){
return($message);
@@ -250,11 +270,18 @@ echo "snapshot handler, daemon handler
";
}
// Render defined department columns, fill the rest with some stuff
+ $rest= $this->numColumns - 1;
foreach ($this->xmlData['table']['department'] as $index => $config) {
- $result.="
colprops[$index]." class='list1'>".$this->renderCell($config['value'], $entry, $row)." | ";
+ $colspan= 1;
+ if (isset($config['span'])){
+ $colspan= $config['span'];
+ }
+ $result.="colprops[$index]." class='list1'>".$this->renderCell($config['value'], $entry, $row)." | ";
+ $rest-= $colspan;
}
- $last= count($this->xmlData['table']['department']) + 1;
- $rest= $this->numColumns - $last;
+
+ // Fill remaining cols with nothing
+ $last= $this->numColumns - $rest;
for ($i= 0; $i<$rest; $i++){
$result.= "colprops[$last+$i-1]." class='list1'> | ";
}
@@ -284,8 +311,8 @@ echo "snapshot handler, daemon handler
";
}
// Need to fill the list if it's not full (nobody knows why this is 22 ;-))
- $emptyListStyle= (count($this->entries) + count($deps) == 0)?"border:0;":"";
- if (count($this->entries) + count($deps) < 22) {
+ $emptyListStyle= (count($this->entries) + $deps == 0)?"border:0;":"";
+ if ((count($this->entries) + $deps) < 22) {
$result.= "";
for ($i= 0; $i<$this->numColumns; $i++) {
if ($i == 0) {
@@ -344,22 +371,14 @@ echo "snapshot handler, daemon handler
";
}
- function setFilter($filter)
- {
- $this->filter= &$filter;
- if ($this->departmentBrowser){
- $this->departments= $this->getDepartments();
- }
- $this->filter->setBase($this->base);
- $this->entries= $this->filter->query();
- }
-
-
function update()
{
global $config;
$ui= get_userinfo();
+ // Reset object counter
+ $this->objectTypeCount= array();
+
// Do not do anything if this is not our PID
if(isset($_REQUEST['PID']) && $_REQUEST['PID'] != $this->pid) {
return;
@@ -495,6 +514,10 @@ echo "snapshot handler, daemon 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;
}
@@ -685,11 +708,7 @@ echo "snapshot handler, daemon handler
";
}
// Handle special types
- if ($action['type'] == "snapshot") {
- #TODO
- #echo "actiontriggers: snapshot missing
";
- }
- if ($action['type'] == "copypaste") {
+ if ($action['type'] == "copypaste" || $action['type'] == "snapshot") {
$objectType= $this->getObjectType($this->objectTypes, $this->entries[$row]['objectClass']);
$category= $class= null;
@@ -698,13 +717,12 @@ echo "snapshot handler, daemon handler
";
$class= $objectType['class'];
}
- $result.= $this->renderCopyPasteActions($row, $this->entries[$row]['dn'], $category, $class);
- }
- if ($action['type'] == "daemon") {
- #TODO
- #echo "actiontriggers: daemon missing
";
+ if ($action['type'] == "copypaste") {
+ $result.= $this->renderCopyPasteActions($row, $this->entries[$row]['dn'], $category, $class);
+ } else {
+ $result.= $this->renderSnapshotActions($row, $this->entries[$row]['dn'], $category, $class);
+ }
}
-
}
return $result;
@@ -886,7 +904,7 @@ echo "snapshot handler, daemon handler
";
$actions= &$this->xmlData['actionmenu']['action'];
$result= "".
"- Aktionen
";
+ "border=0 class='center' src='images/lists/sort-down.png'>";
// Build ul/li list
$result.= $this->recurseActions($actions);
@@ -911,7 +929,7 @@ echo "snapshot handler, daemon handler
";
// Fill image if set
$img= "";
if (isset($action['image'])){
- $img= "
";
+ $img= "
";
}
if ($action['type'] == "separator"){
@@ -943,13 +961,11 @@ echo "snapshot handler, daemon handler
";
break;
case 'snapshot':
- #TODO
- #echo "actionmenu: snapshot missing
";
+ $result.= $this->renderSnapshotMenu($separator);
break;
case 'daemon':
- #TODO
- #echo "actionmenu: daemon missing
";
+ $result.= $this->renderDaemonMenu($separator);
break;
}
@@ -974,7 +990,7 @@ echo "snapshot handler, daemon handler
";
// Every ACL has to pass
foreach ($acls as $acl) {
$module= $this->module;
- $acllist= array();
+ $aclList= array();
// Split for category and plugins if needed
// match for "[rw]" style entries
@@ -1102,7 +1118,7 @@ echo "snapshot handler, daemon handler
";
{
// We can only provide information if we've got a copypaste handler
// instance
- if(!(isset($this->CopyPasteHandler) && is_object($this->CopyPasteHandler))){
+ if(!(isset($this->copyPasteHandler) && is_object($this->copyPasteHandler))){
return "";
}
@@ -1136,7 +1152,7 @@ echo "snapshot handler, daemon handler
";
// Draw entries that allow pasting entries
if($paste){
- if($this->CopyPasteHandler->entries_queued()){
+ if($this->copyPasteHandler->entries_queued()){
$result.= "
"._("Paste")." ";
}else{
$result.= "
"._("Paste")." ";
@@ -1151,7 +1167,7 @@ echo "snapshot handler, daemon handler
";
{
// We can only provide information if we've got a copypaste handler
// instance
- if(!(isset($this->CopyPasteHandler) && is_object($this->CopyPasteHandler))){
+ if(!(isset($this->copyPasteHandler) && is_object($this->copyPasteHandler))){
return "";
}
@@ -1182,6 +1198,99 @@ echo "snapshot handler, daemon handler
";
return($result);
}
+
+ function renderSnapshotMenu($separator)
+ {
+ // We can only provide information if we've got a snapshot handler
+ // instance
+ if(!(isset($this->snapshotHandler) && is_object($this->snapshotHandler))){
+ return "";
+ }
+
+ // Presets
+ $result = "";
+ $ui = get_userinfo();
+
+ if($this->snapshotHandler->enabled() && $ui->allow_snapshot_restore($this->base, $this->module)){
+
+ // Check if there is something to restore
+ $restore= false;
+ foreach($this->snapshotHandler->getSnapshotBases() as $base){
+ $restore= $restore || count($this->snapshotHandler->getDeletedSnapshots($base)) > 0;
+ }
+
+ // Draw icons according to the restore flag
+ if($restore){
+ $result.= "
"._("Restore snapshots")." ";
+ }else{
+ $result.= "
"._("Restore snapshots")." ";
+ }
+ }
+
+ return($result);
+ }
+
+
+ function renderSnapshotActions($row, $dn, $category, $class, $copy= true, $cut= true)
+ {
+ // We can only provide information if we've got a snapshot handler
+ // instance
+ if(!(isset($this->snapshotHandler) && is_object($this->snapshotHandler))){
+ return "";
+ }
+
+ // Presets
+ $result= "";
+ $ui = get_userinfo();
+
+ // Only act if enabled here
+ if($this->snapshotHandler->enabled()){
+
+ // Draw restore button
+ if ($ui->allow_snapshot_restore($dn, $category)){
+
+ // Do we have snapshots for this dn?
+ if($this->snapshotHandler->hasSnapshots($dn)){
+ $result.= "";
+ } else {
+ $result.= "
";
+ }
+ }
+
+ // Draw snapshot button
+ if($ui->allow_snapshot_create($dn, $category)){
+ $result.= "";
+ }else{
+ $result.= "
";
+ }
+ }
+
+ return($result);
+ }
+
+
+ function renderDaemonMenu($separator)
+ {
+ $result= "";
+
+ // If there is a daemon registered, draw the menu entries
+ if(class_available("DaemonEvent")){
+ $events= DaemonEvent::get_event_types_by_category($this->categories);
+ if(isset($events['BY_CLASS']) && count($events['BY_CLASS'])){
+ foreach($events['BY_CLASS'] as $name => $event){
+ $result.= "- ".$event['MenuImage']." ".$event['s_Menu_Name']."
";
+ $separator= "";
+ }
+ }
+ }
+
+ return $result;
+ }
+
}
?>