From 505a4a8f45eecca5e6a0f5d2410a6bad24d3bba0 Mon Sep 17 00:00:00 2001
From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Fri, 29 Jan 2010 14:44:51 +0000
Subject: [PATCH] Added base selector to groups and users

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@15451 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 gosa-core/include/class_baseSelector.inc      |  8 ++--
 ...class_groupGeneric.inc => class_group.inc} | 46 ++++++++++++------
 gosa-core/plugins/admin/groups/generic.tpl    |  8 +---
 .../plugins/admin/ogroups/class_ogroup.inc    | 35 ++++++++------
 gosa-core/plugins/admin/ogroups/generic.tpl   |  7 +--
 .../plugins/personal/generic/class_user.inc   | 48 ++++++++++---------
 .../plugins/personal/generic/generic.tpl      |  7 +--
 7 files changed, 85 insertions(+), 74 deletions(-)
 rename gosa-core/plugins/admin/groups/{class_groupGeneric.inc => class_group.inc} (97%)

diff --git a/gosa-core/include/class_baseSelector.inc b/gosa-core/include/class_baseSelector.inc
index ff9c44ace..bb6c765d7 100644
--- a/gosa-core/include/class_baseSelector.inc
+++ b/gosa-core/include/class_baseSelector.inc
@@ -139,9 +139,11 @@ class baseSelector {
     // Autocompleter
     $this->tree.= "<div id='autocomplete_".$this->pid."' class='autocomplete'></div>".
                   "<script type='text/javascript'>".
-                  "new Ajax.Autocompleter('bs_input_".$this->pid."', 'autocomplete_".$this->pid."', 'autocomplete.php?type=base', { minChars: 3, frequency: 0.5 });".
-                  "$('bs_input_".$this->pid."').observe('keypress', function(event) { if(event.keyCode == Event.KEY_RETURN) { $('submit_base_".$this->pid."').click(); } });".
-                  "</script>";
+                  "new Ajax.Autocompleter('bs_input_".$this->pid."', 'autocomplete_".$this->pid."', 'autocomplete.php?type=base', { minChars: 3, frequency: 0.5 });";
+    if ($this->submitButton) {
+      $this->tree.= "$('bs_input_".$this->pid."').observe('keypress', function(event) { if(event.keyCode == Event.KEY_RETURN) { $('submit_base_".$this->pid."').click(); } });";
+    }
+    $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";
diff --git a/gosa-core/plugins/admin/groups/class_groupGeneric.inc b/gosa-core/plugins/admin/groups/class_group.inc
similarity index 97%
rename from gosa-core/plugins/admin/groups/class_groupGeneric.inc
rename to gosa-core/plugins/admin/groups/class_group.inc
index c53844ae6..a2519c1c3 100644
--- a/gosa-core/plugins/admin/groups/class_groupGeneric.inc
+++ b/gosa-core/plugins/admin/groups/class_group.inc
@@ -58,6 +58,7 @@ class group extends plugin
   var $dnMapping= array();
   var $view_logged = FALSE;
   var $allowGroupsWithSameNameInOtherSubtrees = true;
+  var $baseSelector;
 
   /* Trustmodel/AccessTo 
    */
@@ -224,6 +225,13 @@ class group extends plugin
 
     /* This is always an account */
     $this->is_account= TRUE;
+
+    /* Instanciate base selector */
+    $this->baseSelector= new baseSelector($this->get_allowed_bases(), $this->base);
+    $this->baseSelector->setSubmitButton(false);
+    $this->baseSelector->setHeight(300);
+    $this->baseSelector->update(true);
+
     $this->reload(TRUE);
   }
 
@@ -372,6 +380,8 @@ class group extends plugin
     }
 
     $smarty= get_smarty();
+    $smarty->assign("usePrototype", "true");
+
     if($this->config->search("nagiosaccount", "CLASS",array('menu'))){
       $smarty->assign("nagios",true);
     }else{
@@ -389,8 +399,8 @@ class group extends plugin
       return($this->userSelect->execute());
     }
 
