Merge branch 'develop' into configImportExport

# Conflicts:
#	lam/VERSION

lam-packaging/debian/changelog

@@ -1,8 +1,8 @@
-ldap-account-manager (7.2.RC1-1) unstable; urgency=medium
+ldap-account-manager (7.2-1) unstable; urgency=medium
 
   * new upstream release
 
- -- Roland Gruber <post@rolandgruber.de>  Wed, 22 Apr 2020 20:12:31 +0200
+ -- Roland Gruber <post@rolandgruber.de>  Fri, 01 May 2020 08:04:56 +0200
 
 ldap-account-manager (7.1-1) unstable; urgency=medium
 

lam-packaging/debian/control

@@ -17,6 +17,7 @@ Depends: php (>= 7), php-ldap,
  apache2 (>= 2.4.0) | httpd, fonts-dejavu, debconf (>= 0.2.26) | debconf-2.0, ${misc:Depends}
 Recommends: php-opcache
 Suggests: ldap-server, php-mcrypt, ldap-account-manager-lamdaemon, perl
+Conflicts: libapache2-mod-php5, php5, php5-fpm
 Description: webfrontend for managing accounts in an LDAP directory
  LDAP Account Manager (LAM) runs on an existing webserver.
  It manages user, group and host accounts. Currently LAM

lam-packaging/docker/Dockerfile

@@ -29,7 +29,7 @@
 FROM debian:buster-slim
 LABEL maintainer="Roland Gruber <post@rolandgruber.de>"
 
-ARG LAM_RELEASE=7.2.RC1
+ARG LAM_RELEASE=7.2
 EXPOSE 80
 
 ENV \
@@ -37,7 +37,32 @@ ENV \
     DEBUG=''
 
 RUN apt-get update && \
-    apt-get install --no-install-recommends -y \
+    apt-get upgrade -y
+
+# install locales
+RUN apt-get install -y locales
+RUN sed -i 's/^# *\(ca_ES.UTF-8\)/\1/' /etc/locale.gen && \
+        sed -i 's/^# *\(cz_CZ.UTF-8\)/\1/' /etc/locale.gen && \
+        sed -i 's/^# *\(de_DE.UTF-8\)/\1/' /etc/locale.gen && \
+        sed -i 's/^# *\(en_GB.UTF-8\)/\1/' /etc/locale.gen && \
+        sed -i 's/^# *\(en_US.UTF-8\)/\1/' /etc/locale.gen && \
+        sed -i 's/^# *\(es_ES.UTF-8\)/\1/' /etc/locale.gen && \
+        sed -i 's/^# *\(fr_FR.UTF-8\)/\1/' /etc/locale.gen && \
+        sed -i 's/^# *\(it_IT.UTF-8\)/\1/' /etc/locale.gen && \
+        sed -i 's/^# *\(hu_HU.UTF-8\)/\1/' /etc/locale.gen && \
+        sed -i 's/^# *\(nl_NL.UTF-8\)/\1/' /etc/locale.gen && \
+        sed -i 's/^# *\(pl_PL.UTF-8\)/\1/' /etc/locale.gen && \
+        sed -i 's/^# *\(pt_BR.UTF-8\)/\1/' /etc/locale.gen && \
+        sed -i 's/^# *\(ru_RU.UTF-8\)/\1/' /etc/locale.gen && \
+        sed -i 's/^# *\(sk_SK.UTF-8\)/\1/' /etc/locale.gen && \
+        sed -i 's/^# *\(tr_TR.UTF-8\)/\1/' /etc/locale.gen && \
+        sed -i 's/^# *\(uk_UA.UTF-8\)/\1/' /etc/locale.gen && \
+        sed -i 's/^# *\(ja_JP.UTF-8\)/\1/' /etc/locale.gen && \
+        sed -i 's/^# *\(zh_TW.UTF-8\)/\1/' /etc/locale.gen && \
+        sed -i 's/^# *\(zh_CN.UTF-8\)/\1/' /etc/locale.gen && \
+        locale-gen
+
+RUN apt-get install --no-install-recommends -y \
         apache2 \
         ca-certificates \
         dumb-init \

lam-packaging/docker/docker-compose.yml

@@ -4,7 +4,7 @@ services:
     build:
       context: .
       args:
