Merge branch 'develop' into phpMailer

# Conflicts:
#	lam/HISTORY

lam-packaging/debian/changelog

@@ -1,8 +1,8 @@
-ldap-account-manager (7.1.RC1-1) unstable; urgency=medium
+ldap-account-manager (7.1-1) unstable; urgency=medium
 
   * new upstream release
 
- -- Roland Gruber <post@rolandgruber.de>  Tue, 18 Feb 2020 18:01:11 +0100
+ -- Roland Gruber <post@rolandgruber.de>  Mon, 16 Mar 2020 21:24:23 +0100
 
 ldap-account-manager (7.0-1) unstable; urgency=medium
 

lam-packaging/docker/Dockerfile

@@ -29,7 +29,7 @@
 FROM debian:buster-slim
 LABEL maintainer="Roland Gruber <post@rolandgruber.de>"
 
-ARG LAM_RELEASE=7.1.RC1
+ARG LAM_RELEASE=7.1
 EXPOSE 80
 
 ENV \

lam-packaging/docker/docker-compose.yml

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

lam/HISTORY

@@ -3,12 +3,13 @@ June 2020 7.2
    -> EMail sending can be done via SMTP without local mail server
 
 
-March 2020 7.1
+17.03.2020 7.1
   - PHP 7 required
   - Webauthn/FIDO2 support for 2-factor-authentication (requires PHP 7.2)
   - IMAP: changed library to support latest TLS versions
   - Personal: support display name (hidden by default in server profile)
   - Windows users: support allowed workstations, more profile options
+  - Reactivated Polish translation
   - LAM Pro:
    -> PPolicy: support for password check module
    -> Windows AD LDS support (users and groups)

lam/VERSION

@@ -1 +1 @@
-7.1.RC1
+7.1

lam/config/language

@@ -36,7 +36,7 @@ it_IT.utf8:UTF-8:Italiano (Italia)
 nl_NL.utf8:UTF-8:Nederlands (Nederland)
 
 # Polish
-# pl_PL.utf8:UTF-8:Polski (Polska)
+pl_PL.utf8:UTF-8:Polski (Polska)
 
 # Portuguese
 pt_BR.utf8:UTF-8:Português (Brasil)

lam/lib/lists.inc

@@ -405,7 +405,6 @@ class lamList {
 		$table->setCSSClasses(array($scope . '-border accountlist'));
 		$table->setOnClickEvents($onClickEvents);
 		$table->setOnDoubleClickEvents($onDoubleClickEvents);
-		$columnCount = sizeof($titles);
 
 		parseHtml(null, $table, array(), false, $this->tabindex, $scope);
 	}

lam/lib/modules/inetOrgPerson.inc

