Added user account migration

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

diff --git a/setup/class_setupStep_Migrate.inc b/setup/class_setupStep_Migrate.inc
index 5259803af752aa399eeb05958e3558c7a1297228..cf289a263dbf5c79dbe1bddb91a7246cbfc8e68b 100644 (file)
--- a/setup/class_setupStep_Migrate.inc
+++ b/setup/class_setupStep_Migrate.inc
@@ -28,10 +28,12 @@ class Step_Migrate extends setup_step
   var $checks         = array();
 
   /* Department migration attributes */
   var $checks         = array();
 
   /* Department migration attributes */

-  var $migration_dialog   = FALSE;
-  var $deps_to_migrate    = array();
+  var $dep_migration_dialog = FALSE;
+  var $deps_to_migrate      = array();

 
 

-  
+  /* Department migration attributes */
+  var $users_migration_dialog= FALSE;
+  var $users_to_migrate      = array();

 
   function Step_Migrate()
   {
 
   function Step_Migrate()
   {


@@ -60,6 +62,12 @@ class Step_Migrate extends setup_step
     $this->checks['deps_visible']['STATUS_MSG']= "";
     $this->checks['deps_visible']['ERROR_MSG'] = "";
     $this->check_visible_organizationalUnits();
     $this->checks['deps_visible']['STATUS_MSG']= "";
     $this->checks['deps_visible']['ERROR_MSG'] = "";
     $this->check_visible_organizationalUnits();

+
+    $this->checks['users_visible']['TITLE']     = _("Checking for invisible user");
+    $this->checks['users_visible']['STATUS']    = FALSE;
+    $this->checks['users_visible']['STATUS_MSG']= "";
+    $this->checks['users_visible']['ERROR_MSG'] = "";
+    $this->check_visible_gosaAccounts();

   }
 
 
   }
 
 


@@ -114,8 +122,103 @@ class Step_Migrate extends setup_step
   } 
 
 
   } 
 
 

+
+  function check_visible_gosaAccounts()
+  {
+    $old = $this->users_to_migrate;
+    $this->users_to_migrate = array();
+    $cnt_ok = 0;
+
+    /* Get collected configuration settings */
+    $cv = $this->parent->captured_values;
+
+    /* Establish ldap connection */
+    $ldap = new LDAP($cv['admin'],
+                     $cv['password'],
+                     $cv['connection'],
+                     FALSE,
+                     $cv['tls']);
+
+    /* Get all invisible departments */
+    $ldap->cd($cv['base']); 
+    $ldap->search("(&(|(objectClass=posixAccount)(objectClass=inetOrgPerson)(objectClass=organizationalPerson))(!(objectClass=gosaAccount)))",array("sn","givenName","cn","uid"));
+    while($attrs = $ldap->fetch()){
+  
+      if(!preg_match("/,dc=addressbook,/",$attrs['dn'])){
+
+        $attrs['checked'] = FALSE;
+        $attrs['before']  = "";
+        $attrs['after']   = "";
+
+        /* Set objects to selected, that were selected before reload */
+        if(isset($old[base64_encode($attrs['dn'])])){
+          $attrs['checked'] = $old[base64_encode($attrs['dn'])]['checked'];
+        }
+        $this->users_to_migrate[base64_encode($attrs['dn'])] = $attrs;
+      }
+    }
+
+      /* No invisible */
+    if(count($this->users_to_migrate) == 0){
+      $this->checks['users_visible']['STATUS']    = TRUE;
+      $this->checks['users_visible']['STATUS_MSG']= _("Ok");
+      $this->checks['users_visible']['ERROR_MSG'] = "";
+      $this->checks['users_visible']['ERROR_MSG'] .= "<input type='submit' name='users_visible_migrate_refresh' value='"._("Retry")."'>";
+    }else{
+      $this->checks['users_visible']['STATUS']    = FALSE;
+      $this->checks['users_visible']['STATUS_MSG']= "";
+      $this->checks['users_visible']['ERROR_MSG'] = sprintf(_("Found %s users that will not be visible in GOsa."), 
+        count($this->users_to_migrate));
+      $this->checks['users_visible']['ERROR_MSG'] .= "<input type='submit' name='users_visible_migrate' value='"._("Migrate")."'>";
+      $this->checks['users_visible']['ERROR_MSG'] .= "<input type='submit' name='users_visible_migrate_refresh' value='"._("Reload list").   "'>";
+    }
+
+  }
+
+  /* Start deparmtment migration */  
+  function migrate_gosaAccounts($only_ldif = FALSE)
+  {
+    /* Get collected configuration settings */
+    $cv = $this->parent->captured_values;
+
+    /* Establish ldap connection */
+    $ldap = new LDAP($cv['admin'],
+                     $cv['password'],
+                     $cv['connection'],
+                     FALSE,
+                     $cv['tls']);
+
+    foreach($this->users_to_migrate as $key => $dep){
+      if($dep['checked']){
+
+        $ldap->cat($dep['dn'],array("objectClass"));
+        $attrs      = $ldap->fetch();
+        $new_attrs  = array();
+
+        for($i = 0 ; $i < $attrs['objectClass']['count']; $i ++ ){
+          $new_attrs['objectClass'][]   = $attrs['objectClass'][$i];
+        }
+        $new_attrs['objectClass'][] = "gosaAccount";
+    
+        if($only_ldif){
+          $this->users_to_migrate[$key]['before'] = $this->array_to_ldif($attrs);
+          $this->users_to_migrate[$key]['after']  = $this->array_to_ldif($new_attrs);
+        }else{
+          $ldap->cd($attrs['dn']);
+          if(!$ldap->modify($new_attrs)){
+            print_red(sprintf(_("Failed to migrate the department '%s' into GOsa, error message is as follows '%s'."),$attrs['dn'],$ldap->get_error()));
+            return(false);
+          }
+        }
+      }
+    }
+    return(TRUE);
+  }
+
+

   function check_visible_organizationalUnits()
   {
   function check_visible_organizationalUnits()
   {

+    $old = $this->deps_to_migrate;

     $this->deps_to_migrate = array();
     $cnt_ok = 0;
 
     $this->deps_to_migrate = array();
     $cnt_ok = 0;
 


@@ -144,7 +247,11 @@ class Step_Migrate extends setup_step
       $attrs['before']  = "";
       $attrs['after']   = "";
 
       $attrs['before']  = "";
       $attrs['after']   = "";
 

-      $this->deps_to_migrate[] = $attrs;
+      /* Set objects to selected, that were selected before reload */
+      if(isset($old[base64_encode($attrs['dn'])])){
+        $attrs['checked'] = $old[base64_encode($attrs['dn'])]['checked'];
+      }
+      $this->deps_to_migrate[base64_encode($attrs['dn'])] = $attrs;

     }
   
     /* Filter returned list of departments */
     }
   
     /* Filter returned list of departments */


