X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_listing.inc;h=c49320984f65053bd1346afb14141bb25bd7ecba;hb=dfd337167feecfc96bf7ecceda0bc548b2f30cd1;hp=38842dfb2ba762d670e1a7140e7b7e14a487a3d9;hpb=3dc20eed515b456b7057a9521b752c7a6c919ff6;p=gosa.git

diff --git a/gosa-core/include/class_listing.inc b/gosa-core/include/class_listing.inc
index 38842dfb2..c49320984 100644
--- a/gosa-core/include/class_listing.inc
+++ b/gosa-core/include/class_listing.inc
@@ -28,6 +28,7 @@ class listing {
   var $departmentBrowser= false;
   var $departmentRootVisible= false;
   var $multiSelect= false;
+  var $singleSelect= false;
   var $template;
   var $headline;
   var $base;
@@ -121,6 +122,12 @@ class listing {
   }
 
 
+  function getFilter()
+  { 
+    return($this->filter);
+  }  
+
+
   function setFilter($filter)
   {
     $this->filter= &$filter;
@@ -154,7 +161,7 @@ class listing {
     $this->xmlData= $this->xmlData["list"];
 
     // Load some definition values
-    foreach (array("departmentBrowser", "departmentRootVisible", "multiSelect", "baseMode") as $token) {
+    foreach (array("departmentBrowser", "departmentRootVisible", "multiSelect","singleSelect", "baseMode") as $token) {
       if (isset($this->xmlData['definition'][$token]) &&
           $this->xmlData['definition'][$token] == "true"){
         $this->$token= true;
@@ -238,7 +245,7 @@ class listing {
             isset($config['sortType'])) {
           $this->sortAttribute= $config['sortAttribute'];
           $this->sortType= $config['sortType'];
-          $sorter= " ".image("images/lists/sort-".($this->sortDirection[$index]?"up":"down").".png", null, $this->sortDirection[$index]?_("Up"):_("Down"), "text-top");
+          $sorter= " ".image("images/lists/sort-".($this->sortDirection[$index]?"up":"down").".png", null, $this->sortDirection[$index]?_("Sort ascending"):_("Sort descending"), "text-top");
         }
         $sortable= (isset($config['sortAttribute']));
 
@@ -288,16 +295,23 @@ class listing {
     
     $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);
+    $this->numColumns= count($this->colprops) + (($this->multiSelect|$this->singleSelect)?1:0);
 
     // Build list header
     $result.= "<thead class='fixedListHeader listHeaderFormat'><tr>\n";
-    if ($this->multiSelect) {
+    if ($this->multiSelect || $this->singleSelect) {
       $width= "24px";
       if (preg_match('/Konqueror/i', $_SERVER['HTTP_USER_AGENT'])){
         $width= "28px";
       }
-      $result.= "<td class='listheader' style='text-align:center;padding:0;width:$width;'><input type='checkbox' id='select_all' name='select_all' title='"._("Select all")."' onClick='toggle_all_(\"listing_selected_[0-9]*$\",\"select_all\");' ></td>\n";
+      $result.= "<td class='listheader' style='text-align:center;padding:0;width:$width;'>";
+      if($this->multiSelect){
+          $result.= "<input type='checkbox' id='select_all' name='select_all' 
+              title='"._("Select all")."' onClick='toggle_all_(\"listing_selected_[0-9]*$\",\"select_all\");' >";
+      }else{
+          $result.= "&nbsp;";
+      }
+      $result.="</td>\n";
     }
     foreach ($this->header as $header) {
       $result.= $header;
@@ -325,7 +339,7 @@ class listing {
         $result.="<tr>";
 
         // Render multi select if needed
-        if ($this->multiSelect) {
+        if ($this->multiSelect || $this->singleSelect) {
           $result.="<td style='text-align:center;padding:0;' class='list1'>&nbsp;</td>";
         }
 
@@ -362,6 +376,10 @@ class listing {
         $trow.="<td style='text-align:center;width:20px;' class='list0'><input type='checkbox' id='listing_selected_$row' name='listing_selected_$row'></td>\n";
       }
 
+      if ($this->singleSelect) {
+        $trow.="<td style='text-align:center;width:20px;' class='list0'><input type='radio' id='listing_radio_selected_$row' name='listing_radio_selected' value='{$row}'></td>\n";
+      }
+
       foreach ($this->xmlData['table']['column'] as $index => $config) {
         $renderedCell= $this->renderCell($config['value'], $entry, $row);
         $trow.="<td ".$this->colprops[$index]." class='list0'>".$renderedCell."</td>\n";
@@ -382,8 +400,16 @@ class listing {
     // 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){
-      $result.="<tr>\n";
-      $result.= $entry['_rendered'];
+
+      // Apply custom class to row?
+      if (preg_match("/<rowClass:([a-z0-9_-]*)\/>/i", $entry['_rendered'], $matches)) {
+        $result.="<tr class='".$matches[1]."'>\n";
+        $result.= preg_replace("/<rowClass[^>]+>/", '', $entry['_rendered']);
+      } else {
+        $result.="<tr>\n";
+        $result.= $entry['_rendered'];
+      }
+
       $result.="</tr>\n";
       $alt++;
     }
@@ -403,6 +429,7 @@ class listing {
           $result.= "<td class='list1nohighlight' style='border-right:0;$emptyListStyle'>&nbsp;</td>";
         }
       }
+
       $result.= "</tr>";
     }
 
@@ -445,6 +472,7 @@ class listing {
     }
 
     // Assign action menu / base
+    $smarty->assign("HEADLINE", $this->headline);
     $smarty->assign("ACTIONS", $this->renderActionMenu());
     $smarty->assign("BASE", $this->renderBase());
 
@@ -474,6 +502,7 @@ class listing {
     // 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);
@@ -997,17 +1026,17 @@ class listing {
 
     /* Draw back button */
     if($enableBack){
-      $result["BACK"]= image('images/lists/back.png', 'BACK', _("Go up one department"));
+      $result["BACK"]= image('images/lists/back.png', 'BACK', _("Go to preceding level"));
     }else{
-      $result["BACK"]= image('images/lists/back-grey.png', null, _("Go up one department"));
+      $result["BACK"]= image('images/lists/back-grey.png', null, _("Go to preceding level"));
     }
 
     /* Draw home button */
    /* Draw home button */
     if($enableHome){
-      $result["HOME"]= image('images/lists/home.png', 'HOME', _("Go to users department"));
+      $result["HOME"]= image('images/lists/home.png', 'HOME', _("Go to current users level"));
     }else{
-      $result["HOME"]= image('images/lists/home-grey.png', null, _("Go to users department"));
+      $result["HOME"]= image('images/lists/home-grey.png', null, _("Go to current users level"));
     }
 
 
@@ -1048,6 +1077,12 @@ class listing {
       return $result;
     }
 
+    // Get single selection (radio box)
+    if($this->singleSelect && isset($_POST['listing_radio_selected'])){
+        $entry = $_POST['listing_radio_selected'];
+        $result['targets']= array($this->entries[$entry]['dn']);
+    }
+
     // Filter POST with "listing_" attributes
     foreach ($_POST as $key => $prop) {
 
@@ -1094,9 +1129,11 @@ class listing {
 
   function renderActionMenu()
   {
+    $result= "<input type='hidden' name='act' id='act' value=''><div style='display:none'><input type='submit' name='exec_act' id='exec_act' value=''></div>";
+
     // Don't send anything if the menu is not defined
     if (!isset($this->xmlData['actionmenu']['action'])){
-      return "";
+      return $result;
     }
 
     // Array?
@@ -1106,13 +1143,12 @@ class listing {
 
     // 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")."&nbsp;".image("images/lists/sort-down.png")."</a>";
+    $result.= "<ul class='level1' id='root'><li><a href='#'>"._("Actions")."&nbsp;".image("images/lists/sort-down.png")."</a>";
 
     // Build ul/li list
     $result.= $this->recurseActions($actions);
 
-    return "<div id='pulldown'>".$result."</li></ul><div>";
+    return "<div id='pulldown'>".$result."</li></ul></div>";
   }
 
 
@@ -1171,7 +1207,7 @@ class listing {
 
       // Render entry elseways
       if (isset($action['label'])){
-        $result.= "<li$separator><a href='#' onClick='document.getElementById(\"actionmenu\").value= \"".$action['name']."\";mainform.submit();'>$img"._($action['label'])."</a></li>";
+        $result.= "<li$separator><a href='#' onClick='\$(\"act\").value= \"".$action['name']."\";\$(\"exec_act\").click();'>$img"._($action['label'])."</a></li>";
       }
 
       // Check for special types
@@ -1377,13 +1413,13 @@ class listing {
 
       // Copy entry
       if($copy){
-        $result.= "<li$separator><a href='#' onClick='document.getElementById(\"actionmenu\").value= \"copy\";document.getElementById(\"exec_act\").click();'>".image('images/lists/copy.png')."&nbsp;"._("Copy")."</a></li>";
+        $result.= "<li$separator><a href='#' onClick='\$(\"act\").value= \"copy\";\$(\"exec_act\").click();'>".image('images/lists/copy.png')."&nbsp;"._("Copy")."</a></li>";
         $separator= "";
       }
 
       // Cut entry
       if($cut){
-        $result.= "<li$separator><a href='#' onClick='document.getElementById(\"actionmenu\").value= \"cut\";document.getElementById(\"exec_act\").click();'>".image("images/lists/cut.png")."&nbsp;"._("Cut")."</a></li>";
+        $result.= "<li$separator><a href='#' onClick='\$(\"act\").value= \"cut\";\$(\"exec_act\").click();'>".image("images/lists/cut.png")."&nbsp;"._("Cut")."</a></li>";
         $separator= "";
       }
     }
@@ -1391,7 +1427,7 @@ class listing {
     // 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();'>".image("images/lists/paste.png")."&nbsp;"._("Paste")."</a></li>";
+        $result.= "<li$separator><a href='#' onClick='\$(\"act\").value= \"paste\";\$(\"exec_act\").click();'>".image("images/lists/paste.png")."&nbsp;"._("Paste")."</a></li>";
       }else{
         $result.= "<li$separator><a href='#'>".image('images/lists/paste-grey.png')."&nbsp;"._("Paste")."</a></li>";
       }
@@ -1457,7 +1493,7 @@ class listing {
 
       // 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();'>".image('images/lists/restore.png')."&nbsp;"._("Restore snapshots")."</a></li>";
+        $result.= "<li$separator><a href='#' onClick='\$(\"act\").value= \"restore\";\$(\"exec_act\").click();'>".image('images/lists/restore.png')."&nbsp;"._("Restore snapshots")."</a></li>";
       }else{
         $result.= "<li$separator><a href='#'>".image('images/lists/restore-grey.png')."&nbsp;"._("Restore snapshots")."</a></li>";
       }
@@ -1477,7 +1513,7 @@ class listing {
 
     // 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();'>".image($exporter['image'])."&nbsp;".$exporter['label']."</a></li>";
+      $result.= "<li><a href='#' onClick='\$(\"act\").value= \"$action\";\$(\"exec_act\").click();'>".image($exporter['image'])."&nbsp;".$exporter['label']."</a></li>";
     }
 
     // Finalize list
@@ -1515,7 +1551,7 @@ class listing {
 
       // Draw snapshot button
       if($ui->allow_snapshot_create($dn, $category)){
-          $result.= image('images/snapshot.png', "listing_snapshot_$row", _("Create a new snapshot from this object"));
+          $result.= image('images/snapshot.png', "listing_snapshot_$row", _("Create new snapshot for this object"));
       }else{
           $result.= image('images/empty.png');
       }
@@ -1534,7 +1570,7 @@ class listing {
       $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.= "<li$separator><a href='#' onClick='document.getElementById(\"actionmenu\").value=\"$name\";document.getElementById(\"exec_act\").click();'>".$event['MenuImage']."&nbsp;".$event['s_Menu_Name']."</a></li>";
+          $result.= "<li$separator><a href='#' onClick='\$(\"act\").value=\"$name\";\$(\"exec_act\").click();'>".$event['MenuImage']."&nbsp;".$event['s_Menu_Name']."</a></li>";
           $separator= "";
         }
       }
@@ -1546,6 +1582,7 @@ class listing {
 
   function getEntry($dn)
   {
+    $dn = LDAP::fix($dn);
     foreach ($this->entries as $entry) {
       if (isset($entry['dn']) && strcasecmp($dn, $entry['dn']) == 0){
         return $entry;
@@ -1563,6 +1600,7 @@ class listing {
 
   function getType($dn)
   {
+    $dn = LDAP::fix($dn);
     if (isset($this->objectDnMapping[$dn])) {
       return $this->objectDnMapping[$dn];
     }