-    $smarty->assign("bases", $this->get_allowed_bases());
-    $smarty->assign("base_select", $this->base);
+    /* Create base acls */
+    $smarty->assign("base", $this->baseSelector->render());
 
     $domains= array();
     foreach($this->config->data['SERVERS']['SAMBA'] as $name => $content){
@@ -738,6 +748,17 @@ class group extends plugin
   /* Save data to object */
   function save_object()
   {
+    /* Refresh base */
+    if ($this->acl_is_moveable($this->base)){
+      if (!$this->baseSelector->update()) {
+        msg_dialog::display(_("Error"), msgPool::permMove(), ERROR_DIALOG);
+      }
+      if ($this->base != $this->baseSelector->getBase()) {
+        $this->base= $this->baseSelector->getBase();
+        $this->is_modified= TRUE;
+      }
+    }
+
     /* Save additional values for possible next step */
     if (isset($_POST['groupedit'])){
 
@@ -755,14 +776,6 @@ class group extends plugin
         $this->smbgroup = 0;
       }
 
-      /* Get base selection */
-      if(isset($_POST['base'])){
-        $tmp = $this->get_allowed_bases();
-        if(isset($tmp[$_POST['base']])){
-          $this->base = $_POST['base'];
-        }
-      }
-
       foreach (array(
             "force_gid"  => "gidNumber", 
             "smbgroup"   => "sambaGroupType") as $val => $aclname) {
@@ -1212,11 +1225,14 @@ class group extends plugin
         }
       }
 
-      /* Get base selection */
-      if(isset($_POST['base'])){
-        $tmp = $this->get_allowed_bases();
-        if(isset($tmp[$_POST['base']])){
-          $this->base = $_POST['base'];
+      /* Refresh base */
+      if ($this->acl_is_moveable($this->base)){
+        if (!$this->baseSelector->update()) {
+          msg_dialog::display(_("Error"), msgPool::permMove(), ERROR_DIALOG);
+        }
+        if ($this->base != $this->baseSelector->getBase()) {
+          $this->base= $this->baseSelector->getBase();
+          $this->is_modified= TRUE;
         }
       }
 
diff --git a/gosa-core/plugins/admin/groups/generic.tpl b/gosa-core/plugins/admin/groups/generic.tpl
index bda8985ed..544e8d381 100644
--- a/gosa-core/plugins/admin/groups/generic.tpl
+++ b/gosa-core/plugins/admin/groups/generic.tpl
@@ -40,13 +40,7 @@
      </td>
      <td>
 {render acl=$baseACL checkbox=$multiple_support checked=$use_base}
-      <select id="base" size="1" name="base" title="{t}Choose subtree to place group in{/t}">
-       {html_options options=$bases selected=$base_select}
-      </select>
-{/render}
-
-{render acl=$baseACL disable_picture='images/lists/folder_grey.png'}
-	<input type="image" name="chooseBase" src="images/lists/folder.png" class="center" title="{t}Select a base{/t}">
+       {$base}
 {/render}
      </td>
     </tr>
diff --git a/gosa-core/plugins/admin/ogroups/class_ogroup.inc b/gosa-core/plugins/admin/ogroups/class_ogroup.inc
index bbee66f04..d6ff10d0a 100644
--- a/gosa-core/plugins/admin/ogroups/class_ogroup.inc
+++ b/gosa-core/plugins/admin/ogroups/class_ogroup.inc
@@ -58,6 +58,7 @@ class ogroup extends plugin
   var $trustSelect = FALSE;
 
   var $was_trust_account= FALSE;
+  var $baseSelector;
 
   /* Already assigned Workstations. Will be hidden in selection. 
    */
@@ -178,6 +179,12 @@ class ogroup extends plugin
       session::set("sysfilter", $sysfilter);
     }
 
+    /* Instanciate base selector */
+    $this->baseSelector= new baseSelector($this->get_allowed_bases(), $this->base);
+    $this->baseSelector->setSubmitButton(false);
+    $this->baseSelector->setHeight(300);
+    $this->baseSelector->update(true);
+
     $this->reload();
   }
 
@@ -272,6 +279,7 @@ class ogroup extends plugin
 
     /* Load templating engine */
     $smarty= get_smarty();
+    $smarty->assign("usePrototype", "true");
 
     $tmp = $this->plInfo();
     foreach($tmp['plProvidedAcls'] as $name => $translation){
@@ -416,8 +424,7 @@ class ogroup extends plugin
     }
 
     /* Assign variables */
-    $smarty->assign("bases", $this->get_allowed_bases());
-    $smarty->assign("base_select", $this->base);
+    $smarty->assign("base", $this->baseSelector->render());
     $smarty->assign("department", $this->department);
     $smarty->assign("members", $this->convert_list($this->memberList));
 
@@ -469,6 +476,17 @@ class ogroup extends plugin
   /* Save data to object */
   function save_object()
   {
+    /* Refresh base */
+    if ($this->acl_is_moveable($this->base)){
+      if (!$this->baseSelector->update()) {
+        msg_dialog::display(_("Error"), msgPool::permMove(), ERROR_DIALOG);
+      }
+      if ($this->base != $this->baseSelector->getBase()) {
+        $this->base= $this->baseSelector->getBase();
+        $this->is_modified= TRUE;
+      }
+    }
+
     /* Save additional values for possible next step */
     if (isset($_POST['ogroupedit'])){
 
@@ -495,20 +513,7 @@ class ogroup extends plugin
         Ende Trust account
        ******/
 
-      /* Create a base backup and reset the
-         base directly after calling plugin::save_object();
-         Base will be set seperatly a few lines below */
-      $base_tmp = $this->base;
       plugin::save_object();
-      $this->base = $base_tmp;
-
-      /* Save base, since this is no LDAP attribute */
-      $tmp = $this->get_allowed_bases();
-      if(isset($_POST['base'])){
-        if(isset($tmp[$_POST['base']])){
-          $this->base= $_POST['base'];
-        }
-      }
     }
   }
 
diff --git a/gosa-core/plugins/admin/ogroups/generic.tpl b/gosa-core/plugins/admin/ogroups/generic.tpl
index 1836e9d3a..199fd195b 100644
--- a/gosa-core/plugins/admin/ogroups/generic.tpl
+++ b/gosa-core/plugins/admin/ogroups/generic.tpl
@@ -26,12 +26,7 @@
      <td><LABEL for="base">{t}Base{/t}</LABEL>{$must}</td>
      <td>
 {render acl=$baseACL}
-      <select size="1" id="base" name="base" title="{t}Choose subtree to place group in{/t}">
-       {html_options options=$bases selected=$base_select}
-      </select>
-{/render}
-{render acl=$baseACL disable_picture='images/lists/folder_grey.png'}
-      <input type="image" name="chooseBase" src="images/lists/folder.png" class="center" title="{t}Select a base{/t}">
+       {$base}
 {/render}
      </td>
     </tr>
diff --git a/gosa-core/plugins/personal/generic/class_user.inc b/gosa-core/plugins/personal/generic/class_user.inc
index 94f23a194..7c3d54846 100644
--- a/gosa-core/plugins/personal/generic/class_user.inc
+++ b/gosa-core/plugins/personal/generic/class_user.inc
@@ -66,6 +66,7 @@ class user extends plugin
   var $use_dob= "0";
   var $gender="0";
   var $preferredLanguage="0";
+  var $baseSelector;
 
   var $jpegPhoto= "*removed*";
   var $photoData= "";
@@ -250,6 +251,10 @@ class user extends plugin
     $this->gosaLoginRestrictionWidget->setHeight("70px");
  
     $this->orig_base = $this->base;
+    $this->baseSelector= new baseSelector($this->allowedBasesToMoveTo(), $this->base);
+    $this->baseSelector->setSubmitButton(false);
+    $this->baseSelector->setHeight(300);
+    $this->baseSelector->update(true);
   }
 
 