@@ -232,8 +339,50 @@ class Step_Migrate extends setup_step
     /* Permission check */
     $this->check_ldap_permissions();
 
     /* Permission check */
     $this->check_ldap_permissions();
 

-    /* Migration options 
+    /* User Migration 
+     */
+
+    /* Refresh list of deparments */
+    if(isset($_POST['users_visible_migrate_refresh'])){
+      $this->check_visible_gosaAccounts();
+    }
+
+    /* Open migration dialog */
+    if(isset($_POST['users_visible_migrate'])){
+      $this->users_migration_dialog = TRUE;
+      $this->dialog =TRUE;
+    }
+
+    /* Close migration dialog */
+    if(isset($_POST['users_visible_migrate_close'])){
+      $this->users_migration_dialog = FALSE;
+      $this->dialog =FALSE;
+    }
+
+    /* Start migration */
+    if(isset($_POST['users_visible_migrate_migrate'])){
+      if($this->migrate_gosaAccounts()){
+        $this->check_visible_gosaAccounts();
+      }
+    }
+
+    /* Start migration */
+    if(isset($_POST['users_visible_migrate_whatsdone'])){
+      $this->migrate_gosaAccounts(TRUE);
+    }
+
+    /* Display migration dialog */
+    if($this->users_migration_dialog){
+      $smarty = get_smarty();
+      $smarty->assign("users_to_migrate",$this->users_to_migrate);
+      $smarty->assign("method","migrate_users");
+      return($smarty->fetch(get_template_path("setup_migrate.tpl",TRUE,dirname(__FILE__))));
+    }
+
+
+    /* Department migration options 

      */
      */

+

     /* Refresh list of deparments */
     if(isset($_POST['deps_visible_migrate_refresh'])){
       $this->check_visible_organizationalUnits();
     /* Refresh list of deparments */
     if(isset($_POST['deps_visible_migrate_refresh'])){
       $this->check_visible_organizationalUnits();


@@ -241,13 +390,13 @@ class Step_Migrate extends setup_step
 
     /* Open migration dialog */
     if(isset($_POST['deps_visible_migrate'])){
 
     /* Open migration dialog */
     if(isset($_POST['deps_visible_migrate'])){

-      $this->migration_dialog = TRUE;
+      $this->dep_migration_dialog = TRUE;

       $this->dialog =TRUE;
     }
 
     /* Close migration dialog */
     if(isset($_POST['deps_visible_migrate_close'])){
       $this->dialog =TRUE;
     }
 
     /* Close migration dialog */
     if(isset($_POST['deps_visible_migrate_close'])){

-      $this->migration_dialog = FALSE;
+      $this->dep_migration_dialog = FALSE;

       $this->dialog =FALSE;
     }
 
       $this->dialog =FALSE;
     }
 


@@ -264,10 +413,10 @@ class Step_Migrate extends setup_step
     }
 
     /* Display migration dialog */
     }
 
     /* Display migration dialog */