@@ -1658,7 +1658,6 @@ class inetOrgPerson extends baseModule implements passwordService {
 		$messages = array();
 		if ($_FILES['photoFile'] && ($_FILES['photoFile']['size'] > 0)) {
 			$name = $_FILES['photoFile']['name'];
-			$extension = strtolower(substr($name, strpos($name, '.') + 1));
 			$handle = fopen($_FILES['photoFile']['tmp_name'], "r");
 			$data = fread($handle, 100000000);
 			if (!empty($this->moduleSettings['inetOrgPerson_jpegPhoto_maxSize'][0]) && (strlen($data) > (1024 * $this->moduleSettings['inetOrgPerson_jpegPhoto_maxSize'][0]))) {

lam/lib/modules/ldapPublicKey.inc

@@ -5,7 +5,7 @@ use \LAM\PDF\PDFTableRow;
 /*
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-  Copyright (C) 2005 - 2019  Roland Gruber
+  Copyright (C) 2005 - 2020  Roland Gruber
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -571,8 +571,6 @@ class ldapPublicKey extends baseModule {
 	 * Handles an AJAX file upload and prints the JSON result.
 	 */
 	private function ajaxUpload() {
-		$x = $_GET;
-		$y = $_FILES;
 		$result = array('success' => true);
 		if (!isset($_FILES['qqfile']) || ($_FILES['qqfile']['size'] < 10)) {
 			$result = array('error' => _('No file received.'));

lam/lib/modules/posixAccount.inc

@@ -483,7 +483,6 @@ class posixAccount extends baseModule implements passwordService {
 	function init($base) {
 		// make optional if needed
 		$modules = $_SESSION[$base]->get_type()->getModules();
-		$typeId = $_SESSION[$base]->get_type()->getId();
 		$this->autoAddObjectClasses = !$this->isOptional($modules) && !$this->skipObjectClass();
 		// call parent init
 		parent::init($base);
@@ -2029,7 +2028,6 @@ class posixAccount extends baseModule implements passwordService {
 		// profile mappings in meta data
 		parent::load_profile($profile);
 		$modules = $this->getAccountContainer()->get_type()->getModules();
-		$typeId = $this->getAccountContainer()->get_type()->getId();
 		// cn
 		if ($this->manageCn($modules) && !empty($profile['posixAccount_cn'][0])) {
 			$this->attributes['cn'][0] = $profile['posixAccount_cn'][0];
@@ -2469,7 +2467,7 @@ class posixAccount extends baseModule implements passwordService {
 		if (self::areGroupOfNamesActive()) {
 			$gons = $this->findGroupOfNames();
 			$gonList = array();
-			foreach ($gons as $dn => $attr) {
+			foreach ($gons as $attr) {
 				$gonList[] = $attr['cn'][0];
 			}
 		}

lam/lib/modules/posixGroup.inc

@@ -1076,7 +1076,6 @@ class posixGroup extends baseModule implements passwordService {
 			return array();
 		}
 		// auto sync group members
-		$typeId = $this->getAccountContainer()->get_type()->getId();
 		if ($this->isBooleanConfigOptionSet('posixGroup_autoSyncGon')) {
 			$this->syncGon();
 		}

lam/lib/webauthn.inc

@@ -592,7 +592,7 @@ class PublicKeyCredentialSourceRepositorySQLite implements PublicKeyCredentialSo
 		logNewMessage(LOG_NOTICE, 'Delete webauthn device ' . $credentialId . ' of ' . $dn);
 		$pdo = $this->getPDO();
 		$statement = $pdo->prepare('delete from ' . self::TABLE_NAME . ' where userId = :userId and credentialId = :credentialId');
-		$result = $statement->execute(array(
+		$statement->execute(array(
 			':userId' => $dn,
 			':credentialId' => $credentialId
 		));

lam/templates/config/confmain.php

@@ -556,7 +556,6 @@ parseHtml(null, $buttonContainer, array(), false, $tabindex, 'user');
  */
 function checkInput() {
 	$conf = &$_SESSION['conf_config'];
-	$types = $conf->get_ActiveTypes();
 
 	// check new preferences
 	$errors = array();

lam/templates/config/mainlogin.php

@@ -2,7 +2,7 @@
 /*
 
   This code is part of LDAP Account Manager (http://www.ldap-account-manager.org/)
-  Copyright (C) 2003 - 2019  Roland Gruber
+  Copyright (C) 2003 - 2020  Roland Gruber
 
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -96,7 +96,7 @@ printHeaderContents(_("Login"), '../..');
 		<?php
 			// check if config file is writable
 			if (!$cfgMain->isWritable()) {
-				StatusMessage('WARN', 'The config file is not writable.', 'Your changes cannot be saved until you make the file writable for the webserver user.');
+				StatusMessage('WARN', _('The config file is not writable.'), _('Your changes cannot be saved until you make the file writable for the webserver user.'));
 			}
 			if (!empty($_GET['invalidLicense']) && ($_GET['invalidLicense'] == '1')) {
 				StatusMessage('WARN', _('Invalid licence'), _('Please setup your licence data.'));

lam/templates/config/mainmanage.php

@@ -300,7 +300,7 @@ printHeaderContents(_("Edit general settings"), '../..');
 
 	// check if config file is writable
 	if (!$cfg->isWritable()) {
-		$row->add(new htmlStatusMessage('WARN', 'The config file is not writable.', 'Your changes cannot be saved until you make the file writable for the webserver user.'), 12);
+		$row->add(new htmlStatusMessage('WARN', _('The config file is not writable.'), _('Your changes cannot be saved until you make the file writable for the webserver user.')), 12);
 	}
 
 	// license