Added base selector. readonly in the moment

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@15417 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-core/include/class_baseSelector.inc b/gosa-core/include/class_baseSelector.inc
index 375fe207ac3ed59c683c87c47632529850113b51..4082fb660bab4217743b771b8b0d71f42721d8f4 100644 (file)
--- a/gosa-core/include/class_baseSelector.inc
+++ b/gosa-core/include/class_baseSelector.inc
@@ -107,7 +107,7 @@ class baseSelector {
     }
 
     $link= "href='?plug=".$_GET['plug']."&PID=".$this->pid."&REBASE=".base64_encode($config->current['BASE'])."'";
-    $this->tree= "<input type='text' size='35' name='bs_input_".$this->pid."' id='bs_input_".$this->pid."' onfocus=\"\$('bs_".$this->pid."').hide()\" onmouseover=\"Element.clonePosition(\$('bs_".$this->pid."'), 'bs_input_".$this->pid."', {setHeight: false, setWidth: false, offsetTop:(Element.getHeight('bs_input_".$this->pid."'))});\$('bs_".$this->pid."').show();\" onmouseout=\"rtimer= Element.hide.delay(0.25, 'bs_".$this->pid."')\" value='".$this->pathMapping[$this->base]."'>";
+    $this->tree= "<input type='text' size='35' name='bs_input_".$this->pid."' id='bs_input_".$this->pid."' onfocus=\"\$('bs_".$this->pid."').hide()\" onmouseover=\"Element.clonePosition(\$('bs_".$this->pid."'), 'bs_input_".$this->pid."', {setHeight: false, setWidth: false, offsetTop:(Element.getHeight('bs_input_".$this->pid."'))});\$('bs_".$this->pid."').show();\" onmouseout=\"rtimer= Element.hide.delay(0.25, 'bs_".$this->pid."')\" value='".$this->pathMapping[$this->base]."' readonly>";
 
     $selected= $this->base == $config->current['BASE']?"Selected":"";
     $this->tree.= "<div class='treeList' style='display:none' id='bs_".$this->pid."' onmouseover=\"window.clearTimeout(rtimer);\" onmouseout=\"rtimer= Element.hide.delay(0.25, 'bs_".$this->pid."')\"><a class='treeList$selected' $link>/ ["._("Root")."]</a><ul class='treeList'>\n";

diff --git a/gosa-core/include/class_listing.inc b/gosa-core/include/class_listing.inc
index 00a9e1090d7d3d1dc99d0477fa44bb59e48e7c98..b615cf826bb0f0c53901b771b0454baf050a0ee3 100644 (file)
--- a/gosa-core/include/class_listing.inc
+++ b/gosa-core/include/class_listing.inc
@@ -53,6 +53,7 @@ class listing {
   var $useSpan= false;
   var $height= 0;
   var $scrollPosition= 0;
+  var $baseSelector;
 
 
   function listing($filename)
@@ -96,6 +97,9 @@ class listing {
         }
       }
     }
+
+    // Instanciate base selector
+    $this->baseSelector= new baseSelector($this->bases, $this->base);
   }
 
 
@@ -471,32 +475,36 @@ class listing {
     global $config;
     $ui= get_userinfo();
 
+    // Take care of base selector
+    $this->baseSelector->update();
+
+    // Save base
+    $refresh= false;
+    if ($this->baseMode) {
+      $this->base= $this->baseSelector->getBase();
+      session::global_set("CurrentMainBase", $this->base);
+      $refresh= true;
+    }
+
+
     // 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)) {
+    if($refresh || !(isset($_REQUEST['PID']) && $_REQUEST['PID'] != $this->pid)) {
 
       // Save position if set
       if (isset($_POST['position_'.$this->pid]) && is_numeric($_POST['position_'.$this->pid])) {
         $this->scrollPosition= $_POST['position_'.$this->pid];
       }
 
-      // Save base
-      if (isset($_POST['BASE']) && $this->baseMode) {
-        $base= base64_decode(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'];
+            $this->baseSelector->setBase($this->base);
             session::global_set("CurrentMainBase", $this->base);
           }
         }
@@ -549,17 +557,20 @@ class listing {
       if ($action == 'ROOT') {
         $deps= $ui->get_module_departments($this->categories);
         $this->base= $deps[0];
+        $this->baseSelector->setBase($this->base);
       }
       if ($action == 'BACK') {
         $deps= $ui->get_module_departments($this->categories);
         $base= preg_replace("/^[^,]+,/", "", $this->base);
         if(in_array_ics($base, $deps)){
           $this->base= $base;
+          $this->baseSelector->setBase($this->base);
         }
       }
       if ($action == 'HOME') {
         $ui= get_userinfo();
         $this->base= $this->filter->getObjectBase($ui->dn);
+        $this->baseSelector->setBase($this->base);
       }
     }
 
@@ -582,6 +593,7 @@ class listing {
   function setBase($base)
   {
     $this->base= $base;
+    $this->baseSelector->setBase($this->base);
   }
 
 
@@ -673,34 +685,7 @@ class listing {
       return;
     }
 
-    $result= "<select name='BASE' onChange='mainform.submit()' size='1'>";
-    $firstDN= null;
-    $found= false;
-    foreach ($this->bases as $key=>$value) {
-      // Keep first entry to fall back eventually
-      if(!$firstDN) {
-        $firstDN= $key;
-      }
-
-      // Prepare to render entry
-      $selected= "";
-      if ($key == $this->base) {
-        $selected= " selected";
-        $found= true;
-      }
-      // Encode key in b64 to avoid strange characters
-      $result.= "\n<option value=\"".base64_encode($key)."\"$selected>".$value."</option>";
-    }
-
-    $result.= "</select>";
-
-    // Reset the currently used base to the first DN we found if there
-    // was no match.
-    if(!$found){
-      $this->base = $firstDN;
-    }
-
-    return $result;
+    return $this->baseSelector->render();
   }
 
 
@@ -1302,6 +1287,11 @@ class listing {
     foreach($k_ids as $department){
       $this->bases[$department] = $ids[$department];
     }
+
+    // Populate base selector if already present
+    if ($this->baseSelector) {
+      $this->baseSelector->setBases($this->bases);
+    }
   }