Updated setup migrate step

-Added migration point, which allows to add gosaDepartment to the ldap base object.

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

diff --git a/gosa-core/setup/class_setupStep_Migrate.inc b/gosa-core/setup/class_setupStep_Migrate.inc
index 2a37dfbf86d31afcf04ffb4f7003eb5855ac64a2..4db13124128966b92ab60f83b1686946f1f3d0ad 100644 (file)
--- a/gosa-core/setup/class_setupStep_Migrate.inc
+++ b/gosa-core/setup/class_setupStep_Migrate.inc
@@ -113,6 +113,10 @@ class Step_Migrate extends setup_step
   var $acl_migrate_dialog      = FALSE;
   var $migrate_acl_base_entry  = "";
 
+  /* Root object classes */
+  var $rootOC_migrate_dialog = FALSE;
+  var $rootOC_details = array();
+       
   function Step_Migrate()
   {
     $this->update_strings(); 
@@ -134,6 +138,12 @@ class Step_Migrate extends setup_step
     $this->checks['root']['ERROR_MSG'] = "";
     $this->checkBase();
 
+    $this->checks['rootOC']['TITLE']     = _("Checking object classes for root object");
+    $this->checks['rootOC']['STATUS']    = FALSE;
+    $this->checks['rootOC']['STATUS_MSG']= "";
+    $this->checks['rootOC']['ERROR_MSG'] = "";
+    $this->checkBaseOC();
+
     $this->checks['permissions']['TITLE']     = _("Checking permissions on LDAP database");
     $this->checks['permissions']['STATUS']    = FALSE;
     $this->checks['permissions']['STATUS_MSG']= "";
@@ -1508,6 +1518,34 @@ class Step_Migrate extends setup_step
         $this->initialize_checks();
       }
     }
+
+    /*************
+     * Root object class check  
+     *************/
+  
+    if(isset($_POST['root_add_objectclasses'])){
+               $this->rootOC_migrate_dialog = TRUE;
+       $this->dialog = TRUE;
+    }
+       if(isset($_POST['rootOC_dialog_cancel'])){
+               $this->rootOC_migrate_dialog = FALSE;
+       $this->dialog = FALSE;
+       }
+       if(isset($_POST['rootOC_migrate_start'])){
+               if($this->checkBaseOC(FALSE)){
+                       $this->dialog = FALSE;
+                       $this->rootOC_migrate_dialog = FALSE;
+                       $this->checkBaseOC();
+               }
+       }
+       
+
+       if($this->rootOC_migrate_dialog){
+               $smarty = get_smarty();
+        $smarty->assign("details",$this->rootOC_details);
+        $smarty->assign("method","rootOC_migrate_dialog");
+               return($smarty->fetch(get_template_path("setup_migrate.tpl",TRUE,dirname(__FILE__))));
+       }
  
     /*************
      * Administrative Account -- Migrate/Create 
@@ -1969,6 +2007,145 @@ class Step_Migrate extends setup_step
   }
 
 
+  /* Check if the root object includes the required object classes, e.g. gosaDepartment is required for ACLs.
+   * If the parameter just_check is true, then just check for the OCs. 
+   * If the Parameter is false, try to add the required object classes.
+   */
+  function checkBaseOC($just_check = TRUE)
+  {
+    /* Establish ldap connection */
+    $cv = $this->parent->captured_values;
+    $ldap_l = new LDAP($cv['admin'],
+        $cv['password'],
+        $cv['connection'],
+        FALSE,
+        $cv['tls']);
+
+    $ldap = new ldapMultiplexer($ldap_l);
+
+    /* Check if root object exists */
+    $ldap->cd($cv['base']);
+    $ldap->cat($cv['base']);
+    if(!$ldap->count()){
+      $this->checks['rootOC']['STATUS']    = FALSE;
+      $this->checks['rootOC']['STATUS_MSG']= _("LDAP query failed");
+      $this->checks['rootOC']['ERROR_MSG'] = _("Possibly the 'root object' is missing.");
+      return;
+    }
+
+       $attrs = $ldap->fetch();
+
+       /* Root object doesn't exists 
+        */
+       if(!in_array("gosaDepartment",$attrs['objectClass'])){
+               if($just_check){
+
+                       $this->rootOC_details = array();        
+                       $mods = array();
+
+                       /* Get list of possible container objects, to be able to detect naming 
+                        *  attributes and missing attribute types.
+                        */
+                       if(!class_available("departmentManagement")){
+                               $this->checks['rootOC']['STATUS']    = FALSE;
+                               $this->checks['rootOC']['STATUS_MSG']= _("Failed");
+                               $this->checks['rootOC']['ERROR_MSG'] = sprintf(_("Missing GOsa class %s."),"departmentManagement")." "._("Please check your installation.");
+                               return;
+                       }
+
+                       /* Try to detect base class type, e.g. is it a dcObject.
+                        */
+                       $dep_types = departmentManagement::get_support_departments();
+                       $dep_type ="";
+                       foreach($dep_types as $dep_name => $dep_class){
+                               if(in_array($dep_class['CLASS'], $attrs['objectClass'])){
+                                       $dep_type = $dep_name;
+                                       break;
+                               }
+                       }
+
+                       /* If no known base class was detect, abort with message
+                        */     
+                       if(empty($dep_type)){
+                               $this->checks['rootOC']['STATUS']    = FALSE;
+                               $this->checks['rootOC']['STATUS_MSG']= _("Failed");
+                               $this->checks['rootOC']['ERROR_MSG'] = 
+                                       sprintf(_("Could not detect the object type of your root object, please try to add the objectClass '%s' manually."),"gosaDepartment");
+                               return;
+                       }
+
+                       /* Create 'current' and 'target' object properties, to be able to display 
+                        *  a set of modifications required to create a valid GOsa department.
+                        */     
+                       $str = "dn: ".$cv['base']."\n";
+                       for($i = 0 ; $i<$attrs['objectClass']['count'];$i++){
+                               $str .= "objectClass: ".$attrs['objectClass'][$i]."\n";
+                       }
+                       $this->rootOC_details['current'] = $str;
+
+                       /* Create target infos 
+                        */
+                       $str = "dn: ".$cv['base']."\n";
+                       for($i = 0 ; $i<$attrs['objectClass']['count'];$i++){
+                               $str .= "objectClass: ".$attrs['objectClass'][$i]."\n";
+                               $mods['objectClass'][] = $attrs['objectClass'][$i];
+                       }
+                       $mods['objectClass'][] = "gosaDepartment";
+                       $str .= "<b>objectClass: gosaDepartment</b>\n";
+
+                       /* Append attribute 'ou', it is required by gosaDepartment
+                        */
+                       if(!isset($attrs['ou'])){
+                               $val = "GOsa";
+                               if(isset($attrs[$dep_types[$dep_type]['ATTR']][0])){
+                                       $val = $attrs[$dep_types[$dep_type]['ATTR']][0];
+                               }
+                               $str .= "<b>ou: ".$val."</b>\n";
+                               $mods['ou'] =$val;
+                       }
+
+                       /*Append description, it is required by gosaDepartment too.
+                        */
+                       if(!isset($attrs['description'])){
+                               $val = "GOsa";
+                               if(isset($attrs[$dep_types[$dep_type]['ATTR']][0])){
+                                       $val = $attrs[$dep_types[$dep_type]['ATTR']][0];
+                               }
+                               $str .= "<b>description: ".$val."</b>\n";
+                               $mods['description'] = $val;
+                       }
+                       $this->rootOC_details['target'] = $str;
+                       $this->rootOC_details['mods'] = $mods;
+
+                       $this->checks['rootOC']['STATUS']    = FALSE;
+                       $this->checks['rootOC']['STATUS_MSG']= _("Failed");
+                       $this->checks['rootOC']['ERROR_MSG'] = "&nbsp;<input type='submit' name='root_add_objectclasses' value='"._("Migrate")."'>";
+ 
+                       return(FALSE);
+               }else{
+
+                       /* Add root object */ 
+                       $ldap->cd($cv['base']);
+                       if(isset($this->rootOC_details['mods'])){
+                               $res  = $ldap->modify($this->rootOC_details['mods']);   
+                               if(!$res){
+                                       msg_dialog::display(_("LDAP error"), msgPool::ldaperror($ldap->get_error(), $source, LDAP_MOD, get_class()));
+                               }
+                               return($res);
+                       }else{
+                               trigger_error("No modifications to make... ");
+                       }
+               }
+               return(TRUE);
+       }
+
+    /* Create & remove of dummy object was successful */
+    $this->checks['rootOC']['STATUS']    = TRUE;
+    $this->checks['rootOC']['STATUS_MSG']= _("Ok");
+       $this->checks['rootOC']['ERROR_MSG'] = "";
+  }
+
+
   /* Return ldif information for a 
    * given attribute array 
    */

