From e92686b275ddbdbf54d2770315a4278d3c04d0cc Mon Sep 17 00:00:00 2001 From: cajus Date: Mon, 7 Apr 2008 15:08:08 +0000 Subject: [PATCH] Next roll of changes. Splitting plugins from core. git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@10250 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-core/contrib/{scripts => }/desktoprc | 0 gosa-core/contrib/{scripts => }/gosa | 0 gosa-core/contrib/{scripts => }/gosa.1 | 0 .../contrib/openxchange/README.openxchange | 437 ------------------ .../contrib/patches/imap-2001a-quota.patch | 20 - .../contrib/patches/php4-imap-getacl.patch | 97 ---- gosa-core/debian/gosa-desktop.install | 4 +- gosa-core/debian/rules | 2 +- .../mail/contrib}/goAgent.pl | 0 .../contrib}/sieve_vacation/IMAP/Sieve.pm | 0 .../sieve_vacation/update-vacation.pl | 0 .../README => gosa-plugins/squid/README.squid | 0 .../squid/contrib}/goQuota.pl | 0 .../squid/contrib}/goQuotaView.pl | 0 .../squid/contrib}/goSquid.pl | 0 .../squid/contrib}/mkHash.pl | 0 16 files changed, 3 insertions(+), 557 deletions(-) rename gosa-core/contrib/{scripts => }/desktoprc (100%) rename gosa-core/contrib/{scripts => }/gosa (100%) rename gosa-core/contrib/{scripts => }/gosa.1 (100%) delete mode 100644 gosa-core/contrib/openxchange/README.openxchange delete mode 100644 gosa-core/contrib/patches/imap-2001a-quota.patch delete mode 100644 gosa-core/contrib/patches/php4-imap-getacl.patch rename {gosa-core/contrib/scripts => gosa-plugins/mail/contrib}/goAgent.pl (100%) rename {gosa-core/contrib/scripts => gosa-plugins/mail/contrib}/sieve_vacation/IMAP/Sieve.pm (100%) rename {gosa-core/contrib/scripts => gosa-plugins/mail/contrib}/sieve_vacation/update-vacation.pl (100%) rename gosa-core/contrib/scripts/README => gosa-plugins/squid/README.squid (100%) rename {gosa-core/contrib/scripts => gosa-plugins/squid/contrib}/goQuota.pl (100%) rename {gosa-core/contrib/scripts => gosa-plugins/squid/contrib}/goQuotaView.pl (100%) rename {gosa-core/contrib/scripts => gosa-plugins/squid/contrib}/goSquid.pl (100%) rename {gosa-core/contrib/scripts => gosa-plugins/squid/contrib}/mkHash.pl (100%) diff --git a/gosa-core/contrib/scripts/desktoprc b/gosa-core/contrib/desktoprc similarity index 100% rename from gosa-core/contrib/scripts/desktoprc rename to gosa-core/contrib/desktoprc diff --git a/gosa-core/contrib/scripts/gosa b/gosa-core/contrib/gosa similarity index 100% rename from gosa-core/contrib/scripts/gosa rename to gosa-core/contrib/gosa diff --git a/gosa-core/contrib/scripts/gosa.1 b/gosa-core/contrib/gosa.1 similarity index 100% rename from gosa-core/contrib/scripts/gosa.1 rename to gosa-core/contrib/gosa.1 diff --git a/gosa-core/contrib/openxchange/README.openxchange b/gosa-core/contrib/openxchange/README.openxchange deleted file mode 100644 index 52effd84e..000000000 --- a/gosa-core/contrib/openxchange/README.openxchange +++ /dev/null @@ -1,437 +0,0 @@ -### Small tutorial for use GOsa with open-xchange ### - -Once installed open-xchange (http://www.open-xchange.org) and php4-pgsql -module we must do some changes to get open-xchange running with GOsa. - -- php.ini must have extension=pg_sql.so - -- The webserver must have access to the Postgresql server. - -- In the connectivity section of gosa.conf must have something like this: - - - - -We suppose that openxchage is installed in /usr/local/openxchange, -and the base for GOsa ldap tree is dc=example,dc=org - - -- Make changes to admintools.conf (/usr/local/openxchange/etc/admintools.conf): - -OXBASE="dc=example,dc=org" -OX_LEAF="$OXBASE" -# Where are the OX Users -USER_BASEDN="ou=people,$OX_LEAF" -# Where are the OX Groups -GROUP_BASEDN="ou=groups,$OX_LEAF" -# Where are the OX Resources -RESOURCES_BASEDN="ou=Resources,ou=ResourceObjects,ou=OxObjects,$OX_LEAF" -# Where are the OX Resource Groups -RESOURCE_GROUPS_BASEDN="ou=ResourceGroups,ou=ResourceObjects,ou=OxObjects,$OX_LEAF" -# Where is the Global Adressbook -GLOBAL_ADDRESSBOOKDN="o=AddressBook,ou=OxObjects,$OX_LEAF" -# where are the adressbook admins -GLOBAL_ADDRESSBOOK_ADMINSDN="cn=AddressAdmins,ou=OxObjects,$GLOBAL_ADDRESSBOOKDN" - -- Make changes in login.pm (usually in /usr/lib/cgi-bin/login.pm): -my $ldap_userBase = 'ou=Users,ou=OxObjects,'; -to -my $ldap_userBase = 'ou=people,'; - -- Put the Base in ldap.conf (/usr/local/openxchange/etc/groupware/ldap.conf) -BASE dc=example,dc=org - -- If you are using as GOsa dnmode "uid", You must change in ldap.properties -(/usr/local/openxchange/etc/groupware/ldap.properties): - - -com.openexchange.groupware.ldap.OXUserObjectAttributeuserCountryName=userCountry - to -com.openexchange.groupware.ldap.OXUserObjectAttributeuserCountryName=st - -com.openexchange.groupware.ldap.OXUserObjectAttributeimapServerName=imapServer - to -com.openexchange.groupware.ldap.OXUserObjectAttributeimapServerName=gosaMailServer - -com.openexchange.groupware.ldap.OXUserObjectAttributesmtpServerName=smtpServer - to -com.openexchange.groupware.ldap.OXUserObjectAttributesmtpServerName=gosaMailServer - -com.openexchange.groupware.ldap.userBaseDN=ou\u003DUsers,ou\u003DOxObjects -to -com.openexchange.groupware.ldap.userBaseDN=ou\u003Dpeople - - - -- If you are using as GOsa dnmode "cn", the ldap.properties -(/usr/local/openxchange/etc/groupware/ldap.properties) -configuration of open-xchange must be like this: - -com.openexchange.groupware.ldap.inetOrgPersonAttributebusinessCategoryName=businessCategory - -com.openexchange.groupware.ldap.inetOrgPersonAttributecnName=cn - -com.openexchange.groupware.ldap.OXUserObjectAttributeCountryName=c - -com.openexchange.groupware.ldap.inetOrgPersonAttributedescriptionName=description - -com.openexchange.groupware.ldap.inetOrgPersonAttributedisplayNameName=displayName - -com.openexchange.groupware.ldap.inetOrgPersonAttributeemployeeNumberName=employeeNumber - -com.openexchange.groupware.ldap.inetOrgPersonAttributeemployeeTypeName=employeeType - -com.openexchange.groupware.ldap.OXUserObjectAttributecoName=co - -com.openexchange.groupware.ldap.inetOrgPersonAttributehomePhoneName=homePhone - -com.openexchange.groupware.ldap.inetOrgPersonAttributehomePostalAddressName=homePostalAddress - -com.openexchange.groupware.ldap.OXUserObjectAttributeInfoName=info - -com.openexchange.groupware.ldap.inetOrgPersonAttributeinitialsName=initials - -com.openexchange.groupware.ldap.inetOrgPersonAttributeinternationaliSDNNumberName=internationaliSDNNumber - -com.openexchange.groupware.ldap.OXUserObjectAttributeIPPhoneName=IPPhone - -com.openexchange.groupware.ldap.OXUserObjectAttributeotherfacsimiletelephonenumberName=otherfacsimiletelephonenumber - -com.openexchange.groupware.ldap.inetOrgPersonAttributeroomNumberName=roomNumber - -com.openexchange.groupware.ldap.inetOrgPersonAttributetelexNumberName=telexNumber - -com.openexchange.groupware.ldap.inetOrgPersonAttributeuidName=uid - -com.openexchange.groupware.ldap.inetOrgPersonClassName=inetOrgPerson - -com.openexchange.groupware.ldap.OXUserObjectAttributebirthDayName=birthDay - -com.openexchange.groupware.ldap.OXUserObjectAttributeDistributionListName=OXUserDistributionList - -com.openexchange.groupware.ldap.OXUserObjectAttributeAnniversaryName=OXUserAnniversary - -com.openexchange.groupware.ldap.OXUserObjectAttributeBranchesName=OXUserBranches - -com.openexchange.groupware.ldap.OXUserObjectAttributeCategoriesName=OXUserCategories - -com.openexchange.groupware.ldap.OXUserObjectAttributeChildrenName=OXUserChildren - -com.openexchange.groupware.ldap.OXUserObjectAttributeCityName=OXUserCity - -com.openexchange.groupware.ldap.OXUserObjectAttributeCommentName=OXUserComment - -com.openexchange.groupware.ldap.OXUserObjectAttributeComRegName=OXUserComReg - -com.openexchange.groupware.ldap.OXUserObjectAttributeEmail2Name=OXUserEmail2 - -com.openexchange.groupware.ldap.OXUserObjectAttributeEmail3Name=OXUserEmail3 - -com.openexchange.groupware.ldap.OXUserObjectAttributeInstantMessenger2Name=OXUserInstantMessenger2 - -com.openexchange.groupware.ldap.OXUserObjectAttributeInstantMessengerName=OXUserInstantMessenger - -com.openexchange.groupware.ldap.OXUserObjectAttributeMaritalStatusName=OXUserMaritalStatus - -com.openexchange.groupware.ldap.OXUserObjectAttributeNickNameName=OXUserNickName - -com.openexchange.groupware.ldap.OXUserObjectAttributeOtherCityName=OXUserOtherCity - -com.openexchange.groupware.ldap.OXUserObjectAttributeOtherCountryName=OXUserOtherCountry - -com.openexchange.groupware.ldap.OXUserObjectAttributeOtherPostalCodeName=OXUserOtherPostalCode - -com.openexchange.groupware.ldap.OXUserObjectAttributeOtherStateName=OXUserOtherState - -com.openexchange.groupware.ldap.OXUserObjectAttributeOtherStreetName=OXUserOtherStreet - -com.openexchange.groupware.ldap.OXUserObjectAttributePositionName=OXUserPosition - -com.openexchange.groupware.ldap.OXUserObjectAttributePostalCodeName=OXUserPostalCode - -com.openexchange.groupware.ldap.OXUserObjectAttributeProfessionName=OXUserProfession - -com.openexchange.groupware.ldap.OXUserObjectAttributeSalesVolumeName=OXUserSalesVolume - -com.openexchange.groupware.ldap.OXUserObjectAttributeSpouseNameName=OXUserSpouseName - -com.openexchange.groupware.ldap.OXUserObjectAttributeStateName=OXUserState - -com.openexchange.groupware.ldap.OXUserObjectAttributesuffixName=OXUserSuffix - -com.openexchange.groupware.ldap.OXUserObjectAttributeTaxIDName=OXUserTaxID - -com.openexchange.groupware.ldap.OXUserObjectAttributeTeleAssistantName=OXUserTeleAssistant - -com.openexchange.groupware.ldap.OXUserObjectAttributeTeleBusiness2Name=OXUserTeleBusiness2 - -com.openexchange.groupware.ldap.OXUserObjectAttributeTeleCallbackName=OXUserTeleCallback - -com.openexchange.groupware.ldap.OXUserObjectAttributeTeleCarName=OXUserTeleCar - -com.openexchange.groupware.ldap.OXUserObjectAttributeTeleCompanyName=OXUserTeleCompany - -com.openexchange.groupware.ldap.OXUserObjectAttributeTeleFax2Name=OXUserTeleFax2 - -com.openexchange.groupware.ldap.OXUserObjectAttributeTeleHome2Name=OXUserTeleHome2 - -com.openexchange.groupware.ldap.OXUserObjectAttributeTeleMobile2Name=OXUserTeleMobile2 - -com.openexchange.groupware.ldap.OXUserObjectAttributeTeleOtherName=OXUserTeleOther - -com.openexchange.groupware.ldap.OXUserObjectAttributeTelePrimaryName=OXUserTelePrimary - -com.openexchange.groupware.ldap.OXUserObjectAttributeTeleRadioName=OXUserTeleRadio - -com.openexchange.groupware.ldap.OXUserObjectAttributeTeleTTYName=OXUserTeleTTY - -com.openexchange.groupware.ldap.OXUserObjectAttributeurlName=url - -com.openexchange.groupware.ldap.OXUserObjectAttributeUserUndef01Name=OXUserUserUndef01 - -com.openexchange.groupware.ldap.OXUserObjectAttributeUserUndef02Name=OXUserUserUndef02 - -com.openexchange.groupware.ldap.OXUserObjectAttributeUserUndef03Name=OXUserUserUndef03 - -com.openexchange.groupware.ldap.OXUserObjectAttributeUserUndef04Name=OXUserUserUndef04 - -com.openexchange.groupware.ldap.OXUserObjectAttributeUserUndef05Name=OXUserUserUndef05 - -com.openexchange.groupware.ldap.OXUserObjectAttributeUserUndef06Name=OXUserUserUndef06 - -com.openexchange.groupware.ldap.OXUserObjectAttributeUserUndef07Name=OXUserUserUndef07 - -com.openexchange.groupware.ldap.OXUserObjectAttributeUserUndef08Name=OXUserUserUndef08 - -com.openexchange.groupware.ldap.OXUserObjectAttributeUserUndef09Name=OXUserUserUndef09 - -com.openexchange.groupware.ldap.OXUserObjectAttributeUserUndef10Name=OXUserUserUndef10 - -com.openexchange.groupware.ldap.OXUserObjectAttributeUserUndef11Name=OXUserUserUndef11 - -com.openexchange.groupware.ldap.OXUserObjectAttributeUserUndef12Name=OXUserUserUndef12 - -com.openexchange.groupware.ldap.OXUserObjectAttributeUserUndef13Name=OXUserUserUndef13 - -com.openexchange.groupware.ldap.OXUserObjectAttributeUserUndef14Name=OXUserUserUndef14 - -com.openexchange.groupware.ldap.OXUserObjectAttributeUserUndef15Name=OXUserUserUndef15 - -com.openexchange.groupware.ldap.OXUserObjectAttributeUserUndef16Name=OXUserUserUndef16 - -com.openexchange.groupware.ldap.OXUserObjectAttributeUserUndef17Name=OXUserUserUndef17 - -com.openexchange.groupware.ldap.OXUserObjectAttributeUserUndef18Name=OXUserUserUndef18 - -com.openexchange.groupware.ldap.OXUserObjectAttributeUserUndef19Name=OXUserUserUndef19 - -com.openexchange.groupware.ldap.OXUserObjectAttributeUserUndef20Name=OXUserUserUndef20 - -com.openexchange.groupware.ldap.OXUserObjectClassName=OXUserObject - -com.openexchange.groupware.ldap.AllContactUIDSearch=(&(objectClass\u003DinetOrgPerson)(objectClass\u003DOXUserObject)) - -!com.openexchange.groupware.ldap.AllContactUIDSearchScope=1 - -com.openexchange.groupware.ldap.credentialsBaseDN=[credentialsBaseDN] - -com.openexchange.groupware.ldap.credentialsDN=cn\u003D[uid],[userBaseDN],[credentialsBaseDN] - -com.openexchange.groupware.ldap.groupOfNamesAttributememberName=member - -com.openexchange.groupware.ldap.AddressAdminsDN=cn\u003DAddressAdmins,[globalAddressBookBaseDN] - -com.openexchange.groupware.ldap.globalAddressBookBaseDN=o\u003DAddressBook - -com.openexchange.groupware.ldap.GlobalAddressBookEntryDN=cn\u003D[contactid],[globalAddressBookBaseDN] - -com.openexchange.groupware.ldap.InternalUsersForeSureNameUIDPatternSearchFilter=(&(objectClass\u003DinetOrgPerson)(objectClass\u003DOXUserObject)(|(sn\u003D[pattern])(givenname\u003D[pattern])(cn\u003D[pattern]))(mailEnabled\u003Dok)) - -com.openexchange.groupware.ldap.InternalUsersStartingLetterSearchFilter=(&(objectClass\u003DinetOrgPerson)(objectClass\u003DOXUserObject)(sn\u003D[letter]*)(mailEnabled\u003Dok)) - -com.openexchange.groupware.ldap.UserAddressBookEntryDN=cn\u003D[contactid],[UserAddressBookDN] - -com.openexchange.groupware.ldap.localDomainsBaseDN=ou\u003DDNSObjects,ou\u003DAdminObjects - -com.openexchange.groupware.ldap.OXVDomainAttributedomainNameName=domainName - -com.openexchange.groupware.ldap.LocalDomainsSearchFilter=(&(objectClass\u003DOXVDomainObject)(MTALocaldomain\u003Dtrue)) - -com.openexchange.groupware.ldap.OXIMAPFolderAttributefnName=fn - -com.openexchange.groupware.ldap.sharedFolderBaseDN=ou\u003DSharedFolder - -com.openexchange.groupware.ldap.SharedFolderSearchFilter=(&(objectclass\u003DOXIMAPFolderObject)(mailenabled\u003Dok)) - -!com.openexchange.groupware.ldap.sharedFolderSearchScope=1 - -com.openexchange.groupware.ldap.OXResourceGroupAttributeresourceGroupAvailableName=resourceGroupAvailable - -com.openexchange.groupware.ldap.OXResourceGroupAttributeresourceGroupMemberName=resourceGroupMember - -com.openexchange.groupware.ldap.OXResourceGroupAttributeresourceGroupNameName=resourceGroupName - -com.openexchange.groupware.ldap.ResourceGroupDN=resourceGroupName\u003D[group],[resourceGroupBaseDN] - -com.openexchange.groupware.ldap.ResourceGroupPatternSearchFilter=(&(objectclass\u003DOXResourceGroupObject)(resourceGroupName\u003D[pattern])) - -com.openexchange.groupware.ldap.ResourceGroupSearchFilter=(objectclass\u003DOXResourceGroupObject) - -!com.openexchange.groupware.ldap.ResourceGroupSearchScope=1 - -com.openexchange.groupware.ldap.OXResourceAttributeresourceNameName=resourceName - -#Where are the resources? -com.openexchange.groupware.ldap.resourceBaseDN=ou\u003DResources,ou\u003DResourceObjects - -com.openexchange.groupware.ldap.ResourceDN=resourceName\u003D[resource],[resourceBaseDN] - -#Where are the resource groups? -com.openexchange.groupware.ldap.resourceGroupBaseDN=ou\u003DResourceGroups,ou\u003DResourceObjects - -#Searches resources with the a pattern. -com.openexchange.groupware.ldap.ResourcePatternSearchFilter=(&(objectclass\u003DOXResourceObject)(resourceName\u003D[pattern])) - -!com.openexchange.groupware.ldap.ResourceSearchScope=1 - -com.openexchange.groupware.ldap.DNForDefaultMail=cn\u003Dmailadmin,[userBaseDN] - -com.openexchange.groupware.ldap.Factory.AuthenticationSupport=com.openexchange.groupware.ldap.DefaultAuthenticationSupport - -com.openexchange.groupware.ldap.Factory.ContactSupport=com.openexchange.groupware.ldap.DefaultContactSupport - -com.openexchange.groupware.ldap.Factory.MailSupport=com.openexchange.groupware.ldap.DefaultMailSupport - -com.openexchange.groupware.ldap.Factory.ResourcesHandle=com.openexchange.groupware.ldap.DefaultResourcesHandle - -#Class, that implementes UserGroupHandle, ResourcesHandle -com.openexchange.groupware.ldap.Factory.UserGroupHandle=com.openexchange.groupware.ldap.DefaultUserGroupHandle - -#Where to search for groups? -com.openexchange.groupware.ldap.groupBaseDN=ou\u003DGroups - -#Complete dn of a group. -com.openexchange.groupware.ldap.GroupDN=cn\u003D[gid],[groupBaseDN] - -com.openexchange.groupware.ldap.GroupSearchFilter=(objectclass\u003DposixGroup) - -#Searches all groups for the user -com.openexchange.groupware.ldap.GroupsForUserSearchFilter=(&(objectclass\u003DposixGroup)(memberUid\u003D[uid])) - -com.openexchange.groupware.ldap.GroupsPatternSearchFilter=(&(objectclass\u003DposixGroup)(cn\u003D[pattern])) - -!com.openexchange.groupware.ldap.GroupSearchScope=1 - -com.openexchange.groupware.ldap.inetOrgPersonAttributefacsimileName=facsimileTelephoneNumber - -com.openexchange.groupware.ldap.inetOrgPersonAttributegivenNameName=givenName - -com.openexchange.groupware.ldap.inetOrgPersonAttributelabeledURIName=labeledURI - -com.openexchange.groupware.ldap.inetOrgPersonAttributelName=l - -com.openexchange.groupware.ldap.inetOrgPersonAttributemailName=mail - -com.openexchange.groupware.ldap.inetOrgPersonAttributemobileName=mobile - -com.openexchange.groupware.ldap.inetOrgPersonAttributeoName=o - -com.openexchange.groupware.ldap.inetOrgPersonAttributeouName=ou - -com.openexchange.groupware.ldap.inetOrgPersonAttributepagerName=pager - -com.openexchange.groupware.ldap.inetOrgPersonAttributepostalCodeName=postalCode - -com.openexchange.groupware.ldap.inetOrgPersonAttributepreferredLanguageName=preferredLanguage - -com.openexchange.groupware.ldap.inetOrgPersonAttributesnName=sn - -com.openexchange.groupware.ldap.inetOrgPersonAttributestName=st - -com.openexchange.groupware.ldap.inetOrgPersonAttributestreetName=street - -com.openexchange.groupware.ldap.inetOrgPersonAttributetelephoneNumberName=telephoneNumber - -com.openexchange.groupware.ldap.inetOrgPersonAttributetitleName=title - -com.openexchange.groupware.ldap.OXUserObjectAttributealiasName=alias - -com.openexchange.groupware.ldap.OXUserObjectAttributeappointmentDaysName=OXAppointmentDays - -com.openexchange.groupware.ldap.OXUserObjectAttributeimapServerName=gosaMailServer - -com.openexchange.groupware.ldap.OXUserObjectAttributemailDomainName=mailDomain - -com.openexchange.groupware.ldap.OXUserObjectAttributesmtpServerName=gosaMailServer - -com.openexchange.groupware.ldap.OXUserObjectAttributetaskDaysName=OXTaskDays - -com.openexchange.groupware.ldap.OXUserObjectAttributetimeZoneName=OXTimeZone - -com.openexchange.groupware.ldap.OXUserObjectAttributeuserCountryName=st - -com.openexchange.groupware.ldap.OXUserObjectAttributevaddressName=vaddress - -com.openexchange.groupware.ldap.posixAccountAttributecnName=cn - -com.openexchange.groupware.ldap.posixAccountAttributeuidName=uid - -com.openexchange.groupware.ldap.posixGroupAttributecnName=cn - -com.openexchange.groupware.ldap.posixGroupAttributememberUidName=memberUid - -com.openexchange.groupware.ldap.UserAddressBookDN=ou\u003Daddr,cn\u003D[uid],[userBaseDN] - -com.openexchange.groupware.ldap.UserAttributeOpenLDAPaciName=OpenLDAPaci - -com.openexchange.groupware.ldap.userBaseDN=ou\u003Dpeople - -#DN to the user object -com.openexchange.groupware.ldap.UserDN=cn\u003D[uid],[userBaseDN] - -com.openexchange.groupware.ldap.UsersCNPatternSearchFilter=(&(objectclass\u003DposixAccount)(objectClass\u003DinetOrgPerson)(|(cn\u003D[pattern])(givenName\u003D[pattern])(cn\u003D[pattern]))) - -com.openexchange.groupware.ldap.UserSearchFilter=(&(cn\u003D[uid])(objectClass\u003DOXUserObject)) - -!com.openexchange.groupware.ldap.UserSearchScope=1 - -com.openexchange.groupware.ldap.UsersForeSureNamePatternSearchFilter=(&(objectclass\u003DposixAccount)(|(givenName\u003D[pattern])(sn\u003D[pattern]))) - -com.openexchange.groupware.ldap.UsersForeSureNameUIDPatternSearchFilter=(&(objectclass\u003DposixAccount)(objectClass\u003DinetOrgPerson)(|(givenName\u003D[pattern])(sn\u003D[pattern])(cn\u003D[pattern]))) - -com.openexchange.groupware.ldap.UsersPatternSearchFilter=(&(objectclass\u003DposixAccount)(cn\u003D[pattern])) - -#Define the objectClasses an user object should belong to if you are performing pattern searches. -com.openexchange.groupware.ldap.UsersPatternSearchObjectClasses=posixAccount,inetOrgPerson,OXUserObject - -com.openexchange.groupware.ldap.GlobalAddressBookSearchScope=1 - -com.openexchange.groupware.ldap.inetOrgPersonAttributejpegPhotoName=jpegPhoto - -com.openexchange.groupware.ldap.OXUserObjectAttributeDayViewEndTimeName=OXDayViewEndTime - -com.openexchange.groupware.ldap.OXUserObjectAttributeDayViewStartTimeName=OXDayViewStartTime - -com.openexchange.groupware.ldap.OXUserObjectAttributeDayViewIntervalName=OXDayViewInterval - -!com.openexchange.groupware.ldap.LocalDomainsSearchScope=1 - - - - - - -This configuration is based in documentation gets from -http://www.open-xchange.org/oxwiki/ - -TODO: -- more testing -- check cn configuration -- check addressbook -- subtree support - diff --git a/gosa-core/contrib/patches/imap-2001a-quota.patch b/gosa-core/contrib/patches/imap-2001a-quota.patch deleted file mode 100644 index 304488d2d..000000000 --- a/gosa-core/contrib/patches/imap-2001a-quota.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -Naur imap-2001a/src/c-client/imap4r1.c imap-2001a.patched/src/c-client/imap4r1.c ---- imap-2001a/src/c-client/imap4r1.c Wed Nov 14 23:50:55 2001 -+++ imap-2001a.patched/src/c-client/imap4r1.c Wed May 21 09:54:35 2003 -@@ -2358,10 +2358,12 @@ - do { /* for each list item */ - *s++ = c; /* write prefix character */ - if (list) { /* sigh, QUOTA has bizarre syntax! */ -- for (t = (char *) list->text.data; *t; *s++ = *t++); -- sprintf (s," %lu",list->text.size); -- s += strlen (s); -- c = ' '; /* prefix character for subsequent strings */ -+ if (list->text.size != 0){ -+ for (t = (char *) list->text.data; *t; *s++ = *t++); -+ sprintf (s," %lu",list->text.size); -+ s += strlen (s); -+ c = ' '; /* prefix character for subsequent strings */ -+ } - } - } - while (list = list->next); diff --git a/gosa-core/contrib/patches/php4-imap-getacl.patch b/gosa-core/contrib/patches/php4-imap-getacl.patch deleted file mode 100644 index ae3a23595..000000000 --- a/gosa-core/contrib/patches/php4-imap-getacl.patch +++ /dev/null @@ -1,97 +0,0 @@ ---- php-imap-4.3.9/php_imap.c.fix 2004-08-06 15:04:17 +0400 -+++ php-imap-4.3.9/php_imap.c 2004-08-06 15:11:43 +0400 -@@ -138,6 +138,7 @@ function_entry imap_functions[] = { - PHP_FE(imap_get_quotaroot, NULL) - PHP_FE(imap_set_quota, NULL) - PHP_FE(imap_setacl, NULL) -+ PHP_FE(imap_getacl, NULL) - #endif - - PHP_FE(imap_mail, NULL) -@@ -377,6 +378,22 @@ void mail_getquota(MAILSTREAM *stream, c - /* }}} */ - #endif - -+/* {{{ mail_getquota -+ * -+ * Mail GET_ACL callback -+ * Called via the mail_parameter function in c-client:src/c-client/mail.c -+ */ -+void mail_getacl(MAILSTREAM *stream, char *mailbox, ACLLIST *alist) -+{ -+ TSRMLS_FETCH(); -+ -+ /* walk through the ACLLIST */ -+ for (; alist; alist = alist->next) -+ { -+ add_assoc_stringl(IMAPG(imap_acl_list), alist->identifier, alist->rights, strlen(alist->rights), 1); -+ } -+} -+/* }}} */ - - /* {{{ php_imap_init_globals - */ -@@ -402,6 +419,7 @@ static void php_imap_init_globals(zend_i - imap_globals->folderlist_style = FLIST_ARRAY; - #if defined(HAVE_IMAP2000) || defined(HAVE_IMAP2001) - imap_globals->quota_return = NULL; -+ imap_globals->imap_acl_list = NIL; - #endif - } - /* }}} */ -@@ -985,6 +1003,37 @@ PHP_FUNCTION(imap_setacl) - } - /* }}} */ - -+/* {{{ proto array imap_get_quota(int stream_id, string mailbox) -+ Gets the ACL for a given mailbox */ -+PHP_FUNCTION(imap_getacl) -+{ -+ zval **streamind, **mailbox; -+ pils *imap_le_struct; -+ -+ if (ZEND_NUM_ARGS() != 2 || zend_get_parameters_ex(2, &streamind, &mailbox) == FAILURE) { -+ ZEND_WRONG_PARAM_COUNT(); -+ } -+ -+ ZEND_FETCH_RESOURCE(imap_le_struct, pils *, streamind, -1, "imap", le_imap); -+ -+ convert_to_string_ex(mailbox); -+ -+ /* initializing the special array for the return values */ -+ array_init(return_value); -+ -+ IMAPG(imap_acl_list) = return_value; -+ -+ /* set the callback for the GET_ACL function */ -+ mail_parameters(NIL, SET_ACL, (void *) mail_getacl); -+ if(!imap_getacl(imap_le_struct->imap_stream, Z_STRVAL_PP(mailbox))) { -+ php_error(E_WARNING, "c-client imap_getacl failed"); -+ RETURN_FALSE; -+ } -+ -+ IMAPG(imap_acl_list) = NIL; -+} -+/* }}} */ -+ - #endif /* HAVE_IMAP2000 || HAVE_IMAP2001 */ - - ---- php-imap-4.3.9/php_imap.h.fix 2004-08-06 15:09:33 +0400 -+++ php-imap-4.3.9/php_imap.h 2004-08-06 15:10:42 +0400 -@@ -172,6 +172,7 @@ PHP_FUNCTION(imap_get_quota); - PHP_FUNCTION(imap_get_quotaroot); - PHP_FUNCTION(imap_set_quota); - PHP_FUNCTION(imap_setacl); -+PHP_FUNCTION(imap_getacl); - #endif - - -@@ -202,6 +203,7 @@ ZEND_BEGIN_MODULE_GLOBALS(imap) - unsigned long status_uidvalidity; - #if defined(HAVE_IMAP2000) || defined(HAVE_IMAP2001) - zval **quota_return; -+ pval *imap_acl_list; - #endif - ZEND_END_MODULE_GLOBALS(imap) - diff --git a/gosa-core/debian/gosa-desktop.install b/gosa-core/debian/gosa-desktop.install index 831d7b1d5..0be551155 100644 --- a/gosa-core/debian/gosa-desktop.install +++ b/gosa-core/debian/gosa-desktop.install @@ -1,5 +1,5 @@ -contrib/scripts/desktoprc /etc/gosa -contrib/scripts/gosa /usr/bin +contrib/desktoprc /etc/gosa +contrib/gosa /usr/bin debian/gosa.xpm /usr/share/pixmaps debian/gosa-16.xpm /usr/share/pixmaps debian/gosa-desktop.desktop /usr/share/applications diff --git a/gosa-core/debian/rules b/gosa-core/debian/rules index f4d88bf3f..994412dbb 100755 --- a/gosa-core/debian/rules +++ b/gosa-core/debian/rules @@ -61,7 +61,7 @@ binary-common: dh_installexamples dh_installmenu dh_installdebconf - dh_installman -pgosa-desktop contrib/scripts/gosa.1 + dh_installman -pgosa-desktop contrib/gosa.1 dh_link dh_strip dh_compress diff --git a/gosa-core/contrib/scripts/goAgent.pl b/gosa-plugins/mail/contrib/goAgent.pl similarity index 100% rename from gosa-core/contrib/scripts/goAgent.pl rename to gosa-plugins/mail/contrib/goAgent.pl diff --git a/gosa-core/contrib/scripts/sieve_vacation/IMAP/Sieve.pm b/gosa-plugins/mail/contrib/sieve_vacation/IMAP/Sieve.pm similarity index 100% rename from gosa-core/contrib/scripts/sieve_vacation/IMAP/Sieve.pm rename to gosa-plugins/mail/contrib/sieve_vacation/IMAP/Sieve.pm diff --git a/gosa-core/contrib/scripts/sieve_vacation/update-vacation.pl b/gosa-plugins/mail/contrib/sieve_vacation/update-vacation.pl similarity index 100% rename from gosa-core/contrib/scripts/sieve_vacation/update-vacation.pl rename to gosa-plugins/mail/contrib/sieve_vacation/update-vacation.pl diff --git a/gosa-core/contrib/scripts/README b/gosa-plugins/squid/README.squid similarity index 100% rename from gosa-core/contrib/scripts/README rename to gosa-plugins/squid/README.squid diff --git a/gosa-core/contrib/scripts/goQuota.pl b/gosa-plugins/squid/contrib/goQuota.pl similarity index 100% rename from gosa-core/contrib/scripts/goQuota.pl rename to gosa-plugins/squid/contrib/goQuota.pl diff --git a/gosa-core/contrib/scripts/goQuotaView.pl b/gosa-plugins/squid/contrib/goQuotaView.pl similarity index 100% rename from gosa-core/contrib/scripts/goQuotaView.pl rename to gosa-plugins/squid/contrib/goQuotaView.pl diff --git a/gosa-core/contrib/scripts/goSquid.pl b/gosa-plugins/squid/contrib/goSquid.pl similarity index 100% rename from gosa-core/contrib/scripts/goSquid.pl rename to gosa-plugins/squid/contrib/goSquid.pl diff --git a/gosa-core/contrib/scripts/mkHash.pl b/gosa-plugins/squid/contrib/mkHash.pl similarity index 100% rename from gosa-core/contrib/scripts/mkHash.pl rename to gosa-plugins/squid/contrib/mkHash.pl -- 2.30.2