-       - LAM_RELEASE=7.2.RC1
+       - LAM_RELEASE=7.2
     image: ldapaccountmanager/lam:latest
     restart: unless-stopped
     ports:

lam/HISTORY

@@ -1,4 +1,4 @@
-June 2020 7.2
+01.05.2020 7.2
   - Unix: allow to create group with same name during user creation
   - LAM Pro:
    -> EMail sending can be done via SMTP without local mail server
@@ -6,6 +6,7 @@ June 2020 7.2
   - Fixed bugs:
    -> Captcha don't show anymore in Self Service login page (213)
    -> Unix memberships cannot be changed. This issue can also affect other membership relations.
+   -> Missing locales on Docker image
 
 
 17.03.2020 7.1

lam/VERSION

@@ -1 +1 @@
-7.2.DEV
+7.3.DEV

lam/docs/manual-sources/appendix-security.xml

@@ -257,7 +257,7 @@ semodule -i httpdlocal.pp</programlisting>
 
         <listitem>
           <para>directory contents must be accessible by browser but directory
-          itself needs not to be browseable</para>
+          itself needs not to be browsable</para>
         </listitem>
       </itemizedlist>
     </section>

lam/docs/manual-sources/chapter-modules.xml

@@ -2283,7 +2283,7 @@ AuthorizedKeysCommandUser root</literallayout>
       security reasons.</para>
 
       <para>The user name can either be a fixed name (e.g. "admin") or it can
-      be generated with LDAP attributes of the LAM admn user. E.g. $uid$ will
+      be generated with LDAP attributes of the LAM admin user. E.g. $uid$ will
       be transformed to "myUser" if you login with
       "uid=myUser,ou=people,dc=example,dc=com".</para>
 
@@ -5840,7 +5840,7 @@ OK (10 msec)</programlisting>
     <para>LAM Pro allows you to execute scripts whenever an account is
     created, modified or deleted. This can be useful to automate processes
     which needed manual work afterwards (e.g. sending your user a welcome mail
-    or register a mailbox). Additionally, you can specify manual scipts that
+    or register a mailbox). Additionally, you can specify manual scripts that
     can be executed from within LAM Pro.</para>
 
     <para>To activate this feature please add the "Custom scripts" module to

lam/docs/manual-sources/chapter-selfService.xml

@@ -1153,7 +1153,7 @@
       <para>To enable this feature please activate the checkbox "Enable
       password self reset link".</para>
 
-      <para><emphasis role="bold">Hint:</emphasis> Plese note that LAM Pro
+      <para><emphasis role="bold">Hint:</emphasis> Please note that LAM Pro
       uses security questions by default. Activate confirmation mails and then
       deactivate security questions if you want to use only email
       validation.</para>

lam/lib/baseModule.inc

@@ -1026,7 +1026,7 @@ abstract class baseModule {
 	 * <li><b>Text (required)</b><br>
 	 * The text of the help entry which may contain any alphanumeric characters.</li>
 	 * <li><b>SeeAlso (optional)</b><br>
-	 * A reference to anonther related web site. It must be an array containing a field called "text" with the link text
+	 * A reference to another related web site. It must be an array containing a field called "text" with the link text
 	 * that should be displayed and a field called "link" which is the link target.</li>
 	 * </ul>
 	 * <br>

lam/lib/import.inc

@@ -63,11 +63,12 @@ class Importer {
 		$entries = array();
 		$currentEntry = array();
 		foreach ($lines as $line) {
-			if (substr(trim($line), 0, 1) === '#') {
+			$trimmedLine = trim($line);
+			if (substr($trimmedLine, 0, 1) === '#') {
 				// skip comments
 				continue;
 			}
-			if (empty(trim($line))) {
+			if (empty($trimmedLine)) {
 				// end of entry
 				if (!empty($currentEntry)) {
 					$entries[] = $currentEntry;

lam/lib/types/user.inc

@@ -110,7 +110,7 @@ class user extends baseType {
 				'ou' => _('Organisational unit'),
 				'proxyAddresses' => _('Proxy-Addresses'),
 				'sambakickofftime' => _('Account expiration date'),
-				'shadowexpire' => _('Password expiration'),
+				'shadowexpire' => _('Account expiration date'),
 				"sn" => _("Last name"),
 				'streetAddress' => _('Street'),
 				'telephoneNumber' => _('Telephone number'),