Added attributes for start/stop vacation messages

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

diff --git a/README.safemode b/README.safemode
index e43434059749dd97d4a6462f71a9d9084b216d5e..f3c67deb5c46e6b0aa455f4de37dbcde3dbe0871 100644 (file)
--- a/README.safemode
+++ b/README.safemode
@@ -1,7 +1,7 @@
 In order to run GOsa in PHP's safe mode, these changes in your php.ini
 have been tested:
 
-magic_quotes_qpc = On
+magic_quotes_gpc = On
 allow_url_fopen = No
 register_globals = Off
 safe_mode = On

diff --git a/contrib/openldap/gosa+samba3.schema b/contrib/openldap/gosa+samba3.schema
index 78e2740d4361ef31d49479af878dd3fa4e4ee3b7..cd8ba062204cdd0792eb5421ce2e30698d94fefa 100644 (file)
--- a/contrib/openldap/gosa+samba3.schema
+++ b/contrib/openldap/gosa+samba3.schema
@@ -216,6 +216,16 @@ attributetype ( 1.3.6.1.4.1.10098.1.1.12.35 NAME 'gosaAclEntry'
         SUBSTR caseIgnoreIA5SubstringsMatch
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26)
 
+attributetype ( 1.3.6.1.4.1.10098.1.1.12.36 NAME 'gosaVacationStart'
+        DESC 'Timestamp for enabling current vacation message'
+        EQUALITY caseIgnoreMatch
+        SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE)
+
+attributetype ( 1.3.6.1.4.1.10098.1.1.12.37 NAME 'gosaVacationStop'
+        DESC 'Timestamp for switching off current vacation message'
+        EQUALITY caseIgnoreMatch
+        SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE)
+
 attributetype ( 1.3.6.1.4.1.10098.1.1.6.2 NAME 'academicTitle'
         DESC 'Field to represent the academic title'
         EQUALITY caseIgnoreIA5Match
@@ -265,7 +275,7 @@ objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.5 NAME 'gosaMailAccount' SUP top AUXILI
        MUST ( mail $ gosaMailServer $ gosaMailDeliveryMode)
        MAY  ( gosaMailQuota $ gosaMailAlternateAddress $ gosaMailForwardingAddress $
               gosaMailMaxSize $ gosaSpamSortLevel $ gosaSpamMailbox $
-              gosaVacationMessage $ gosaSharedFolderTarget $ acl))
+              gosaVacationMessage $ gosaVacationStart $ gosaVacationStop $ gosaSharedFolderTarget $ acl))
 
 objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.6 NAME 'gosaAccount' SUP top AUXILIARY
         DESC 'Objectclass for GOsa Accounts (v2.4)'

diff --git a/contrib/openldap/gosa.schema b/contrib/openldap/gosa.schema
index 2fa63078795467dcf9bffeb6ac0ad120fb8c0508..8cb08e5c99fe28f00992c2ec8c7a3c1f731f0c40 100644 (file)
--- a/contrib/openldap/gosa.schema
+++ b/contrib/openldap/gosa.schema
@@ -214,6 +214,16 @@ attributetype ( 1.3.6.1.4.1.10098.1.1.12.35 NAME 'gosaAclEntry'
         SUBSTR caseIgnoreIA5SubstringsMatch
         SYNTAX 1.3.6.1.4.1.1466.115.121.1.26)
 
+attributetype ( 1.3.6.1.4.1.10098.1.1.12.36 NAME 'gosaVacationStart'
+        DESC 'Timestamp for enabling current vacation message'
+        EQUALITY caseIgnoreMatch
+        SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE)
+
+attributetype ( 1.3.6.1.4.1.10098.1.1.12.37 NAME 'gosaVacationStop'
+        DESC 'Timestamp for switching off current vacation message'
+        EQUALITY caseIgnoreMatch
+        SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE)
+
 attributetype ( 1.3.6.1.4.1.10098.1.1.6.2 NAME 'academicTitle'
         DESC 'Field to represent the academic title'
        EQUALITY caseIgnoreMatch
@@ -263,7 +273,7 @@ objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.5 NAME 'gosaMailAccount' SUP top AUXILI
        MUST ( mail $ gosaMailServer $ gosaMailDeliveryMode)
        MAY  ( gosaMailQuota $ gosaMailAlternateAddress $ gosaMailForwardingAddress $
               gosaMailMaxSize $ gosaSpamSortLevel $ gosaSpamMailbox $
-              gosaVacationMessage $ gosaSharedFolderTarget $ acl))
+              gosaVacationMessage $ gosaVacationStart $ gosaVacationStop $ gosaSharedFolderTarget $ acl))
 
 objectclass ( 1.3.6.1.4.1.10098.1.2.1.19.6 NAME 'gosaAccount' SUP top AUXILIARY
         DESC 'Objectclass for GOsa Accounts (v2.4)'