diff --git a/gosa-core/setup/setup_license.tpl b/gosa-core/setup/setup_license.tpl
index 94ed664812aa737e14c1f38d33ff921428ab1bdf..5322579866173472cbddcd8b5886ceeb87745c28 100644 (file)
--- a/gosa-core/setup/setup_license.tpl
+++ b/gosa-core/setup/setup_license.tpl
@@ -5,7 +5,7 @@
                </div>
        </div>  
        <div style='width:95%; text-align: right'>
-               <input {if $accepted} checked {/if} type='checkbox' name='accepted' class="center">{t}I have read the license and accept it{/t}
+               <input {if $accepted} checked {/if} id="accepted" type='checkbox' name='accepted' class="center"><label for="accepted">{t}I have read the license and accept it{/t}</label>
        </div>
 </div>
 <input type='hidden' name='step_license' value='1'>

diff --git a/gosa-core/setup/setup_migrate.tpl b/gosa-core/setup/setup_migrate.tpl
index 24c4aa10f979c2836174bc5a50c340851b48c554..82d642cd952667b00b9604fa6c269edef9f9d92e 100644 (file)
--- a/gosa-core/setup/setup_migrate.tpl
+++ b/gosa-core/setup/setup_migrate.tpl
@@ -32,6 +32,34 @@
                <br>
                <input type='submit' name='reload' value='{t}Check again{/t}'>
 
+               {elseif $method == "rootOC_migrate_dialog"}
+
+                       <h2>{t}Add required object classes to the ldap base{/t}</h2>
+
+                       <b>{t}Current{/t}</b>
+                       <div class="step2_entry_container_info">
+                               <div style='padding-left:20px;'>
+                                       <pre>{$details.current}</pre>
+                               </div>
+                       </div>
+                       <br>
+                       <b>{t}After migration{/t}</b>
+                       <div class="step2_entry_container_info">
+                               <div style='padding-left:20px;'>
+                                       <pre>{$details.target}</pre>
+                               </div>
+                       </div>
+
+                       <br>
+                       <input type='submit' name='rootOC_migrate_start' value='{t}Migrate{/t}'>
+                       </p>
+                               
+
+                       <p class='seperator'>&nbsp;</p> 
+                       <div style='width:100%; text-align:right; padding:5px;'>
+                               <input type='submit' name='rootOC_dialog_cancel' value='{t}Close{/t}'>
+                       </div>
+
                {elseif $method == "outside_winstations"}
 
                        <h2>{t}Move windows workstations into a valid windows workstation department{/t}</h2>