steffen: server/perl-kolab/Kolab Kolab.pm,1.8,1.9

[cvs at intevation.de]

Author: steffen

Update of /kolabrepository/server/perl-kolab/Kolab
In directory doto:/tmp/cvs-serv3739/perl-kolab/Kolab

Modified Files:
	Kolab.pm 
Log Message:
*BOMB*. Changes to support the new schema

Index: Kolab.pm
===================================================================
RCS file: /kolabrepository/server/perl-kolab/Kolab/Kolab.pm,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Kolab.pm	9 Aug 2004 22:00:40 -0000	1.8
+++ Kolab.pm	12 Aug 2004 10:55:39 -0000	1.9
@@ -297,10 +297,10 @@
         $config{'user_field_quota'} = 'userquota' if (!exists $config{'user_field_quota'});
     } else {
         # slurd/default
-        $config{'user_field_deleted'} = 'deleteflag' if (!exists $config{'user_field_deleted'});
+        $config{'user_field_deleted'} = 'kolabdeleteflag' if (!exists $config{'user_field_deleted'});
         $config{'user_field_modified'} = 'modifytimestamp' if (!exists $config{'user_field_modified'});
         $config{'user_field_guid'} = 'entryUUID' if (!exists $config{'user_field_guid'});
-        $config{'user_field_quota'} = 'userquota' if (!exists $config{'user_field_quota'});
+        $config{'user_field_quota'} = 'cyrus-userquota' if (!exists $config{'user_field_quota'});
     }
 
     # The `sf_XXX' variables are the shared folder equivalents of the `user_XXX' variables
@@ -320,7 +320,7 @@
     $config{'sf_dn_list'} = $config{'base_dn'} if (!exists $config{'sf_dn_list'});
     $config{'sf_directory_mode'} = $config{'directory_mode'} if (!exists $config{'sf_directory_mode'});
 
-    $config{'sf_object_class'} = 'sharedfolder' if (!exists $config{'sf_object_class'});
+    $config{'sf_object_class'} = 'kolabsharedfolder' if (!exists $config{'sf_object_class'});
 
     if ($config{'sf_directory_mode'} eq 'ad') {
         # AD
@@ -330,10 +330,10 @@
         $config{'sf_field_quota'} = 'userquota' if (!exists $config{'sf_field_quota'});
     } else {
         # slurd/default
-        $config{'sf_field_deleted'} = 'deleteflag' if (!exists $config{'sf_field_deleted'});
+        $config{'sf_field_deleted'} = 'kolabdeleteflag' if (!exists $config{'sf_field_deleted'});
         $config{'sf_field_modified'} = 'modifytimestamp' if (!exists $config{'sf_field_modified'});
         $config{'sf_field_guid'} = 'entryUUID' if (!exists $config{'sf_field_guid'});
-        $config{'sf_field_quota'} = 'userquota' if (!exists $config{'sf_field_quota'});
+        $config{'sf_field_quota'} = 'cyrus-userquota' if (!exists $config{'sf_field_quota'});
     }
 
     # `gyard_deletion_period' specifies how many minutes to leave lost users in