X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Finclude%2Fclass_baseSelector.inc;h=4da32961e827ac04fa56158b03c0ad07e3a89090;hb=7d0eab6bb81d3010130879061ea00542071f5b76;hp=81951f440061b17588d81381e0cd5cffdf114db1;hpb=7fd55b33640992d1204173e385c10d26b2b3a477;p=gosa.git

diff --git a/gosa-core/include/class_baseSelector.inc b/gosa-core/include/class_baseSelector.inc
index 81951f440..4da32961e 100644
--- a/gosa-core/include/class_baseSelector.inc
+++ b/gosa-core/include/class_baseSelector.inc
@@ -29,6 +29,7 @@ class baseSelector {
   private $submitButton= true;
   protected $tree;
   protected $pathMapping;
+  protected $lastState;
 
   // It would be better to get a dn -> [name, description, type] array
   // to avoid these tasks be done several times. Skipping for the moment.
@@ -71,6 +72,18 @@ class baseSelector {
   }
 
 
+  function checkBase($base)
+  {
+    return isset($this->pathMapping[$base]);
+  }
+
+
+  function checkLastBaseUpdate()
+  {
+    return $this->lastState;
+  }
+
+
   function setBases($bases)
   {
     global $config;
@@ -108,22 +121,28 @@ class baseSelector {
           $this->base= $new_base;
           $this->action= 'rebase';
         } else {
+          $this->lastState= false;
           return false;
         }
-      }
-    } elseif (isset($_POST['bs_input_'.$this->pid])) {
-
-      // Take over input field base
-      if ($this->submitButton && isset($_POST['submit_base_'.$this->pid.'_x']) || !$this->submitButton) {
-
-        // Check if base is available
-        foreach ($this->pathMapping as $key => $path) {
-          if (mb_strtolower($path) == mb_strtolower($_POST['bs_input_'.$this->pid])) {
-            $this->base= $key;
-            break;
+      }else{
+        // Input field set?
+        if (isset($_POST['bs_input_'.$this->pid])) {
+
+          // Take over input field base
+          if ($this->submitButton && isset($_POST['submit_base_'.$this->pid.'_x']) || !$this->submitButton) {
+
+            // Check if base is available
+            $this->lastState= false;
+            foreach ($this->pathMapping as $key => $path) {
+              if (mb_strtolower($path) == mb_strtolower($_POST['bs_input_'.$this->pid])) {
+                $this->base= $key;
+                $this->lastState= true;
+                break;
+              }
+            }
           }
         }
-      }
+      } 
 
     }
 
@@ -135,7 +154,6 @@ class baseSelector {
     $link= "onclick=\"\$('bs_rebase_".$this->pid."').value='".base64_encode($config->current['BASE'])."';  $('submit_tree_base_".$this->pid."').click();\"";
     $this->tree= "<input type='text' size='35' name='bs_input_".$this->pid."' id='bs_input_".$this->pid."' onkeydown=\"\$('bs_".$this->pid."').hide()\" 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=\"".preg_replace('/"/', '&quot;',$this->pathMapping[$this->base])."\">";
 
-
     // Autocompleter
     $this->tree.= "<div id='autocomplete_".$this->pid."' class='autocomplete'></div>".
                   "<script type='text/javascript'>".
@@ -146,7 +164,7 @@ class baseSelector {
     $this->tree.= "</script>";
 
     $selected= $this->base == $config->current['BASE']?"Selected":"";
-    $this->tree.= "<div class='treeList' style='display:none;max-height:".$this->height."px' 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";
+    $this->tree.= "<div class='treeList' style='display:none;max-height:".$this->height."px' id='bs_".$this->pid."' onmouseover=\"window.clearTimeout(rtimer);\" onmouseout=\"rtimer= Element.hide.delay(0.25, 'bs_".$this->pid."')\"><a class='treeList$selected' $link>/&nbsp;["._("Root")."]</a><ul class='treeList'>\n";
     $first= true;
     $last_indent= 2;
 
@@ -195,6 +213,7 @@ class baseSelector {
     $this->tree.= "<input type='hidden' name='bs_rebase_".$this->pid."' id='bs_rebase_".$this->pid."'>";
     $this->tree.= "<input type='hidden' name='BPID' id='BPID' value='".$this->pid."'>";
 
+    $this->lastState= true;
     return true;
   }