@@ -612,7 +617,6 @@ class user extends plugin
     $smarty->assign("pwmode_select", $this->pw_storage);
     $smarty->assign("pw_configurable", $is_configurable);
     $smarty->assign("passwordStorageACL", $this->getacl("userPassword",(!is_object($this->parent) && !session::is_set('edit'))));
-    $smarty->assign("base_select",      $this->base);
 
     if(!session::is_set('edit')){
       $smarty->assign("CertificatesACL","");
@@ -624,8 +628,7 @@ class user extends plugin
     $smarty->assign("userPicture_is_readable",   $this->acl_is_readable("userPicture",(!is_object($this->parent) && !session::is_set('edit'))));
 
     /* Create base acls */
-    $tmp = @$this->allowedBasesToMoveTo();
-    $smarty->assign("bases", $tmp);
+    $smarty->assign("base", $this->baseSelector->render());
 
     /* Save government mode attributes */
     if($this->governmentmode){
@@ -747,6 +750,17 @@ class user extends plugin
   /* Save data to object */
   function save_object()
   {
+    /* Refresh base */
+    if ($this->acl_is_moveable($this->base)){
+      if (!$this->baseSelector->update()) {
+        msg_dialog::display(_("Error"), msgPool::permMove(), ERROR_DIALOG);
+      }
+      if ($this->base != $this->baseSelector->getBase()) {
+        $this->base= $this->baseSelector->getBase();
+        $this->is_modified= TRUE;
+      }
+    }
+      
     if(isset($_POST['generic']) || isset($_POST['multiple_user_posted'])){
 
       /* Make a backup of the current selected base */
@@ -780,23 +794,6 @@ class user extends plugin
         $this->givenName= $this->sn;
       }
 
-      /* Save base - its no no LDAP attribute */
-      if (isset($_POST['base'])){
-        $base= get_post('base');
-        if ($base != $this->base){
-          $tmp = $this->get_allowed_bases();
-          if(isset($tmp[$base])){
-            if ($base != $this->base){
-              $this->is_modified= TRUE;
-            }
-            $this->base= $base;
-          }else{
-            $this->base = $base_tmp;
-            msg_dialog::display(_("Error"), msgPool::permMove(), ERROR_DIALOG);
-          }
-        }
-      }
-
       /* Get pw_storage mode */
       if (isset($_POST['pw_storage'])){
         foreach(array("pw_storage") as $val){
@@ -1700,8 +1697,15 @@ class user extends plugin
         }
       }
     }
-    if(isset($_POST['base'])){
-      $this->base = get_post('base');
+
+    /* Refresh base */
+    if ($this->acl_is_moveable($this->base)){
+      if (!$this->baseSelector->update()) {
+        msg_dialog::display(_("Error"), msgPool::permMove(), ERROR_DIALOG);
+      }
+      if ($this->base != $this->baseSelector->getBase()) {
+        $this->base= $this->baseSelector->getBase();
+      }
     }
 
     if(isset($_POST['user_mulitple_edit'])){
diff --git a/gosa-core/plugins/personal/generic/generic.tpl b/gosa-core/plugins/personal/generic/generic.tpl
index 96555fbd1..afecb253e 100644
--- a/gosa-core/plugins/personal/generic/generic.tpl
+++ b/gosa-core/plugins/personal/generic/generic.tpl
@@ -166,12 +166,7 @@
      <td>
       <div style="height:10px;"></div>
 {render acl=$baseACL checkbox=$multiple_support checked=$use_base}
-		<select id="base" size="1" name="base" title="{t}Choose subtree to place user in{/t}">
-			{html_options options=$bases selected=$base_select}
-		</select>
-{/render}
-{render acl=$baseACL disable_picture='images/lists/folder_grey.png'}
-		<input type="image" name="chooseBase" src="images/lists/folder.png" class="center" title="{t}Select a base{/t}">
+      {$base}
 {/render}
      </td>
     </tr>
-- 
2.39.5