-    if($this->migration_dialog){
+    if($this->dep_migration_dialog){

       $smarty = get_smarty();
       $smarty->assign("deps_to_migrate",$this->deps_to_migrate);
       $smarty = get_smarty();
       $smarty->assign("deps_to_migrate",$this->deps_to_migrate);

-      $smarty->assign("method","migrate");
+      $smarty->assign("method","migrate_deps");

       return($smarty->fetch(get_template_path("setup_migrate.tpl",TRUE,dirname(__FILE__))));
     }
 
       return($smarty->fetch(get_template_path("setup_migrate.tpl",TRUE,dirname(__FILE__))));
     }
 


@@ -279,9 +428,8 @@ class Step_Migrate extends setup_step
 
   function save_object()
   {
 
   function save_object()
   {

-    if($this->migration_dialog){
+    if($this->dep_migration_dialog){

       foreach($this->deps_to_migrate as $id => $data){
       foreach($this->deps_to_migrate as $id => $data){

-

         if(isset($_POST['migrate_'.$id])){
           $this->deps_to_migrate[$id]['checked'] = TRUE;
         }else{
         if(isset($_POST['migrate_'.$id])){
           $this->deps_to_migrate[$id]['checked'] = TRUE;
         }else{


@@ -289,6 +437,15 @@ class Step_Migrate extends setup_step
         }
       }
     }
         }
       }
     }

+    if($this->users_migration_dialog){
+      foreach($this->users_to_migrate as $id => $data){
+        if(isset($_POST['migrate_'.$id])){
+          $this->users_to_migrate[$id]['checked'] = TRUE;
+        }else{
+          $this->users_to_migrate[$id]['checked'] = FALSE;
+        }
+      }
+    }

 
   }
 
 
   }
 

diff --git a/setup/setup_migrate.tpl b/setup/setup_migrate.tpl
index a35e4b0e99b3c0a5fdd07027e38eefd4b0cb309b..845e24f2cb8a7375065685a51c7276f30f5e0791 100644 (file)
--- a/setup/setup_migrate.tpl
+++ b/setup/setup_migrate.tpl
@@ -19,7 +19,7 @@
                                {/if}
                                <div style='height:10px;'>&nbsp;</div>
                        {/foreach}
                                {/if}
                                <div style='height:10px;'>&nbsp;</div>
                        {/foreach}

-               {elseif $method == "migrate"}
+               {elseif $method == "migrate_deps"}

        
                        <h2>Department migration</h2>
 
        
                        <h2>Department migration</h2>
 


@@ -72,6 +72,59 @@ dn: {$deps_to_migrate.$key.dn}
                        <div style='width:100%; text-align:right; padding:5px;'>
                                <input type='submit' name='deps_visible_migrate_close' value='{t}Close{/t}'>
                        </div>
                        <div style='width:100%; text-align:right; padding:5px;'>
                                <input type='submit' name='deps_visible_migrate_close' value='{t}Close{/t}'>
                        </div>

+               {elseif $method == "migrate_users"}
+       
+                       <h2>User migration</h2>
+
+                       {t}The listed deparmtents below are currenlty invisble in the GOsa user interface. If you want to migrate a set of departments, just select them and use the migrate button below.{/t}<br>
+                       {t}If you want to know what will be done when migrating the selected entries, just use the 'What will be done here' button and you will see a list of changes.{/t}
+                                       
+
+                       <br><br>
+                       {foreach from=$users_to_migrate item=val key=key}
+
+                               {if $users_to_migrate.$key.checked}
+                                       <input type='checkbox' name='migrate_{$key}' checked>
+                                       {$users_to_migrate.$key.dn}
+                                       {if $users_to_migrate.$key.after != ""}
+                                               <div class="step2_entry_container_info" id="sol_8">
+
+{t}Current{/t}
+<div style='padding-left:20px;'>
+<pre>
+dn: {$users_to_migrate.$key.dn}
+{$users_to_migrate.$key.before}
+</pre>
+</div>
+{t}After migration{/t}
+<div style='padding-left:20px;'>
+<pre>
+dn: {$users_to_migrate.$key.dn}
+{$users_to_migrate.$key.after}
+</pre>
+</div>
+                                               </div>
+                                       {/if}
+                               {else}
+                                       <input type='checkbox' name='migrate_{$key}'>
+                                       {$users_to_migrate.$key.dn}
+                               {/if}
+
+                               <br>
+                               
+
+                       {/foreach}
+                       <br>
+
+                       <input type='submit' name='users_visible_migrate_refresh' value='{t}Reload list{/t}'>
+                       <input type='submit' name='users_visible_migrate_migrate' value='{t}Migrate{/t}'>
+                       <input type='submit' name='users_visible_migrate_whatsdone' value='{t}What will be done here{/t}'>
+
+                       <p class='seperator'>&nbsp;</p> 
+
+                       <div style='width:100%; text-align:right; padding:5px;'>
+                               <input type='submit' name='users_visible_migrate_close' value='{t}Close{/t}'>
+                       </div>

                {else}
 
        * Create a test department with some objects to check for correct permissions
                {else}
 
        * Create a test department with some objects to check for correct permissions