Merge remote-tracking branch 'origin/develop' into importexport

This commit is contained in:
Roland Gruber 2018-10-06 10:53:39 +02:00
commit 1247e1f22b
21 changed files with 18522 additions and 17846 deletions

View File

@ -1,11 +1,11 @@
ldap-account-manager (6.5.DEV-1) unstable; urgency=medium ldap-account-manager (6.5-1) unstable; urgency=medium
* new upstream release * new upstream release
* Fix "Embedded code copies" by adding dependency to phpseclib * Fix "Embedded code copies" by adding dependency to phpseclib
(phpLDAPadmin code is customized and cannot be reused) (phpLDAPadmin code is customized and cannot be reused)
(Closes: #781419) (Closes: #781419)
-- Roland Gruber <post@rolandgruber.de> Thu, 28 Jun 2018 13:35:58 +0200 -- Roland Gruber <post@rolandgruber.de> Tue, 25 Sep 2018 17:37:41 +0200
ldap-account-manager (6.4-1) unstable; urgency=medium ldap-account-manager (6.4-1) unstable; urgency=medium

View File

@ -2,7 +2,7 @@ Source: ldap-account-manager
Maintainer: Roland Gruber <post@rolandgruber.de> Maintainer: Roland Gruber <post@rolandgruber.de>
Section: web Section: web
Priority: optional Priority: optional
Standards-Version: 4.1.4 Standards-Version: 4.2.1
Build-Depends: debhelper (>= 9), po-debconf, cleancss, closure-compiler Build-Depends: debhelper (>= 9), po-debconf, cleancss, closure-compiler
Homepage: https://www.ldap-account-manager.org/ Homepage: https://www.ldap-account-manager.org/

View File

@ -12,7 +12,9 @@ db_version 2.0 || [ $? -lt 30 ]
# 3rd party libs # 3rd party libs
phpThirdPartyLibs='phpseclib tcpdf' phpThirdPartyLibs='phpseclib tcpdf'
for phpThirdPartyLib in $phpThirdPartyLibs; do for phpThirdPartyLib in $phpThirdPartyLibs; do
if [ ! -L /usr/share/ldap-account-manager/lib/3rdParty/${phpThirdPartyLib} ] ; then
ln -s /usr/share/php/${phpThirdPartyLib} /usr/share/ldap-account-manager/lib/3rdParty/${phpThirdPartyLib} ln -s /usr/share/php/${phpThirdPartyLib} /usr/share/ldap-account-manager/lib/3rdParty/${phpThirdPartyLib}
fi
done done
cd /usr/share/ldap-account-manager/config-samples/profiles cd /usr/share/ldap-account-manager/config-samples/profiles

View File

@ -49,6 +49,15 @@ if [ -f /usr/share/debconf/confmodule ]; then
done done
fi fi
# 3rd party libs
phpThirdPartyLibs='phpseclib tcpdf'
for phpThirdPartyLib in $phpThirdPartyLibs; do
if [ -L /usr/share/ldap-account-manager/lib/3rdParty/${phpThirdPartyLib} ] ; then
rm /usr/share/ldap-account-manager/lib/3rdParty/${phpThirdPartyLib}
fi
done
set -e set -e
if [ "$1" = "purge" ]; then if [ "$1" = "purge" ]; then
rm -r -f /usr/share/ldap-account-manager rm -r -f /usr/share/ldap-account-manager

View File

@ -1,4 +1,4 @@
September 2018 6.5 25.09.2018 6.5
- Password change possible via LDAP EXOP operation (set LDAP_EXOP as password hash, requires PHP 7.2) - Password change possible via LDAP EXOP operation (set LDAP_EXOP as password hash, requires PHP 7.2)
- Support Imagick and GD - Support Imagick and GD
- Dropped support for Apache 2.2 - Dropped support for Apache 2.2
@ -6,7 +6,7 @@ September 2018 6.5
- Personal: photos can be printed in PDF export - Personal: photos can be printed in PDF export
- Kolab updates - Kolab updates
- LAM Pro: - LAM Pro:
-> Auto deletion of entries with dynamic directory services support (requires PHP 7.2). -> Auto deletion of entries with dynamic directory services support (requires PHP 7.2)
- Fixed bugs: - Fixed bugs:
-> Issue when changing key case of uid (#197) -> Issue when changing key case of uid (#197)

View File

@ -1 +1 @@
6.5.DEV 6.5

View File

@ -574,6 +574,12 @@
version. Unless explicitly noticed there is no need to install an version. Unless explicitly noticed there is no need to install an
intermediate release.</para> intermediate release.</para>
<section>
<title>6.4 -&gt; 6.5</title>
<para>No actions required.</para>
</section>
<section> <section>
<title>6.3 -&gt; 6.4</title> <title>6.3 -&gt; 6.4</title>

View File

@ -1384,7 +1384,7 @@ function getExtendedLDAPErrorMessage($server) {
$ldapMsg = null; $ldapMsg = null;
ldap_get_option($server, LDAP_OPT_ERROR_STRING, $ldapMsg); ldap_get_option($server, LDAP_OPT_ERROR_STRING, $ldapMsg);
if (empty($ldapMsg)) { if (empty($ldapMsg)) {
return null; return ldap_error($server);
} }
return $ldapMsg; return $ldapMsg;
} }

View File

@ -88,20 +88,20 @@ class kolabGroup extends baseModule {
), ),
'kolabAllowSMTPRecipient' => array ( 'kolabAllowSMTPRecipient' => array (
"Headline" => _('Allowed recipients'), 'attr' => 'kolabAllowSMTPRecipient', "Headline" => _('Allowed recipients'), 'attr' => 'kolabAllowSMTPRecipient',
"Text" => _('Describes the allowed or disallowed SMTP recipient addresses for mail sent by this account (e.g. "domain.tld" or "user@domain.tld").') "Text" => _('Describes the allowed or disallowed SMTP recipient addresses for mail sent by this account (e.g. "domain.tld" or "-user@domain.tld").')
), ),
'kolabAllowSMTPRecipientList' => array ( 'kolabAllowSMTPRecipientList' => array (
"Headline" => _('Allowed recipients'), 'attr' => 'kolabAllowSMTPRecipient', "Headline" => _('Allowed recipients'), 'attr' => 'kolabAllowSMTPRecipient',
"Text" => _('Describes the allowed or disallowed SMTP recipient addresses for mail sent by this account (e.g. "domain.tld" or "user@domain.tld").') "Text" => _('Describes the allowed or disallowed SMTP recipient addresses for mail sent by this account (e.g. "domain.tld" or "-user@domain.tld").')
. ' ' . _("Multiple values are separated by semicolon.") . ' ' . _("Multiple values are separated by semicolon.")
), ),
'kolabAllowSMTPSender' => array ( 'kolabAllowSMTPSender' => array (
"Headline" => _('Allowed senders'), 'attr' => 'kolabAllowSMTPSender', "Headline" => _('Allowed senders'), 'attr' => 'kolabAllowSMTPSender',
"Text" => _('Describes the allowed or disallowed SMTP addresses sending mail to this account (e.g. "domain.tld" or "user@domain.tld").') "Text" => _('Describes the allowed or disallowed SMTP addresses sending mail to this account (e.g. "domain.tld" or "-user@domain.tld").')
), ),
'kolabAllowSMTPSenderList' => array ( 'kolabAllowSMTPSenderList' => array (
"Headline" => _('Allowed senders'), 'attr' => 'kolabAllowSMTPSender', "Headline" => _('Allowed senders'), 'attr' => 'kolabAllowSMTPSender',
"Text" => _('Describes the allowed or disallowed SMTP addresses sending mail to this account (e.g. "domain.tld" or "user@domain.tld").') "Text" => _('Describes the allowed or disallowed SMTP addresses sending mail to this account (e.g. "domain.tld" or "-user@domain.tld").')
. ' ' . _("Multiple values are separated by semicolon.") . ' ' . _("Multiple values are separated by semicolon.")
), ),
'autoAdd' => array( 'autoAdd' => array(

View File

@ -96,20 +96,20 @@ class kolabSharedFolder extends baseModule {
), ),
'kolabAllowSMTPRecipient' => array ( 'kolabAllowSMTPRecipient' => array (
"Headline" => _('Allowed recipients'), 'attr' => 'kolabAllowSMTPRecipient', "Headline" => _('Allowed recipients'), 'attr' => 'kolabAllowSMTPRecipient',
"Text" => _('Describes the allowed or disallowed SMTP recipient addresses for mail sent by this account (e.g. "domain.tld" or "user@domain.tld").') "Text" => _('Describes the allowed or disallowed SMTP recipient addresses for mail sent by this account (e.g. "domain.tld" or "-user@domain.tld").')
), ),
'kolabAllowSMTPRecipientList' => array ( 'kolabAllowSMTPRecipientList' => array (
"Headline" => _('Allowed recipients'), 'attr' => 'kolabAllowSMTPRecipient', "Headline" => _('Allowed recipients'), 'attr' => 'kolabAllowSMTPRecipient',
"Text" => _('Describes the allowed or disallowed SMTP recipient addresses for mail sent by this account (e.g. "domain.tld" or "user@domain.tld").') "Text" => _('Describes the allowed or disallowed SMTP recipient addresses for mail sent by this account (e.g. "domain.tld" or "-user@domain.tld").')
. ' ' . _("Multiple values are separated by semicolon.") . ' ' . _("Multiple values are separated by semicolon.")
), ),
'kolabAllowSMTPSender' => array ( 'kolabAllowSMTPSender' => array (
"Headline" => _('Allowed senders'), 'attr' => 'kolabAllowSMTPSender', "Headline" => _('Allowed senders'), 'attr' => 'kolabAllowSMTPSender',
"Text" => _('Describes the allowed or disallowed SMTP addresses sending mail to this account (e.g. "domain.tld" or "user@domain.tld").') "Text" => _('Describes the allowed or disallowed SMTP addresses sending mail to this account (e.g. "domain.tld" or "-user@domain.tld").')
), ),
'kolabAllowSMTPSenderList' => array ( 'kolabAllowSMTPSenderList' => array (
"Headline" => _('Allowed senders'), 'attr' => 'kolabAllowSMTPSender', "Headline" => _('Allowed senders'), 'attr' => 'kolabAllowSMTPSender',
"Text" => _('Describes the allowed or disallowed SMTP addresses sending mail to this account (e.g. "domain.tld" or "user@domain.tld").') "Text" => _('Describes the allowed or disallowed SMTP addresses sending mail to this account (e.g. "domain.tld" or "-user@domain.tld").')
. ' ' . _("Multiple values are separated by semicolon.") . ' ' . _("Multiple values are separated by semicolon.")
), ),
'delegate' => array( 'delegate' => array(

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -453,7 +453,7 @@ function display_LoginPage($licenseValidator, $error_message) {
<br><br> <br><br>
<?PHP <?PHP
if (isLAMProVersion() && $licenseValidator->isExpiringSoon()) { if (isLAMProVersion() && $licenseValidator->isExpiringSoon()) {
$licenseMessage = sprintf(_('Your licence expires on %s. You need to purchase a new license to be able to use LAM Pro after this date.'), $licenseValidator->getLicense()->getExpirationDate()->format('Y-m-d')); $licenseMessage = sprintf(_('Your licence expires on %s. You need to purchase a new licence to be able to use LAM Pro after this date.'), $licenseValidator->getLicense()->getExpirationDate()->format('Y-m-d'));
StatusMessage('WARN', $licenseMessage); StatusMessage('WARN', $licenseMessage);
} }
?> ?>