Updated setup department migration, skip ou=mime

Updated contib/gosa.conf to include glpi tabs
Fixed snapshot base

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

diff --git a/contrib/gosa.conf b/contrib/gosa.conf
index cc65988413e32dbc192bc8ff30aaab1ec0d93fe5..a5287ab499ee761a21f48c0216106eca7dfb2695 100644 (file)
--- a/contrib/gosa.conf
+++ b/contrib/gosa.conf
@@ -136,6 +136,7 @@
                <tab class="termservice" name="Devices" />
                <tab class="printgeneric" name="Printer" />
                <tab class="terminfo" name="Information" />
+               <tab class="glpiAccount" name="Inventory" />
        </termtabs>
 
        <servtabs>
@@ -144,6 +145,7 @@
                <tab class="serverService" name="Services" />
                <tab class="faiSummaryTab" name="FAI summary" />
                <tab class="terminfo" name="Information" />
+               <tab class="glpiAccount" name="Inventory" />
        </servtabs>
 
        <worktabs>
@@ -153,16 +155,29 @@
                <tab class="printgeneric" name="Printer" />
                <tab class="terminfo" name="Information" />
                <tab class="faiSummaryTab" name="FAI summary" />
+               <tab class="glpiAccount" name="Inventory" />
        </worktabs>
 
        <printtabs>
                <tab class="printgeneric" name="Generic" />
+               <tab class="glpiPrinterAccount" name="Inventory" />
        </printtabs>
 
     <phonetabs>
         <tab class="phonegeneric" name="Generic" />
+               <tab class="glpiAccount" name="Inventory" />
     </phonetabs>
 
+    <componenttabs>
+       <tab class="componentgeneric" name="Generic" />
+               <tab class="glpiAccount" name="Inventory" />
+    </componenttabs>
+
+    <wintabs>
+       <tab class="wingeneric" name="Generic" />
+               <tab class="glpiAccount" name="Inventory" />
+    </wintabs>
+
        <serverservice>
         <tab class="goMailServer" />
 {if $cv.mail == "kolab"}
@@ -184,14 +199,6 @@
                <tab class="gosaLogServer" />
     </serverservice>
 
-    <componenttabs>
-       <tab class="componentgeneric" name="Generic" />
-    </componenttabs>
-
-    <wintabs>
-       <tab class="wingeneric" name="Generic" />
-    </wintabs>
-
     <deptabs>
        <tab class="department" name="Generic" />
     </deptabs>
@@ -217,8 +224,8 @@
 <!--   
                <tab class="pptpAccount" /> 
                <tab class="phpscheduleitAccount" /> 
-               <tab class="glpiAccount" /> 
 -->
+               <tab class="glpiAccount" /> 
        </connectivity>
 
        <ldiftab>

diff --git a/include/class_plugin.inc b/include/class_plugin.inc
index 631a2d153c2b79ca823ea8f5a73aae18f9537a49..e613f4db9753c1a1498842c3e22943ac32f766fe 100644 (file)
--- a/include/class_plugin.inc
+++ b/include/class_plugin.inc
@@ -1093,7 +1093,7 @@ class plugin
       $server         = $tmp['SNAPSHOT_SERVER'];
       $user           = $tmp['SNAPSHOT_USER'];
       $password       = $tmp['SNAPSHOT_PASSWORD'];
-      $snapldapbase   = $tmp['SNAPSHOT_LDAP_BASE'];
+      $snapldapbase   = $tmp['SNAPSHOT_BASE'];
 
       $ldap_to        = new LDAP($user,$password, $server);
       $ldap_to -> cd($snapldapbase);
@@ -1179,7 +1179,7 @@ class plugin
 
           /* check if all required vars are available to create a new ldap connection */
           $missing = "";
-          foreach(array("SNAPSHOT_SERVER","SNAPSHOT_USER","SNAPSHOT_PASSWORD","SNAPSHOT_LDAP_BASE") as $var){
+          foreach(array("SNAPSHOT_SERVER","SNAPSHOT_USER","SNAPSHOT_PASSWORD","SNAPSHOT_BASE") as $var){
             if(!isset($tmp[$var])){
               $missing .= $var." ";
               print_red(sprintf(_("The snapshot functionality is enabled, but the required variable(s) '%s' is not configured in your gosa.conf."),$missing));
@@ -1211,7 +1211,7 @@ class plugin
       $server       = $tmp['SNAPSHOT_SERVER'];
       $user         = $tmp['SNAPSHOT_USER'];
       $password     = $tmp['SNAPSHOT_PASSWORD'];
-      $snapldapbase = $tmp['SNAPSHOT_LDAP_BASE'];
+      $snapldapbase = $tmp['SNAPSHOT_BASE'];
       $ldap_to      = new LDAP($user,$password, $server);
       $ldap_to -> cd ($snapldapbase);
       show_ldap_error($ldap->get_error(), sprintf(_("Method get available snapshots with dn '%s' failed."),$this->dn));
@@ -1267,7 +1267,7 @@ class plugin
       $server       = $tmp['SNAPSHOT_SERVER'];
       $user         = $tmp['SNAPSHOT_USER'];
       $password     = $tmp['SNAPSHOT_PASSWORD'];
-      $snapldapbase = $tmp['SNAPSHOT_LDAP_BASE'];
+      $snapldapbase = $tmp['SNAPSHOT_BASE'];
       $ldap_to      = new LDAP($user,$password, $server);
       $ldap_to->cd ($snapldapbase);
       show_ldap_error($ldap->get_error(), sprintf(_("Method get deleted snapshots with dn '%s' failed."),$this->dn));
@@ -1331,7 +1331,7 @@ class plugin
       $server       = $tmp['SNAPSHOT_SERVER'];
       $user         = $tmp['SNAPSHOT_USER'];
       $password     = $tmp['SNAPSHOT_PASSWORD'];
-      $snapldapbase = $tmp['SNAPSHOT_LDAP_BASE'];
+      $snapldapbase = $tmp['SNAPSHOT_BASE'];
       $ldap_to      = new LDAP($user,$password, $server);
       $ldap_to->cd ($snapldapbase);
       show_ldap_error($ldap->get_error(), sprintf(_("Restore snapshot with dn '%s' failed."),$snapldapbase));

diff --git a/setup/class_setupStep_Migrate.inc b/setup/class_setupStep_Migrate.inc
index 1773a678bf6002e6d36884364cc6a41f73abef3a..30897f3e238fc5495e586d075bf7c32998a6717c 100644 (file)
--- a/setup/class_setupStep_Migrate.inc
+++ b/setup/class_setupStep_Migrate.inc
@@ -674,7 +674,7 @@ class Step_Migrate extends setup_step
     /* Skip GOsa internal departments */
     $skip_dns = array("/".$cv['peopleou']."/","/".$cv['groupou']."/","/^ou=people,/","/^ou=groups,/",
         "/(,|)ou=configs,/","/(,|)ou=systems,/",
-        "/^ou=apps,/","/^ou=mime,/","/^ou=aclroles,/","/^ou=incoming,/",
+        "/(,|)ou=apps,/","/(,|)ou=mime,/","/^ou=aclroles,/","/^ou=incoming,/",
         "/ou=snapshots,/","/(,|)dc=addressbook,/","/^(,|)ou=machineaccounts,/",
         "/(,|)ou=winstations,/");